Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 85da8c75a41ed3a62f157d13f7dc4d1b397e760c

Authored by Marcelo Puebla
2 parents 34bd1ca381 aa4057f4a7
Exists in develop

Merge branch 'develop' of git.focasoftware.com:angular/autoservicio-axion into develop

Showing 3 changed files   Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
Diff comments   View file @ 85da8c7
1 <div class="h-92 bg-white fade-in-left"> 1 <div class="h-92 bg-white fade-in-left">
2 <div class="row mx-0 h-15"> 2 <div class="row mx-0 h-15">
3 <div class="col-12 px-0 h-80 my-auto"> 3 <div class="col-12 px-0 h-80 my-auto">
4 <img 4 <img
5 draggable="false" 5 draggable="false"
6 ondragstart="return false;" 6 ondragstart="return false;"
7 (contextmenu)="false" 7 (contextmenu)="false"
8 class="d-block mx-auto h-100" 8 class="d-block mx-auto h-100"
9 src="assets/img/logo-spot.svg"> 9 src="assets/img/logo-spot.svg">
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="h-85"> 12 <div class="h-85">
13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 <div 14 <div
15 [routerLink]="['/opcion-pedido']" 15 [routerLink]="['/opcion-pedido']"
16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto 16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto
17 btn-effect align-self-end border border-secondary rounded reduce-card-1"> 17 btn-effect align-self-end border border-secondary rounded reduce-card-1">
18 <img 18 <img
19 draggable="false" 19 draggable="false"
20 ondragstart="return false;" 20 ondragstart="return false;"
21 (contextmenu)="false" 21 (contextmenu)="false"
22 class="img-in-top px-4 bg-white" 22 class="img-in-top px-4 bg-white"
23 src="assets/img/icono-tarjetas.svg"> 23 src="assets/img/icono-tarjetas.svg">
24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p> 24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p>
25 <p class="h2 mb-3 text-secondary"> 25 <p class="h2 mb-3 text-secondary">
26 tarjetas y 26 tarjetas y
27 <img 27 <img
28 draggable="false" 28 draggable="false"
29 ondragstart="return false;" 29 ondragstart="return false;"
30 (contextmenu)="false" 30 (contextmenu)="false"
31 class="icon-150" 31 class="icon-150"
32 src="assets/img/icono-mercado-pago.svg"> 32 src="assets/img/icono-mercado-pago.svg">
33 </p> 33 </p>
34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white"> 34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white">
35 CONTINUAR 35 CONTINUAR
36 <img 36 <img
37 draggable="false" 37 draggable="false"
38 ondragstart="return false;" 38 ondragstart="return false;"
39 (contextmenu)="false" 39 (contextmenu)="false"
40 class="icon-30" 40 class="icon-30"
41 src="assets/img/ir.svg"> 41 src="assets/img/ir.svg">
42 </div> 42 </div>
43 </div> 43 </div>
44 <div 44 <div
45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center 45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
46 btn-effect border border-primary rounded reduce-card-2" 46 btn-effect border border-primary rounded reduce-card-2"
47 (click)="openGoCaja(templateGoCaja)"> 47 (click)="openGoCaja(templateGoCaja)">
48 <img 48 <img
49 draggable="false" 49 draggable="false"
50 ondragstart="return false;" 50 ondragstart="return false;"
51 (contextmenu)="false" 51 (contextmenu)="false"
52 class="img-in-top px-4 bg-white" 52 class="img-in-top px-4 bg-white"
53 src="assets/img/icono-efectivo.svg"> 53 src="assets/img/icono-efectivo.svg">
54 <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> 54 <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p>
55 <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p> 55 <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p>
56 </div> 56 </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 </div> 59 </div>
60 60
61 <ng-template #templateGoCaja> 61 <ng-template #templateGoCaja>
62 <div class="bg-primary rounded shadow text-white"> 62 <div class="col-12 bg-primary rounded shadow text-white">
63 <div class="modal-body text-center h1 my-4"> 63 <div class="row justify-content-center">
64 <img
65 draggable="false"
66 ondragstart="return false;"
67 (contextmenu)="false"
68 class="align-self-center mt-4"
69 src="assets/img/icono-cajero.svg">
70 </div>
71 <div class="modal-body text-center h1 mt-2 mb-4">
64 Por favor, hacé tu pedido en la caja. 72 Por favor, hacé tu pedido en la caja.
65 </div> 73 </div>
66 </div> 74 </div>
67 </ng-template> 75 </ng-template>
68 76
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ 85da8c7
1 <div class="d-flex justify-content-center" 1 <!-- <div class="d-flex justify-content-center"
2 *ngIf="loading"> 2 *ngIf="loading">
3 <div class="spinner-border text-primary" role="status"> 3 <div class="spinner-border text-primary" role="status">
4 <span class="sr-only">Loading...</span> 4 <span class="sr-only">Loading...</span>
5 </div> 5 </div>
6 </div> 6 </div> -->
7 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length"> 7 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
8 <div class="row mx-0 w-100"> 8 <div class="row mx-0 w-100">
9 <div class="col-9"> 9 <div class="col-9">
10 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p> 10 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
11 <h1 class="text-white mb-4">en un combo?</h1> 11 <h1 class="text-white mb-4">en un combo?</h1>
12 </div> 12 </div>
13 <div class="col-3"> 13 <div class="col-3">
14 <img 14 <img
15 draggable="false" 15 draggable="false"
16 ondragstart="return false;" 16 ondragstart="return false;"
17 (contextmenu)="false" 17 (contextmenu)="false"
18 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}" 18 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
19 onerror="this.src='assets/img/imagen-no-encontrada.jpg'" 19 onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
20 class="card-img-top img-fluid rounded-circle"> 20 class="card-img-top img-fluid rounded-circle">
21 </div> 21 </div>
22 </div> 22 </div>
23 <div 23 <div
24 class="row mx-0 lista-promociones scroll-y-visible" 24 class="row mx-0 lista-promociones scroll-y-visible"
25 (scroll)="scrollEvent($event)"> 25 (scroll)="scrollEvent($event)">
26 <div class="col-12"> 26 <div class="col-12">
27 <div *ngFor="let promo of promociones"> 27 <div *ngFor="let promo of promociones">
28 <div 28 <div
29 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary" 29 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
30 (click)="selectPromo(promo)"> 30 (click)="selectPromo(promo)">
31 <div class="d-flex"> 31 <div class="d-flex">
32 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p> 32 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
33 <p class="font-weight-bold my-auto pr-2"> 33 <p class="font-weight-bold my-auto pr-2">
34 <span>{{promo.PreVen | currency}}</span> 34 <span>{{promo.PreVen | currency}}</span>
35 </p> 35 </p>
36 <img 36 <img
37 draggable="false" 37 draggable="false"
38 ondragstart="return false;" 38 ondragstart="return false;"
39 (contextmenu)="false" 39 (contextmenu)="false"
40 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 40 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
41 src="assets/img/ir-color.svg"> 41 src="assets/img/ir-color.svg">
42 </div> 42 </div>
43 </div> 43 </div>
44 </div> 44 </div>
45 </div> 45 </div>
46 </div> 46 </div>
47 47
src/assets/img/icono-cajero.svg
Diff comments   View file @ 85da8c7
File was created 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
3 <!-- Creator: CorelDRAW X7 -->
4 <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="28.2891mm" height="26.3307mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
5 viewBox="0 0 380 354"
6 xmlns:xlink="http://www.w3.org/1999/xlink">
7 <defs>
8 <style type="text/css">
9 <![CDATA[
10 .fil0 {fill:#FFAF00}
11 ]]>
12 </style>
13 </defs>
14 <g id="Capa_x0020_1">
15 <metadata id="CorelCorpID_0Corel-Layer"/>
16 <path class="fil0" d="M0 272l0 82 380 0 0 -82 -17 0c-11,-58 -21,-113 -32,-172 -2,-8 -8,-13 -15,-13l-31 0 0 -19 14 0c10,0 17,-8 17,-20l-1 -29c-1,-14 -6,-18 -19,-19l-79 0c-13,0 -19,5 -20,19 0,8 -1,32 1,38 3,8 8,10 14,11 4,0 8,0 15,0l0 19 -69 0 0 -24c0,-11 -5,-15 -15,-15l-54 0c-11,0 -15,4 -15,18l0 21c-3,0 -6,0 -9,0 -10,0 -15,5 -17,14l-30 171 -18 0zm26 -1l328 1c-11,-57 -21,-111 -31,-168 -1,-5 -6,-8 -10,-8l-155 0 0 83 15 0 1 7c-3,2 0,1 -6,2l-21 0c-21,0 -75,2 -90,0l1 -8 17 -1 -1 -82c-2,0 -3,-1 -5,-1 -8,0 -10,2 -12,9l-31 166zm-17 73l361 1 1 -64 -362 0 0 63zm75 -165l65 0 -1 -115c-1,-5 -3,-7 -9,-7l-47 0c-6,0 -9,2 -9,12l1 110zm120 -6l103 0 1 -52 -103 -1 -1 53zm15 -115l78 0c5,0 9,-4 9,-11l-1 -28c0,-6 -1,-9 -6,-9 -20,-2 -59,-1 -79,-1 -11,0 -15,4 -14,14 0,8 0,16 0,24 0,7 2,11 13,11zm-6 99l1 7 67 0c20,0 18,7 18,-33 -29,-2 -57,-2 -86,-2l0 28zm-29 138c-28,12 -9,45 13,36 23,-9 10,-46 -13,-36zm53 -208l38 0 1 -19 -39 -1 0 20zm-143 41c1,11 -6,7 30,8l14 0 0 -9c-17,0 -34,-2 -42,1 -1,0 -1,0 -2,0zm0 -23l0 5 44 2 0 -9 -32 0c-1,0 -6,0 -6,0 -6,1 -2,0 -6,2zm0 -25c1,11 -2,6 6,8l38 0 0 -9 -44 1zm92 223c-13,11 -3,23 7,20 10,-3 12,-20 -7,-20zm-85 -145c7,3 21,2 30,2l0 -8c-5,-2 -12,-1 -18,-1 -11,-1 -12,-3 -12,7zm103 47l24 0 0 -9 -24 0 0 9zm41 0l24 0 0 -9 -24 0 0 9zm0 51l24 0 0 -9 -24 0 0 9zm-41 -25l24 0 0 -10 -24 1 0 9zm41 0l24 0 0 -9 -24 -1 0 10zm-41 25c8,0 19,1 24,-2l0 -8 -24 1 0 9zm81 -51l22 0 1 -8 -22 -1 -1 9zm1 50l21 1 1 -9 -23 0 1 8zm-1 -25l23 0 0 -8 -22 0 -1 8z"/>
17 </g>
18 </svg>
19