Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 2692033263b55643b175cffdb2ebfce66235755f

Authored by Benjamin Rodriguez
1 parent 200247d4e4
Exists in develop

agrego boton cancel con misma funcionalidad que elegir producto solo en promocion

Showing 3 changed files with 36 additions and 10 deletions   Show diff stats
src/app/modules/admin/admin.component.ts
Diff comments   View file @ 2692033
1 import { Component, OnInit, HostListener, OnDestroy } from '@angular/core'; 1 import { Component, OnInit, HostListener, OnDestroy } from '@angular/core';
2 import { Router } from '@angular/router'; 2 import { Router } from '@angular/router';
3 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service'; 3 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
4 4
5 @Component({ 5 @Component({
6 selector: 'app-admin', 6 selector: 'app-admin',
7 templateUrl: './admin.component.html', 7 templateUrl: './admin.component.html',
8 styleUrls: ['./admin.component.scss'] 8 styleUrls: ['./admin.component.scss']
9 }) 9 })
10 10
11 export class AdminComponent implements OnInit, OnDestroy { 11 export class AdminComponent implements OnInit, OnDestroy {
12 constructor( 12 constructor(
13 private inactiveScreen: InactiveScreenService, 13 private inactiveScreen: InactiveScreenService,
14 ) { } 14 ) { }
15 15
16 ngOnInit() { 16 ngOnInit() {
17 this.inactiveScreen.startTimeOutInactividad(); 17 // this.inactiveScreen.startTimeOutInactividad();
18 } 18 }
19 19
20 ngOnDestroy() { 20 ngOnDestroy() {
21 clearTimeout(this.inactiveScreen.timerReposo); 21 // clearTimeout(this.inactiveScreen.timerReposo);
22 } 22 }
23 23
24 @HostListener('document:click', ['$event']) 24 // @HostListener('document:click', ['$event'])
25 eventListener(event: Event) { 25 // eventListener(event: Event) {
26 clearTimeout(this.inactiveScreen.timerReposo); 26 // clearTimeout(this.inactiveScreen.timerReposo);
27 this.inactiveScreen.startTimeOutInactividad(); 27 // this.inactiveScreen.startTimeOutInactividad();
28 } 28 // }
29 29
30 } 30 }
31 31
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ 2692033
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-header bg-primary rounded-top pt-4 px-2"> 7 <div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length">
8 <div class="row mx-0 w-100 justify-content-between" *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">
9 <div class="col-8"> 16 <div class="col-8">
10 <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p> 17 <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p>
11 </div> 18 </div>
12 <div class="col-4 align-self-center"> 19 <div class="col-4 align-self-center">
13 <div 20 <div
14 class="row mx-0 justify-content-between bg-white badge-pill" 21 class="row mx-0 justify-content-between bg-white badge-pill"
15 (click)="selectPromo(articulosPromo[0])"> 22 (click)="selectPromo(articulosPromo[0])">
16 <div class="col px-0 align-self-center text-primary"> 23 <div class="col px-0 align-self-center text-primary">
17 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p> 24 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
18 </div> 25 </div>
19 <div class="col-3 px-0"> 26 <div class="col-3 px-0">
20 <img 27 <img
21 draggable="false" 28 draggable="false"
22 ondragstart="return false;" 29 ondragstart="return false;"
23 (contextmenu)="false" 30 (contextmenu)="false"
24 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 31 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
25 src="assets/img/ir-color.svg"> 32 src="assets/img/ir-color.svg">
26 </div> 33 </div>
27 </div> 34 </div>
28 </div> 35 </div>
29 </div> 36 </div>
30 </div> 37 </div>
31 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length"> 38 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
32 <div class="row mx-0 w-100"> 39 <div class="row mx-0 w-100">
33 <div class="col-9"> 40 <div class="col-9">
34 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p> 41 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
35 <h1 class="text-white mb-4">en un combo?</h1> 42 <h1 class="text-white mb-4">en un combo?</h1>
36 </div> 43 </div>
37 <div class="col-3"> 44 <div class="col-3">
38 <img 45 <img
39 draggable="false" 46 draggable="false"
40 ondragstart="return false;" 47 ondragstart="return false;"
41 (contextmenu)="false" 48 (contextmenu)="false"
42 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}" 49 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
43 onerror="this.src='assets/img/imagen-no-encontrada.jpg'" 50 onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
44 class="card-img-top img-fluid rounded-circle"> 51 class="card-img-top img-fluid rounded-circle">
45 </div> 52 </div>
46 </div> 53 </div>
47 <div 54 <div
48 class="row mx-0 lista-promociones scroll-y-visible" 55 class="row mx-0 lista-promociones scroll-y-visible"
49 (scroll)="scrollEvent($event)"> 56 (scroll)="scrollEvent($event)">
50 <div class="col-12"> 57 <div class="col-12">
51 <div *ngFor="let promo of promociones"> 58 <div *ngFor="let promo of promociones">
52 <div 59 <div
53 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary" 60 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
54 (click)="selectPromo(promo)"> 61 (click)="selectPromo(promo)">
55 <div class="d-flex"> 62 <div class="d-flex">
56 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p> 63 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
57 <p class="font-weight-bold my-auto pr-2"> 64 <p class="font-weight-bold my-auto pr-2">
58 <span>{{promo.PreVen | currency}}</span> 65 <span>{{promo.PreVen | currency}}</span>
59 </p> 66 </p>
60 <img 67 <img
61 draggable="false" 68 draggable="false"
62 ondragstart="return false;" 69 ondragstart="return false;"
63 (contextmenu)="false" 70 (contextmenu)="false"
64 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 71 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
65 src="assets/img/ir-color.svg"> 72 src="assets/img/ir-color.svg">
66 </div> 73 </div>
67 </div> 74 </div>
68 </div> 75 </div>
69 </div> 76 </div>
70 </div> 77 </div>
71 </div> 78 </div>
72 79
src/assets/img/icono-cancelar-blanco.svg
Diff comments   View file @ 2692033
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="19.8306mm" height="19.8306mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
5 viewBox="0 0 1652 1652"
6 xmlns:xlink="http://www.w3.org/1999/xlink">
7 <defs>
8 <style type="text/css">
9 <![CDATA[
10 .fil0 {fill:#FEFEFE;fill-rule:nonzero}
11 ]]>
12 </style>
13 </defs>
14 <g id="Capa_x0020_1">
15 <metadata id="CorelCorpID_0Corel-Layer"/>
16 <polygon class="fil0" points="494,409 826,766 1158,409 1214,457 882,826 1214,1196 1158,1244 826,886 494,1244 439,1196 770,826 439,457 "/>
17 <path class="fil0" d="M1360 292c-136,-137 -325,-221 -534,-221 -208,0 -397,84 -534,221 -137,137 -221,326 -221,534 0,209 84,398 221,534 137,137 326,222 534,222 209,0 398,-85 534,-222 137,-136 222,-325 222,-534 0,-208 -85,-397 -222,-534zm-534 -292c228,0 435,92 584,242 150,149 242,356 242,584 0,228 -92,435 -242,584 -149,150 -356,242 -584,242 -228,0 -435,-92 -584,-242 -150,-149 -242,-356 -242,-584 0,-228 92,-435 242,-584 149,-150 356,-242 584,-242z"/>
18 </g>
19 </svg>
20