Commit 4ed1161b9dbd7eb2768bdc349ab72dcf82d4a50c
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !45
Showing
9 changed files
Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
| ... | ... | @@ -11,8 +11,9 @@ |
| 11 | 11 | </div> |
| 12 | 12 | <div class="h-85"> |
| 13 | 13 | <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> |
| 14 | - <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border | |
| 15 | - border-secondary rounded reduce-card-1"> | |
| 14 | + <div | |
| 15 | + [routerLink]="['/opcion-pedido']" | |
| 16 | + class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded"> | |
| 16 | 17 | <img |
| 17 | 18 | draggable="false" |
| 18 | 19 | ondragstart="return false;" |
| ... | ... | @@ -29,9 +30,7 @@ |
| 29 | 30 | class="icon-150" |
| 30 | 31 | src="assets/img/icono-mercado-pago.svg"> |
| 31 | 32 | </p> |
| 32 | - <div | |
| 33 | - class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white" | |
| 34 | - [routerLink]="['/opcion-pedido']"> | |
| 33 | + <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white"> | |
| 35 | 34 | CONTINUAR |
| 36 | 35 | <img |
| 37 | 36 | draggable="false" |
| ... | ... | @@ -50,7 +49,7 @@ |
| 50 | 49 | class="img-in-top px-4 bg-white" |
| 51 | 50 | src="assets/img/icono-efectivo.svg"> |
| 52 | 51 | <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> |
| 53 | - <p class="h2 m-0 text-primary">te esperamos en la caja</p> | |
| 52 | + <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p> | |
| 54 | 53 | </div> |
| 55 | 54 | </div> |
| 56 | 55 | </div> |
src/app/modules/opcion-pedido/opcion-pedido.component.html
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | <div class="col-auto px-0 h-auto align-self-start reduce-card-1"> |
| 20 | 20 | <div |
| 21 | 21 | class="btn-effect col-auto align-self-center px-0 bg-white" |
| 22 | - (click)="goTo('/seleccion-articulos'); seleccionPedido('comer aca')"> | |
| 22 | + (click)="goTo('/seleccion-articulos'); seleccionPedido('false')"> | |
| 23 | 23 | <div class="row mx-0 bg-primary badge-pill"> |
| 24 | 24 | <div class="col-auto p-0"> |
| 25 | 25 | <img |
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | <div class="col-auto px-0 h-auto align-self-start reduce-card-2"> |
| 47 | 47 | <div |
| 48 | 48 | class="btn-effect col-auto align-self-center px-0 bg-white" |
| 49 | - (click)="goTo('/seleccion-articulos'); seleccionPedido('para llevar')"> | |
| 49 | + (click)="goTo('/seleccion-articulos'); seleccionPedido('true')"> | |
| 50 | 50 | <div class="row mx-0 bg-primary badge-pill"> |
| 51 | 51 | <div class="col-auto p-0"> |
| 52 | 52 | <img |
src/app/modules/opcion-pedido/opcion-pedido.component.ts
| ... | ... | @@ -21,7 +21,8 @@ export class OpcionPedidoComponent implements OnInit { |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | seleccionPedido(lugar) { |
| 24 | - localStorage.setItem('pedidoPara', lugar); | |
| 24 | + lugar === 'true' ? lugar = true : false; | |
| 25 | + localStorage.setItem('pedidoParaLlevar', lugar); | |
| 25 | 26 | } |
| 26 | 27 | |
| 27 | 28 | reducirPantalla() { |
src/app/modules/pago-electronico/pago-electronico.component.scss
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 | [ngClass]="{'media-pantalla' : boxCarrito.classList.contains('media-pantalla')}" |
| 64 | 64 | src="{{urlImagenes}}{{categoria.path_imagen}}" |
| 65 | 65 | onerror="this.src='assets/img/image-not-found.jpg'"> |
| 66 | - <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small> | |
| 66 | + <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small> | |
| 67 | 67 | </div> |
| 68 | 68 | </div> |
| 69 | 69 | <div class="col-auto btn-effect h-5 cat-btn"> |
| ... | ... | @@ -102,10 +102,7 @@ |
| 102 | 102 | <p |
| 103 | 103 | [ngClass]="{'text-primary': articulo.PRO, 'text-secondary': !articulo.PRO}" |
| 104 | 104 | class="col-12 px-1 h6 h-auto text-center min-h-60"> |
| 105 | - {{articulo.DetArt}} | |
| 106 | - </p> | |
| 107 | - <p class="col-12 px-1 h-auto text-center line-height-sm min-h-50"> | |
| 108 | - <small>{{articulo.DET_LAR}}</small> | |
| 105 | + {{articulo.DetArt.toUpperCase()}} | |
| 109 | 106 | </p> |
| 110 | 107 | <div class="col-12 px-1 align-self-end h-auto"> |
| 111 | 108 | <div |
src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
| ... | ... | @@ -7,6 +7,9 @@ $primary: #aa006b; |
| 7 | 7 | .active { |
| 8 | 8 | background-color: white; |
| 9 | 9 | border-bottom: 3px solid $primary !important; |
| 10 | + border-top: 3px solid $primary !important; | |
| 11 | + border-left: 3px solid $primary !important; | |
| 12 | + border-right: 3px solid $primary !important; | |
| 10 | 13 | } |
| 11 | 14 | |
| 12 | 15 | .border-bottom-effect { |
src/app/services/articulo/articulo.service.ts
| ... | ... | @@ -73,6 +73,7 @@ export class ArticuloService { |
| 73 | 73 | puntoVenta: APP_SETTINGS.puntoVenta, |
| 74 | 74 | pedidoAnombreDe: dataPago.pedidoAnombreDe, |
| 75 | 75 | numeroPlanilla: APP_SETTINGS.numeroPlanilla, |
| 76 | + pedidoParaLlevar: localStorage.getItem('pedidoParaLlevar'), | |
| 76 | 77 | }) |
| 77 | 78 | .subscribe((data) => { |
| 78 | 79 | observer.next(data); |
src/app/shared/footer/footer.component.html
| 1 | 1 | <div class="row w-90 mx-auto h-100 justify-content-between bg-white"> |
| 2 | 2 | <div class="col-auto align-self-center px-0 bg-white"> |
| 3 | - <div class="btn-effect row mx-0 bg-light" (click)="reducirPantalla()"> | |
| 4 | - <div class="col-auto align-self-center text-primary">REDUCIR PANTALLA</div> | |
| 3 | + <div class="btn-effect row mx-0 bg-light" (click)="reducirPantalla()"> | |
| 4 | + <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div> | |
| 5 | 5 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> |
| 6 | 6 | <img |
| 7 | 7 | draggable="false" |