Commit 3407a1d2228bb5cd6147c49ef022a3b1d4531987
Exists in
develop
and in
1 other branch
Merge branch 'develop' into 'develop'
Develop See merge request !15
Showing
8 changed files
Show diff stats
src/app/modules/carrito/carrito.component.html
| ... | ... | @@ -76,9 +76,9 @@ |
| 76 | 76 | </div> |
| 77 | 77 | </div> |
| 78 | 78 | <!-- OPCIONALES --> |
| 79 | - <div class="col-3 border-right border-primary"> | |
| 79 | + <!-- <div class="col-3 border-right border-primary"> | |
| 80 | 80 | <p><small>OPCIONALES</small></p> |
| 81 | - <!-- <div class="py-1 badge-pill bg-dark text-white"><p><small>{{'AZÚCAR'}}</small></p></div> | |
| 81 | + <div class="py-1 badge-pill bg-dark text-white"><p><small>{{'AZÚCAR'}}</small></p></div> | |
| 82 | 82 | <div class="row mx-0 mt-2 justify-content-center"> |
| 83 | 83 | <div class="col-auto pl-3 btn-effect bg-primary badge-pill text-white"> |
| 84 | 84 | <span> |
| ... | ... | @@ -92,6 +92,12 @@ |
| 92 | 92 | </span> |
| 93 | 93 | </div> |
| 94 | 94 | </div> --> |
| 95 | + <!-- PRECIO --> | |
| 96 | + <div class="col-3 border-right border-primary"> | |
| 97 | + <p><small>PRECIO</small></p> | |
| 98 | + <div class="py-1 mt-2 badge-pill bg-dark text-white"> | |
| 99 | + <p><small>{{articulo.PreVen | currency}}</small></p> | |
| 100 | + </div> | |
| 95 | 101 | </div> |
| 96 | 102 | <!-- ELIMINAR --> |
| 97 | 103 | <div class="col-3 align-self-center"> |
src/app/modules/pago-electronico/pago-electronico.component.html
| ... | ... | @@ -19,12 +19,20 @@ |
| 19 | 19 | </div> |
| 20 | 20 | <!-- QR --> |
| 21 | 21 | <div class="row mx-0 mt-5 h-60 justify-content-center"> |
| 22 | - <div class="col-10 px-0 h-100"> | |
| 22 | + <div class="col-10 px-0 h-55 position-absolute"> | |
| 23 | 23 | <img |
| 24 | 24 | draggable="false" |
| 25 | 25 | ondragstart="return false;" |
| 26 | 26 | (contextmenu)="false" |
| 27 | - class="d-block mx-auto img-fluid" | |
| 27 | + class="d-block mx-auto h-100 w-auto shadow rounded" | |
| 28 | + src="assets/img/qr-skin.jpg"> | |
| 29 | + </div> | |
| 30 | + <div class="col-10 px-0 h-100 mt-7 mt-lg-5"> | |
| 31 | + <img | |
| 32 | + draggable="false" | |
| 33 | + ondragstart="return false;" | |
| 34 | + (contextmenu)="false" | |
| 35 | + class="d-block mx-auto h-40" | |
| 28 | 36 | [src]="urlQr"> |
| 29 | 37 | </div> |
| 30 | 38 | </div> |
src/app/modules/pago-electronico/pago-electronico.component.scss
src/app/modules/pago-electronico/pago-electronico.component.ts
| ... | ... | @@ -17,10 +17,10 @@ export class PagoElectronicoComponent implements OnInit { |
| 17 | 17 | ) { } |
| 18 | 18 | |
| 19 | 19 | ngOnInit() { |
| 20 | - if (!this.articuloService.carrito.length) { | |
| 21 | - this.router.navigate(['']); | |
| 22 | - return; | |
| 23 | - } | |
| 20 | + // if (!this.articuloService.carrito.length) { | |
| 21 | + // this.router.navigate(['']); | |
| 22 | + // return; | |
| 23 | + // } | |
| 24 | 24 | let dataPago = { |
| 25 | 25 | pedidoAnombreDe: '' |
| 26 | 26 | } |
src/app/modules/splash-screen/splash-screen.component.html
| 1 | -<div *ngIf="showSplashScreen" class="vh-100 bg-splash"> | |
| 1 | +<div *ngIf="showSplashScreen" class="h-100 bg-splash"> | |
| 2 | 2 | <div class="row mx-0 h-100"> |
| 3 | 3 | <div class="col-12 px-0 h-30 my-auto"> |
| 4 | 4 | <img |
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | </div> |
| 12 | 12 | </div> |
| 13 | 13 | |
| 14 | -<div *ngIf="!showSplashScreen" class="vh-100 bg-primary fade-in"> | |
| 14 | +<div *ngIf="!showSplashScreen" class="h-100 bg-primary fade-in"> | |
| 15 | 15 | <div class="row mx-0 h-100"> |
| 16 | 16 | <div class="col-12 px-0 h-100 my-auto"> |
| 17 | 17 | <div class="row mx-0 h-15"> |
src/assets/img/qr-skin.jpg
309 KB
src/favicon.ico
No preview for this file type