Marcelo Puebla / autoservicio-axion

Download as
Browse Code »

Commit 18045edafd4d8ec7bcfaccaebb6976ad66bd8279

Authored by Benjamin Rodriguez
2 parents d1c7b57df1 b9fced4fce
Exists in develop

Merge conflicts

Showing 16 changed files   Show diff stats
src/app/modules/carrito/carrito.component.ts
Diff comments   View file @ 18045ed
... ... @@ -14,7 +14,7 @@ import { ANIMATIONS } from 'src/app/utils/animations';
14 14 animations: [ANIMATIONS.EnterLeaveX]
15 15 })
16 16 export class CarritoComponent implements OnInit, OnDestroy {
17   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  17 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
18 18 maxCantidad = 50;
19 19 modalRef: BsModalRef;
20 20  
src/app/modules/info-formas-pago/info-formas-pago.component.ts
Diff comments   View file @ 18045ed
... ... @@ -22,7 +22,7 @@ export class InfoFormasPagoComponent implements OnInit, OnDestroy {
22 22 }
23 23  
24 24 openGoCaja(templateRef: TemplateRef<any>) {
25   - const modalRef = this.modalService.show(templateRef, { class: 'modal-promo modal-dialog-centered' });
  25 + const modalRef = this.modalService.show(templateRef, { class: 'modal-dialog-centered' });
26 26 this.timer = setTimeout(() => {
27 27 modalRef.hide();
28 28 }, 3000);
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
Diff comments   View file @ 18045ed
... ... @@ -18,7 +18,7 @@ export class FiltroCategoriasComponent implements OnInit {
18 18 categoriaActive = null;
19 19 allActive = true;
20 20 queMostrar = 'todos';
21   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  21 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
22 22  
23 23 constructor(
24 24 private categoriaService: CategoriaService,
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
Diff comments   View file @ 18045ed
... ... @@ -22,7 +22,7 @@ import { ANIMATIONS } from &#39;src/app/utils/animations&#39;;
22 22 export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {
23 23 showSpinner = true;
24 24 timeoutHandler: any;
25   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  25 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
26 26 articulos: IArticulo[] = [];
27 27 auxArticulos: IArticulo[] = [];
28 28 showQuantity = 100;
... ... @@ -131,7 +131,7 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
131 131 openModalPromos(articulo: IArticulo) {
132 132 this.modalRef = this.modalService.show(PromocionComponent, {
133 133 initialState: { articulosPromo: [articulo] },
134   - class: 'modal-promo modal-dialog-centered'
  134 + class: 'modal-dialog-centered'
135 135 });
136 136 this.mediaPantalla();
137 137 }
... ... @@ -142,7 +142,7 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
142 142 sinonimos: sinonimosData,
143 143 articulo
144 144 },
145   - class: 'modal-promo modal-dialog-centered'
  145 + class: 'modal-dialog-centered'
146 146 });
147 147  
148 148 this.modalRef.content.onClose
src/app/shared/confirmacion/confirmacion.component.html
Diff comments   View file @ 18045ed
1   -<div class="modal-header bg-primary rounded-top pt-4 px-2">
2   - <img
3   - draggable="false"
4   - ondragstart="return false;"
5   - (contextmenu)="false"
6   - (click)="close()"
7   - class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0"
8   - src="assets/img/icono-cancelar-blanco.svg">
9   - <div class="row mx-0 w-100 justify-content-between">
10   - <div class="col-8">
11   - <p *ngIf="titleMessage" class="h3 text-white">{{titleMessage}}</p>
12   - </div>
13   - </div>
14   - <div *ngIf="imagenPath" class="col-4 align-self-center">
  1 +<div class="bg-primary rounded">
  2 + <div class="modal-header">
15 3 <img
16   - draggable="false"
17   - ondragstart="return false;"
18   - (contextmenu)="false"
19   - src="{{urlImagenes}}{{imagenPath}}"
20   - onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
21   - class="card-img-top img-fluid rounded-circle">
22   - </div>
23   -</div>
24   -<div class=" col-12 modal-body bg-primary rounded-bottom pb-3 px-2">
25   - <div class="row justify-content-between mx-0 w-100">
26   - <div class="col-8">
27   - <p *ngIf="footerMessageFirst" class="text-white"><small>{{footerMessageFirst}}</small></p >
28   - <h1 *ngIf="footerMessageSecond" class="text-white mb-4">{{footerMessageSecond}}</h1>
  4 + draggable="false"
  5 + ondragstart="return false;"
  6 + (contextmenu)="false"
  7 + (click)="close()"
  8 + class="btn-effect icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
  9 + src="assets/img/icono-cancelar-blanco.svg">
  10 + <div class="row no-gutters w-100 justify-content-between">
  11 + <div class="col align-self-center">
  12 + <p *ngIf="titleMessage" class="h3 text-white">{{titleMessage}}</p>
  13 + </div>
  14 + <div *ngIf="imagenPath" class="col-4 px-3 pt-3 align-self-center">
  15 + <img
  16 + draggable="false"
  17 + ondragstart="return false;"
  18 + (contextmenu)="false"
  19 + src="{{urlImagenes}}{{imagenPath}}"
  20 + onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
  21 + class="d-block mx-auto img-fluid rounded-circle">
  22 + </div>
29 23 </div>
30   - <div class="col-4">
31   - <div
32   - class="mx-0"
33   - (click)="confirmarArticulo()">
34   - <div class="col-auto bg-white badge-pill">
35   - <div class="row justify-content-between">
36   - <div *ngIf="footerConfirmation" class="col-auto px-0 align-self-center text-primary pl-3">
37   - <p class="font-weight-bold">{{footerConfirmation | currency}}</p>
38   - </div>
39   - <div class="col-auto px-0">
40   - <img
41   - draggable="false"
42   - ondragstart="return false;"
43   - (contextmenu)="false"
44   - class="d-block ml-auto my-1 icon-30 pr-2"
45   - src="assets/img/ir-color.svg">
46   - </div>
  24 + </div>
  25 + <div class="modal-body">
  26 + <div class="row justify-content-between mx-0 w-100">
  27 + <div class="col-7 col-md-8 pl-0 align-self-center">
  28 + <p *ngIf="footerMessageFirst" class="text-white"><small>{{footerMessageFirst}}</small></p >
  29 + <p *ngIf="footerMessageSecond" class="h1 text-white">{{footerMessageSecond}}</p>
  30 + </div>
  31 + <div class="col-5 col-md-4 align-self-center">
  32 + <div
  33 + class="row justify-content-between bg-white badge-pill btn-effect"
  34 + *ngIf="footerConfirmation"
  35 + (click)="confirmar()">
  36 + <div class="col-auto px-0 align-self-center text-primary pl-3">
  37 + <p class="font-weight-bold">{{footerConfirmation | currency}}</p>
  38 + </div>
  39 + <div class="col-auto px-0">
  40 + <img
  41 + draggable="false"
  42 + ondragstart="return false;"
  43 + (contextmenu)="false"
  44 + class="d-block ml-auto my-1 icon-20"
  45 + src="assets/img/ir-color.svg">
47 46 </div>
48 47 </div>
49   - </div>
50   - <div *ngIf="footerClose" class="bg-white badge-pill mt-2">
51   - <div class="row justify-content-between">
52   - <div
53   - class="col-auto mx-0 "
54   - (click)="close()">
55   - <p class="font-weight-bold text-center text-primary">{{footerClose}}</p>
  48 + <div
  49 + *ngIf="footerClose"
  50 + class="row justify-content-center bg-white badge-pill btn-effect mt-2"
  51 + (click)="close()">
  52 + <div class="col-auto px-0 ml-auto">
  53 + <p class="font-weight-bold text-primary">{{footerClose}}</p>
56 54 </div>
57   - <i class="fas fa-undo-alt text-info mr-3 my-auto"></i>
  55 + <i class="fas fa-undo-alt text-info ml-auto my-auto"></i>
58 56 </div>
59 57 </div>
60 58 </div>
src/app/shared/confirmacion/confirmacion.component.ts
Diff comments   View file @ 18045ed
... ... @@ -17,7 +17,7 @@ export class ConfirmacionComponent implements OnInit {
17 17 footerConfirmation: number;
18 18 footerClose: string;
19 19 onClose: Subject<any>;
20   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  20 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
21 21  
22 22 constructor(
23 23 public modalRef: BsModalRef,
... ... @@ -29,7 +29,7 @@ export class ConfirmacionComponent implements OnInit {
29 29 ngOnInit() {
30 30 }
31 31  
32   - confirmarArticulo() {
  32 + confirmar() {
33 33 this.onClose.next();
34 34 this.modalRef.hide();
35 35 }
src/app/shared/footer/footer.component.ts
Diff comments   View file @ 18045ed
... ... @@ -30,7 +30,6 @@ export class FooterComponent implements OnInit {
30 30 .carrito-articulo,
31 31 .carrito-content,
32 32 .pago-tarjeta,
33   - .modal-promo,
34 33 .modal-content,
35 34 .qr-mt`)
36 35 .toggleClass('media-pantalla');
src/app/shared/header-publicidad/header-publicidad.component.html
Diff comments   View file @ 18045ed
1   -<div class="row mx-0" id="headerPublicidad" #headerPublicidad
  1 +<div class="row mx-0 btn-effect" id="headerPublicidad" #headerPublicidad
2 2 [ngClass]="headerPublicidad.classList.contains('media-pantalla')
3 3 ? 'h-31' : 'h-20'" id="boxCarrito">
4 4 <div class="col-12 p-3 h-100" id="headerPad">
src/app/shared/header-publicidad/header-publicidad.component.ts
Diff comments   View file @ 18045ed
... ... @@ -18,7 +18,7 @@ import * as _ from &#39;lodash&#39;;
18 18 styleUrls: ['./header-publicidad.component.scss']
19 19 })
20 20 export class HeaderPublicidadComponent implements OnInit {
21   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  21 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
22 22 publicidades: IPublicidad[] = [];
23 23 modalRef: BsModalRef;
24 24  
... ... @@ -64,7 +64,7 @@ export class HeaderPublicidadComponent implements OnInit {
64 64 initialState: {
65 65 idArticulo: articulo.id
66 66 },
67   - class: 'modal-promo modal-dialog-centered'
  67 + class: 'modal-dialog-centered'
68 68 });
69 69 }
70 70  
... ... @@ -79,7 +79,7 @@ export class HeaderPublicidadComponent implements OnInit {
79 79 footerConfirmation: articulo.PreVen,
80 80 footerClose: `volver`
81 81 },
82   - class: 'modal-promo modal-dialog-centered'
  82 + class: 'modal-dialog-centered'
83 83 });
84 84 this.modalRef.content.onClose.subscribe(() => {
85 85 this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
... ... @@ -107,7 +107,7 @@ export class HeaderPublicidadComponent implements OnInit {
107 107 sinonimos: sinonimosData,
108 108 articulo
109 109 },
110   - class: 'modal-promo modal-dialog-centered'
  110 + class: 'modal-dialog-centered'
111 111 });
112 112 modalSinonimo.content.onClose
113 113 .subscribe((res: any) => {
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ 18045ed
... ... @@ -4,75 +4,78 @@
4 4 <span class="sr-only">Loading...</span>
5 5 </div>
6 6 </div> -->
7   -<div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length">
8   - <img
9   - draggable="false"
10   - ondragstart="return false;"
11   - (contextmenu)="false"
12   - (click)="selectPromo(articulosPromo[0])"
13   - class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0"
14   - src="assets/img/icono-cancelar-blanco.svg">
15   - <div class="row mx-0 w-100 justify-content-between mt-3">
16   - <div class="col-8">
17   - <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p>
18   - </div>
19   - <div class="col-4 align-self-center">
20   - <div
21   - class="row mx-0 justify-content-between bg-white badge-pill"
22   - (click)="selectPromo(articulosPromo[0])">
23   - <div class="col px-0 align-self-center text-primary">
24   - <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
25   - </div>
26   - <div class="col-3 px-0">
27   - <img
28   - draggable="false"
29   - ondragstart="return false;"
30   - (contextmenu)="false"
31   - class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
32   - src="assets/img/ir-color.svg">
33   - </div>
  7 +<div class="bg-primary rounded">
  8 + <div class="modal-header" *ngIf="articulosPromo.length">
  9 + <img
  10 + draggable="false"
  11 + ondragstart="return false;"
  12 + (contextmenu)="false"
  13 + (click)="selectPromo(articulosPromo[0])"
  14 + class="btn-effect icon-30 mt-2 mr-2 position-absolute top-0 right-0 z-index"
  15 + src="assets/img/icono-cancelar-blanco.svg">
  16 + <div class="row w-100 no-gutters justify-content-between">
  17 + <div class="col align-self-center">
  18 + <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
34 19 </div>
35   - </div>
36   - </div>
37   -</div>
38   -<div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
39   - <div class="row mx-0 w-100">
40   - <div class="col-9">
41   - <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
42   - <h1 class="text-white mb-4">en un combo?</h1>
43   - </div>
44   - <div class="col-3">
45   - <img
46   - draggable="false"
47   - ondragstart="return false;"
48   - (contextmenu)="false"
49   - src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
50   - onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
51   - class="card-img-top img-fluid rounded-circle">
52   - </div>
53   - </div>
54   - <div
55   - class="row mx-0 lista-promociones scroll-y-visible"
56   - (scroll)="scrollEvent($event)">
57   - <div class="col-12">
58   - <div *ngFor="let promo of promociones">
  20 + <div class="col-auto align-self-center mt-4 pl-2">
59 21 <div
60   - class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
61   - (click)="selectPromo(promo)">
62   - <div class="d-flex">
63   - <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
64   - <p class="font-weight-bold my-auto pr-2">
65   - <span>{{promo.PreVen | currency}}</span>
66   - </p>
  22 + class="row mx-0 justify-content-between bg-white badge-pill btn-effect"
  23 + (click)="selectPromo(articulosPromo[0])">
  24 + <div class="col-auto align-self-center text-primary">
  25 + <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
  26 + </div>
  27 + <div class="col-auto px-0">
67 28 <img
68 29 draggable="false"
69 30 ondragstart="return false;"
70 31 (contextmenu)="false"
71   - class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
  32 + class="d-block ml-auto my-1 icon-20"
72 33 src="assets/img/ir-color.svg">
73 34 </div>
74 35 </div>
75 36 </div>
76 37 </div>
77 38 </div>
  39 + <div class="modal-body" *ngIf="articulosPromo.length">
  40 + <div class="row no-gutters w-100">
  41 + <div class="col-9 col-9 align-self-center">
  42 + <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
  43 + <p class="h1 text-white">en un combo?</p>
  44 + </div>
  45 + <div class="col-3">
  46 + <img
  47 + draggable="false"
  48 + ondragstart="return false;"
  49 + (contextmenu)="false"
  50 + src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
  51 + onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
  52 + class="card-img-top img-fluid rounded-circle">
  53 + </div>
  54 + </div>
  55 + <div
  56 + class="row mt-3 no-gutters lista-promociones scroll-y-visible"
  57 + (scroll)="scrollEvent($event)">
  58 + <div class="col-12">
  59 + <div *ngFor="let promo of promociones; let i = index">
  60 + <div
  61 + [ngClass]="{ 'mt-2': i !== 0 }"
  62 + class="btn-effect bg-white badge-pill text-primary"
  63 + (click)="selectPromo(promo)">
  64 + <div class="d-flex">
  65 + <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
  66 + <p class="font-weight-bold ml-auto my-auto pr-2">
  67 + <span>{{promo.PreVen | currency}}</span>
  68 + </p>
  69 + <img
  70 + draggable="false"
  71 + ondragstart="return false;"
  72 + (contextmenu)="false"
  73 + class="d-block py-1 icon-30"
  74 + src="assets/img/ir-color.svg">
  75 + </div>
  76 + </div>
  77 + </div>
  78 + </div>
  79 + </div>
  80 + </div>
78 81 </div>
src/app/shared/promocion/promocion.component.ts
Diff comments   View file @ 18045ed
... ... @@ -20,7 +20,7 @@ export class PromocionComponent implements OnInit {
20 20 articulosPromo: IArticulo[] = [];
21 21 promociones: IArticulo[] = [];
22 22 onClose: Subject<any>;
23   - urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
  23 + urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
24 24  
25 25 constructor(
26 26 public modalPromocion: BsModalRef,
... ... @@ -63,7 +63,7 @@ export class PromocionComponent implements OnInit {
63 63 sinonimos: sinonimosData,
64 64 articulo
65 65 },
66   - class: 'modal-promo modal-dialog-centered'
  66 + class: 'modal-dialog-centered'
67 67 });
68 68  
69 69 modalSinonimo.content.onClose
src/app/shared/sinonimo/sinonimo.component.html
Diff comments   View file @ 18045ed
1 1 <div class="bg-primary rounded text-white">
2 2 <div class="modal-header">
  3 + <img
  4 + draggable="false"
  5 + ondragstart="return false;"
  6 + (contextmenu)="false"
  7 + (click)="close()"
  8 + class="btn-effect icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
  9 + src="assets/img/icono-cancelar-blanco.svg">
3 10 <p class="col-7 h4 px-0 align-self-center">{{articulo.DetArt}}</p>
4   - <div class="col-5 pr-0 text-right">
  11 + <div class="col-5 pt-4 pr-0 text-right">
5 12 <p *ngFor="let s of sinonimos; let i = index">
6 13 <span
7 14 class="btn-effect"
src/app/shared/sinonimo/sinonimo.component.ts
Diff comments   View file @ 18045ed
... ... @@ -77,7 +77,11 @@ export class SinonimoComponent implements OnInit {
77 77  
78 78 scrollTo(index: number) {
79 79 const el = document.getElementById(index.toString());
80   - el.scrollIntoView({ behavior: 'smooth', block: 'center' });
  80 + el.scrollIntoView({ behavior: 'smooth' });
  81 + }
  82 +
  83 + close() {
  84 + this.modalRef.hide();
81 85 }
82 86  
83 87 }
src/etc/AppSettings.ejemplo.ts
Diff comments   View file @ 18045ed
1 1 // export const APP_SETTINGS = {
2 2 // apiDeboSuite: 'http://localhost:1515',
  3 +// apiImagenes: 'http://10.231.45.220:1515',
3 4 // puntoVenta: 9998,
4 5 // numeroPlanilla: 1111,
5 6 // codigoP: 99996,
src/scss/styles-bootstrap.scss
Diff comments   View file @ 18045ed
... ... @@ -69,12 +69,6 @@ $border-radius-sm: 0.5rem;
69 69 background-color: #0000004d;
70 70 }
71 71  
72   -.modal-promo > div {
73   - border: none !important;
74   - border-radius: $border-radius;
75   - margin-left: 10px !important;
76   -}
77   -
78 72 .modal-content.media-pantalla {
79 73 margin-top: auto !important;
80 74 margin-bottom: 50px !important;
... ... @@ -62,6 +62,10 @@ p {
62 62 right: 0;
63 63 }
64 64  
  65 +.top-0 {
  66 + top: 0;
  67 +}
  68 +
65 69 .left-0 {
66 70 left: 0;
67 71 }
... ... @@ -94,3 +98,7 @@ p {
94 98 .modal-content {
95 99 background: transparent !important;
96 100 }
  101 +
  102 +.z-index {
  103 + z-index: 1000;
  104 +}