Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 34d23dd6e0ca83a773ce700baf90c2612a560901

Authored by Benjamin Rodriguez
2 parents 635b98e2c5 93d40bc42e
Exists in develop

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

Showing 3 changed files   Show diff stats
src/app/app.component.ts
Diff comments   View file @ 34d23dd
1 import { Component } from '@angular/core'; 1 import { Component } from '@angular/core';
2 import { ConnectionService } from 'ng-connection-service'; 2 import { ConnectionService } from 'ng-connection-service';
3 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal'; 3 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
4 import { InternetConnectionComponent } from './shared/internet-connection/internet-connection.component'; 4 import { InternetConnectionComponent } from './shared/internet-connection/internet-connection.component';
5 5
6 @Component({ 6 @Component({
7 selector: 'app-root', 7 selector: 'app-root',
8 templateUrl: './app.component.html', 8 templateUrl: './app.component.html',
9 styleUrls: ['./app.component.scss'] 9 styleUrls: ['./app.component.scss']
10 }) 10 })
11 export class AppComponent { 11 export class AppComponent {
12 title = 'autoservicio-axion'; 12 title = 'autoservicio-axion';
13 status = 'ONLINE'; 13 status = 'ONLINE';
14 isConnected = true; 14 isConnected = true;
15 modalRef: BsModalRef; 15 modalRef: BsModalRef;
16 16
17 constructor( 17 constructor(
18 private connectionService: ConnectionService, 18 private connectionService: ConnectionService,
19 private modalService: BsModalService, 19 private modalService: BsModalService,
20 ) { 20 ) {
21 this.connectionService.monitor().subscribe(isConnected => { 21 this.connectionService.monitor().subscribe(isConnected => {
22 this.isConnected = isConnected; 22 this.isConnected = isConnected;
23 if (this.isConnected && this.modalRef) { 23 if (this.isConnected && this.modalRef) {
24 this.modalRef.hide() 24 this.modalRef.hide();
25 } 25 } else {
26 else {
27 this.modalRef = this.modalService.show(InternetConnectionComponent, { 26 this.modalRef = this.modalService.show(InternetConnectionComponent, {
28 backdrop: false, 27 backdrop: false,
29 ignoreBackdropClick: true, 28 ignoreBackdropClick: true,
30 class: 'modal-dialog-centered' 29 class: 'modal-dialog-centered'
31 }); 30 });
32 } 31 }
33 }) 32 });
34 } 33 }
35 } 34 }
36 35
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ 34d23dd
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" *ngIf="articulosPromo.length"> 7 <div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length">
8 <img 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 draggable="false" 16 <div class="col-8">
10 ondragstart="return false;" 17 <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p>
11 (contextmenu)="false" 18 </div>
12 (click)="selectPromo(articulosPromo[0])" 19 <div class="col-4 align-self-center">
13 class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0" 20 <div
14 src="assets/img/icono-cancelar-blanco.svg"> 21 class="row mx-0 justify-content-between bg-white badge-pill"
15 <div class="row mx-0 w-100 justify-content-between mt-3"> 22 (click)="selectPromo(articulosPromo[0])">
16 <div class="col-8"> 23 <div class="col px-0 align-self-center text-primary">
17 <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p> 24 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
18 </div> 25 </div>
19 <div class="col-4 align-self-center"> 26 <div class="col-3 px-0">
20 <div 27 <img
21 class="row mx-0 justify-content-between bg-white badge-pill" 28 draggable="false"
22 (click)="selectPromo(articulosPromo[0])"> 29 ondragstart="return false;"
23 <div class="col px-0 align-self-center text-primary"> 30 (contextmenu)="false"
24 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p> 31 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
25 </div> 32 src="assets/img/ir-color.svg">
26 <div class="col-3 px-0"> 33 </div>
27 <img 34 </div>
28 draggable="false" 35 </div>
29 ondragstart="return false;" 36 </div>
30 (contextmenu)="false" 37 </div>
31 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 38 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
32 src="assets/img/ir-color.svg"> 39 <div class="row mx-0 w-100">
33 </div> 40 <div class="col-9">
34 </div> 41 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
35 </div> 42 <h1 class="text-white mb-4">en un combo?</h1>
36 </div> 43 </div>
37 </div> 44 <div class="col-3">
38 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length"> 45 <img
39 <div class="row mx-0 w-100"> 46 draggable="false"
40 <div class="col-9"> 47 ondragstart="return false;"
41 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p> 48 (contextmenu)="false"
42 <h1 class="text-white mb-4">en un combo?</h1> 49 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
43 </div> 50 onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
44 <div class="col-3"> 51 class="card-img-top img-fluid rounded-circle">
45 <img 52 </div>
46 draggable="false" 53 </div>
47 ondragstart="return false;" 54 <div
48 (contextmenu)="false" 55 class="row mx-0 lista-promociones scroll-y-visible"
49 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}" 56 (scroll)="scrollEvent($event)">
50 onerror="this.src='assets/img/imagen-no-encontrada.jpg'" 57 <div class="col-12">
51 class="card-img-top img-fluid rounded-circle"> 58 <div *ngFor="let promo of promociones">
52 </div> 59 <div
53 </div> 60 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
54 <div 61 (click)="selectPromo(promo)">
55 class="row mx-0 lista-promociones scroll-y-visible" 62 <div class="d-flex">
56 (scroll)="scrollEvent($event)"> 63 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
57 <div class="col-12"> 64 <p class="font-weight-bold my-auto pr-2">
58 <div *ngFor="let promo of promociones"> 65 <span>{{promo.PreVen | currency}}</span>
59 <div 66 </p>
60 class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary" 67 <img
61 (click)="selectPromo(promo)"> 68 draggable="false"
62 <div class="d-flex"> 69 ondragstart="return false;"
63 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p> 70 (contextmenu)="false"
64 <p class="font-weight-bold my-auto pr-2"> 71 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
65 <span>{{promo.PreVen | currency}}</span> 72 src="assets/img/ir-color.svg">
66 </p> 73 </div>
67 <img 74 </div>
68 draggable="false" 75 </div>
69 ondragstart="return false;" 76 </div>
70 (contextmenu)="false" 77 </div>
71 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 78 </div>
72 src="assets/img/ir-color.svg"> 79
src/assets/img/icono-cancelar-blanco.svg
Diff comments   View file @ 34d23dd
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>
1 <?xml version="1.0" encoding="UTF-8"?> 20