Marcelo Puebla / autoservicio-axion

Download as
Browse Code »

Commit ba7edc1701f99785ebaee596298acccfba0a2d90

Authored by Marcelo Puebla
2 parents 314c9dbe12 b9d91aaa0b
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

See merge request !32
Showing 4 changed files   Show diff stats
src/app/modules/cancelar-compra/cancelar-compra.component.html
Diff comments   View file @ ba7edc1
1 <div class="row justify-content-center mt-2 h-15"> 1 <div class="row justify-content-center mt-2 h-15">
2 <img class="w-20 my-auto" src="../../../assets/img/logo-spot.svg"> 2 <img class="h-100 w-auto my-auto" src="../../../assets/img/logo-spot.svg">
3 </div> 3 </div>
4 <div class="row mt-5 mx-0 justify-content-around h-30"> 4 <div class="row mx-auto h-70">
5 <div class="col-5 col-md-6 col-lg-3 h-100"> 5 <div class="col-12 align-self-center">
6 <div class="p-3 bg-white text-center shadow-lg rounded h-100"> 6 <div class="row mt-5 mx-0 justify-content-around">
7 <h4 class="pt-3 mt-5">NECESITA</h4> 7 <div class="col-12 col-sm-8 col-md-6 col-lg-3">
8 <h2 class="font-weight-bold text-secondary mt-4">más tiempo</h2> 8 <div class="p-3 bg-white text-center shadow-lg rounded">
9 <h4 class="mt-4">PARA SU PEDIDO?</h4> 9 <p class="mt-4 h4">NECESITA</p>
10 <p class="font-weight-bold text-secondary my-4 h2">más tiempo</p>
11 <p class="mb-4 h4">PARA SU PEDIDO?</p>
12 </div>
13 </div>
10 </div> 14 </div>
11 </div> 15 <!-- BUTTONS -->
12 </div> 16 <div class="row mx-0 mt-5 justify-content-center">
13 <!-- BUTTONS --> 17 <div class="col-auto px-0 align-self-start">
14 <div class="row mt-5 h-auto justify-content-center mx-0"> 18 <div
15 <div class="col-auto px-0 h-auto align-self-start"> 19 class="row mx-0 py-1 btn-effect bg-primary badge-pill"
16 <div 20 (click)="volverPreviousPage()">
17 class="btn-effect col-auto align-self-center px-0 bg-white" 21 <div class="col-auto align-self-center text-white">continuar compra</div>
18 (click)="volverPreviousPage()"> 22 <div class="col-auto align-self-center p-0">
19 <div class="row mx-0 bg-primary badge-pill"> 23 <img
20 <div class="col-auto align-self-center text-white">continuar compra</div> 24 draggable="false"
21 <div class="col-auto align-self-center p-0"> 25 ondragstart="return false;"
22 <img 26 (contextmenu)="false"
27 class="p-1 icon-30"
28 src="assets/img/ir.svg">
29 </div>
30 </div>
31 </div>
32 </div>
33 <div class="row mx-0 mt-4 justify-content-center">
34 <div class="col-auto px-0 align-self-start">
35 <div
36 class="row mx-0 py-1 btn-effect bg-grey badge-pill"
37 (click)="limpiarCarritoYvolver()">
38 <div class="col-auto align-self-center">cancelar compra</div>
39 <div class="col-auto align-self-center p-0">
40 <img
23 draggable="false" 41 draggable="false"
24 ondragstart="return false;" 42 ondragstart="return false;"
25 (contextmenu)="false" 43 (contextmenu)="false"
26 class="p-1 icon-30" 44 class="p-1 icon-30"
27 src="assets/img/ir.svg"> 45 src="assets/img/icono-cancelar-color.svg">
28 </div> 46 </div>
29 </div>
30 </div>
31 </div>
32 </div>
33 <div class="row mt-4 h-auto justify-content-center mx-0">
34 <div class="col-auto px-0 h-auto align-self-start">
src/app/shared/header-publicidad/header-publicidad.component.html
Diff comments   View file @ ba7edc1
1 <div class="row mx-0 h-20"> 1 <div class="row mx-0 h-20">
2 <div class="col-12 p-3 h-100"> 2 <div class="col-12 p-3 h-100">
3 <div class="h-100"> 3 <div class="h-100">
4 <carousel [showIndicators]="false" [interval]="4000"> 4 <carousel [showIndicators]="false" [interval]="4000">
5 <slide *ngFor="let p of publicidades"> 5 <slide *ngFor="let p of publicidades">
6 <img 6 <img
7 class="d-block h-100 w-auto mx-auto" 7 class="h-100 w-100"
8 draggable="false" 8 draggable="false"
9 ondragstart="return false;" 9 ondragstart="return false;"
10 (contextmenu)="false" 10 (contextmenu)="false"
11 src="{{urlImagenes}}{{p.imagen}}" 11 src="{{urlImagenes}}{{p.imagen}}"
12 (click)="elegirArticulo(p)"> 12 (click)="elegirArticulo(p)">
13 </slide> 13 </slide>
14 </carousel> 14 </carousel>
15 </div> 15 </div>
16 </div> 16 </div>
17 </div> 17 </div>
18 18
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ ba7edc1
1 <div class="modal-header bg-primary rounded-top pt-4 px-2"> 1 <div class="modal-header bg-primary rounded-top pt-4 px-2">
2 <div class="row mx-0 w-100 justify-content-between" *ngIf="articulosPromo.length"> 2 <div class="row mx-0 w-100 justify-content-between" *ngIf="articulosPromo.length">
3 <div class="col-8"> 3 <div class="col-8">
4 <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p> 4 <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
5 </div> 5 </div>
6 <div class="col-4 align-self-center"> 6 <div class="col-4 align-self-center">
7 <div 7 <div
8 class="row mx-0 justify-content-between bg-white badge-pill" 8 class="row mx-0 justify-content-between bg-white badge-pill"
9 (click)="elegirPromo(articulosPromo[0])"> 9 (click)="elegirPromo(articulosPromo[0])">
10 <div class="col px-0 align-self-center text-primary"> 10 <div class="col px-0 align-self-center text-primary">
11 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p> 11 <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
12 </div> 12 </div>
13 <div class="col-3 px-0"> 13 <div class="col-3 px-0">
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 class="d-block ml-auto py-1 icon-30 mr-2 pt-2" 18 class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
19 src="assets/img/ir-color.svg"> 19 src="assets/img/ir-color.svg">
20 </div> 20 </div>
21 </div> 21 </div>
22 </div> 22 </div>
23 </div> 23 </div>
24 </div> 24 </div>
25 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length"> 25 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
26 <div class="row mx-0 w-100"> 26 <div class="row mx-0 w-100">
27 <div class="col-9"> 27 <div class="col-9">
28 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p> 28 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
29 <h1 class="text-white mb-4">en un combo?</h1> 29 <h1 class="text-white mb-4">en un combo?</h1>
30 </div> 30 </div>
31 <div class="col-3 rounded-circle"> 31 <div class="col-3">
32 <img 32 <img
33 draggable="false" 33 draggable="false"
34 ondragstart="return false;" 34 ondragstart="return false;"
35 (contextmenu)="false" 35 (contextmenu)="false"
36 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}" 36 src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
37 onerror="this.src='assets/img/image-not-found.jpg'" 37 onerror="this.src='assets/img/image-not-found.jpg'"
38 class="card-img-top img-fluid rounded-circle"> 38 class="card-img-top img-fluid rounded-circle">
39 </div> 39 </div>
40 </div> 40 </div>
41 <div class="row mx-0 lista-promociones scroll-y-visible"> 41 <div class="row mx-0 lista-promociones scroll-y-visible">
42 <div class="col-12"> 42 <div class="col-12">
43 <div *ngFor="let promo of promociones"> 43 <div *ngFor="let promo of promociones">
44 <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="elegirPromo(promo)"> 44 <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="elegirPromo(promo)">
45 <div class="d-flex"> 45 <div class="d-flex">
46 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p> 46 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
47 <p class="font-weight-bold my-auto pr-2"> 47 <p class="font-weight-bold my-auto pr-2">
48 <span>{{promo.PreVen | currency}}</span> 48 <span>{{promo.PreVen | currency}}</span>
49 </p> 49 </p>
50 <img 50 <img
51 draggable="false" 51 draggable="false"
52 ondragstart="return false;" 52 ondragstart="return false;"
53 (contextmenu)="false" 53 (contextmenu)="false"
54 class="d-block icon-30 py-1" 54 class="d-block icon-30 py-1"
55 src="assets/img/ir-color.svg"> 55 src="assets/img/ir-color.svg">
56 </div> 56 </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 </div> 59 </div>
60 </div> 60 </div>
61 </div> 61 </div>
62 62
src/etc/AppSettings.ejemplo.ts
Diff comments   View file @ ba7edc1
1 // export const APP_SETTINGS = { 1 // export const APP_SETTINGS = {
2 // apiDeboSuite: 'http://localhost:9900', 2 // apiDeboSuite: 'http://localhost:9900',
3 // puntoVenta: 9998, 3 // puntoVenta: 9998,
4 // numeroPlanilla: '1111', 4 // numeroPlanilla: 1111,
5 // codigoP: 99996, 5 // codigoP: 99996,
6 // terminal: 101 6 // terminal: 101
7 // } 7 // }
8 8