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

Benjamin Rodriguez
2 parents fde70546d7 db7db7b371
Showing 6 changed files Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
src/app/shared/promocion/promocion.component.html
src/app/shared/sinonimo/sinonimo.component.html
src/app/shared/sinonimo/sinonimo.component.ts
@@ -13,7 +13,8 @@
     <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
       <div
         [routerLink]="['/opcion-pedido']"
-        class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
+        class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto
+              btn-effect align-self-end border border-secondary rounded">
         <img
           draggable="false"
           ondragstart="return false;"
@@ -40,8 +41,8 @@
             src="assets/img/ir.svg">
         </div>
       </div>
-      <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border
-                  border-primary rounded reduce-card-2">
+      <div class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto align-self-center
+                  btn-effect border border-primary rounded reduce-card-2">
         <img
           draggable="false"
           ondragstart="return false;"
@@ -165,7 +165,7 @@
               (mouseleave)="mouseup()">
           </div>
           <!-- CARRITO -->
-          <div class="col-6 col-sm-8 col-md-9 col-lg-10 h-100">
+          <div class="col-6 col-sm-8 col-lg-10 h-100">
             <div
               #templateCarrito
               class="row flex-row flex-nowrap h-100 mx-0 my-2 scroll-x"
@@ -46,7 +46,9 @@ export class SeleccionArticulosComponent implements OnInit, OnDestroy {
   }
  
   ngOnDestroy() {
-    if (this.modalRef) this.modalRef.hide();
+    for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
+      this.modalService.hide(i);
+    }
   }
  
   getCategorias() {
@@ -43,7 +43,9 @@
     (scroll)="scrollEvent($event)">
     <div class="col-12">
       <div *ngFor="let promo of promociones">
-        <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="selectPromo(promo)">
+        <div
+          class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
+          (click)="selectPromo(promo)">
           <div class="d-flex">
             <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
             <p class="font-weight-bold my-auto pr-2">
@@ -28,7 +28,7 @@
   <div class="modal-footer">
     <div
       [ngClass]="validate()"
-      class="d-inline-block py-1 btn-effect bg-white badge-pill text-primary"
+      class="d-inline-block py-1 bg-white badge-pill text-primary"
       (click)="continue()">
       CONTINUAR
       <img
@@ -45,7 +45,7 @@ export class SinonimoComponent implements OnInit {
         }
       }
     }
-    return !this.isValid ? 'disabled' : '';
+    return !this.isValid ? 'disabled' : 'btn-effect';
   }
  
   continue() {
...	...	@@ -13,7 +13,8 @@
13	13	<div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14	14	<div
15	15	[routerLink]="['/opcion-pedido']"
16		- class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
	16	+ class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto
	17	+ btn-effect align-self-end border border-secondary rounded">
17	18	<img
18	19	draggable="false"
19	20	ondragstart="return false;"
...	...	@@ -40,8 +41,8 @@
40	41	src="assets/img/ir.svg">
41	42	</div>
42	43	</div>
43		- <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border
44		- border-primary rounded reduce-card-2">
	44	+ <div class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto align-self-center
	45	+ btn-effect border border-primary rounded reduce-card-2">
45	46	<img
46	47	draggable="false"
47	48	ondragstart="return false;"
...	...	@@ -165,7 +165,7 @@
165	165	(mouseleave)="mouseup()">
166	166	</div>
167	167	<!-- CARRITO -->
168		- <div class="col-6 col-sm-8 col-md-9 col-lg-10 h-100">
	168	+ <div class="col-6 col-sm-8 col-lg-10 h-100">
169	169	<div
170	170	#templateCarrito
171	171	class="row flex-row flex-nowrap h-100 mx-0 my-2 scroll-x"
...	...	@@ -46,7 +46,9 @@ export class SeleccionArticulosComponent implements OnInit, OnDestroy {
46	46	}
47	47
48	48	ngOnDestroy() {
49		- if (this.modalRef) this.modalRef.hide();
	49	+ for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
	50	+ this.modalService.hide(i);
	51	+ }
50	52	}
51	53
52	54	getCategorias() {
...	...	@@ -43,7 +43,9 @@
43	43	(scroll)="scrollEvent($event)">
44	44	<div class="col-12">
45	45	<div *ngFor="let promo of promociones">
46		- <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="selectPromo(promo)">
	46	+ <div
	47	+ class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
	48	+ (click)="selectPromo(promo)">
47	49	<div class="d-flex">
48	50	<p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
49	51	<p class="font-weight-bold my-auto pr-2">
...	...	@@ -28,7 +28,7 @@
28	28	<div class="modal-footer">
29	29	<div
30	30	[ngClass]="validate()"
31		- class="d-inline-block py-1 btn-effect bg-white badge-pill text-primary"
	31	+ class="d-inline-block py-1 bg-white badge-pill text-primary"
32	32	(click)="continue()">
33	33	CONTINUAR
34	34	<img
...	...	@@ -45,7 +45,7 @@ export class SinonimoComponent implements OnInit {
45	45	}
46	46	}
47	47	}
48		- return !this.isValid ? 'disabled' : '';
	48	+ return !this.isValid ? 'disabled' : 'btn-effect';
49	49	}
50	50
51	51	continue() {