Luis Suarez / autoservicio-axion

Download as
Browse Code ยป

Commit 158a2e33ff0bd53ba8ed7ea8f24b70e4fb48fcd3

Authored by Marcelo Puebla
1 parent b4aa9e4f03
Exists in develop

Fix 

Modal confirmacion
Showing 2 changed files with 51 additions and 53 deletions   Show diff stats
src/app/shared/confirmacion/confirmacion.component.html
Diff comments   View file @ 158a2e3
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 icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
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 @ 158a2e3
... ... @@ -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 }