Merge branch 'develop' into 'develop'

Develop See merge request !117

Merge branch 'develop' into 'develop'
Develop See merge request !117
Marcelo Puebla
2 parents 0962e67bdd 84919dc526
Showing 8 changed files Show diff stats
src/app/modules/carrito/carrito.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
src/app/modules/splash-screen/splash-screen.component.ts
src/app/services/articulo/articulo.service.ts
src/app/shared/header-publicidad/header-publicidad.component.ts
src/app/shared/promocion/promocion.component.ts
src/app/shared/sinonimo/sinonimo.component.ts
@@ -82,7 +82,7 @@
     <div class="row mx-3 mt-2 h-auto justify-content-end">
       <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
       <div class="col-auto align-self-center bg-primary badge-pill">
-        <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal | currency}}</p>
+        <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total | currency}}</p>
       </div>
     </div>
     <!-- CONTINUAR -->
@@ -167,7 +167,7 @@
         <div class="row mx-0">
           <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
           <div class="col-auto align-self-center bg-primary badge-pill">
-            <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal | currency}}</p>
+            <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total | currency}}</p>
           </div>
         </div>
       </div>
@@ -155,17 +155,11 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
     this.modalRef.content.onClose
       .subscribe((res: any) => {
         this.modalRef = null;
+        if (!res) return;
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
-              a.CODA = aRes.CodArt;
-              a.CodArt = aRes.CodArt;
-              a.SECA = aRes.CodSec;
-              aRes.CodSec = aRes.CodSec;
-              a.PreVen = aRes.PreVen;
-              a.id = aRes.id;
-              a.DET_LAR = aRes.DET_LAR;
-              a.DetArt = aRes.DetArt;
+              this.articuloService.changeArticulo(a, aRes);
             }
           }
         }
 import { Component, OnInit } from '@angular/core';
+import { ArticuloService } from 'src/app/services/articulo/articulo.service';
  
 @Component({
   selector: 'app-splash-screen',
@@ -13,9 +14,12 @@ export class SplashScreenComponent implements OnInit {
   textInvitamos = 'TE INVITAMOS A HACER';
   textTuPedido = 'tu pedido acá';
  
-  constructor() {}
+  constructor(
+    private articuloService: ArticuloService,
+  ) { }
  
   ngOnInit() {
+    this.articuloService.cleanShoppingCar();
     localStorage.clear();
     setTimeout(() => {
       this.showSplashScreen = false;
@@ -15,7 +15,7 @@ export class ArticuloService {
   urlDeboSuite = APP_SETTINGS.apiDeboSuite;
   medioPago: number;
   idComanda: number;
-  subTotal = 0;
+  total = 0;
   maxCantidad = 50;
  
   constructor(
@@ -48,9 +48,9 @@ export class ArticuloService {
   }
  
   calcularTotal() {
-    this.subTotal = 0;
+    this.total = 0;
     this.carrito.forEach(articulo => {
-      this.subTotal += (articulo.PreVen * articulo.cantidad);
+      this.total += (articulo.PreVen * articulo.cantidad);
     });
   }
  
@@ -126,4 +126,16 @@ export class ArticuloService {
       }
     });
   }
+
+  changeArticulo(articuloToChange: IArticulo, articuloData: any) {
+    articuloToChange.CODA = articuloData.CodArt;
+    articuloToChange.CodArt = articuloData.CodArt;
+    articuloToChange.SECA = articuloData.CodSec;
+    articuloToChange.CodSec = articuloData.CodSec;
+    articuloToChange.PreVen = articuloData.PreVen;
+    articuloToChange.id = articuloData.id;
+    articuloToChange.DET_LAR = articuloData.DET_LAR;
+    articuloToChange.DetArt = articuloData.DetArt;
+    articuloToChange.MKT_DESC = articuloData.MKT_DESC;
+  }
 }
@@ -121,14 +121,7 @@ export class HeaderPublicidadComponent implements OnInit {
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
-              a.CODA = aRes.CodArt;
-              a.CodArt = aRes.CodArt;
-              a.SECA = aRes.CodSec;
-              aRes.CodSec = aRes.CodSec;
-              a.PreVen = aRes.PreVen;
-              a.id = aRes.id;
-              a.DET_LAR = aRes.DET_LAR;
-              a.DetArt = aRes.DetArt;
+              this.articuloService.changeArticulo(a, aRes);
             }
           }
         }
@@ -85,14 +85,7 @@ export class PromocionComponent implements OnInit {
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
-              a.CODA = aRes.CodArt;
-              a.CodArt = aRes.CodArt;
-              a.SECA = aRes.CodSec;
-              aRes.CodSec = aRes.CodSec;
-              a.PreVen = aRes.PreVen;
-              a.id = aRes.id;
-              a.DET_LAR = aRes.DET_LAR;
-              a.DetArt = aRes.DetArt;
+              this.articuloService.changeArticulo(a, aRes);
             }
           }
         }
@@ -58,19 +58,14 @@ export class SinonimoComponent implements OnInit {
  
     for (const articulo of this.articulosSelected) {
       ID_SINS.push(articulo.ID_SIN);
-    }
-
-    for (const articulo of this.articulosSelected) {
       observables.push(this.articuloService.getById(articulo.id));
     }
  
     forkJoin(observables)
       .subscribe((res: IArticulo[]) => {
-        for (const articulo of res) {
-          for (const ID_SIN of ID_SINS) {
-            articulo.ID_SIN = ID_SIN;
-          }
-        }
+        res.forEach((articulo, i) => {
+          articulo.ID_SIN = ID_SINS[i];
+        });
         this.modalRef.hide();
         this.onClose.next({
           articulos: res,
...	...	@@ -82,7 +82,7 @@
82	82	<div class="row mx-3 mt-2 h-auto justify-content-end">
83	83	<div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
84	84	<div class="col-auto align-self-center bg-primary badge-pill">
85		- <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal \| currency}}</p>
	85	+ <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total \| currency}}</p>
86	86	</div>
87	87	</div>
88	88	<!-- CONTINUAR -->
...	...	@@ -167,7 +167,7 @@
167	167	<div class="row mx-0">
168	168	<div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
169	169	<div class="col-auto align-self-center bg-primary badge-pill">
170		- <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal \| currency}}</p>
	170	+ <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total \| currency}}</p>
171	171	</div>
172	172	</div>
173	173	</div>
...	...	@@ -155,17 +155,11 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
155	155	this.modalRef.content.onClose
156	156	.subscribe((res: any) => {
157	157	this.modalRef = null;
	158	+ if (!res) return;
158	159	for (const a of articulo.productos) {
159	160	for (const aRes of res.articulos) {
160	161	if (a.idSinonimo === aRes.ID_SIN) {
161		- a.CODA = aRes.CodArt;
162		- a.CodArt = aRes.CodArt;
163		- a.SECA = aRes.CodSec;
164		- aRes.CodSec = aRes.CodSec;
165		- a.PreVen = aRes.PreVen;
166		- a.id = aRes.id;
167		- a.DET_LAR = aRes.DET_LAR;
168		- a.DetArt = aRes.DetArt;
	162	+ this.articuloService.changeArticulo(a, aRes);
169	163	}
170	164	}
171	165	}
1	1	import { Component, OnInit } from '@angular/core';
	2	+import { ArticuloService } from 'src/app/services/articulo/articulo.service';
2	3
3	4	@Component({
4	5	selector: 'app-splash-screen',
...	...	@@ -13,9 +14,12 @@ export class SplashScreenComponent implements OnInit {
13	14	textInvitamos = 'TE INVITAMOS A HACER';
14	15	textTuPedido = 'tu pedido acá';
15	16
16		- constructor() {}
	17	+ constructor(
	18	+ private articuloService: ArticuloService,
	19	+ ) { }
17	20
18	21	ngOnInit() {
	22	+ this.articuloService.cleanShoppingCar();
19	23	localStorage.clear();
20	24	setTimeout(() => {
21	25	this.showSplashScreen = false;
...	...	@@ -15,7 +15,7 @@ export class ArticuloService {
15	15	urlDeboSuite = APP_SETTINGS.apiDeboSuite;
16	16	medioPago: number;
17	17	idComanda: number;
18		- subTotal = 0;
	18	+ total = 0;
19	19	maxCantidad = 50;
20	20
21	21	constructor(
...	...	@@ -48,9 +48,9 @@ export class ArticuloService {
48	48	}
49	49
50	50	calcularTotal() {
51		- this.subTotal = 0;
	51	+ this.total = 0;
52	52	this.carrito.forEach(articulo => {
53		- this.subTotal += (articulo.PreVen * articulo.cantidad);
	53	+ this.total += (articulo.PreVen * articulo.cantidad);
54	54	});
55	55	}
56	56
...	...	@@ -126,4 +126,16 @@ export class ArticuloService {
126	126	}
127	127	});
128	128	}
	129	+
	130	+ changeArticulo(articuloToChange: IArticulo, articuloData: any) {
	131	+ articuloToChange.CODA = articuloData.CodArt;
	132	+ articuloToChange.CodArt = articuloData.CodArt;
	133	+ articuloToChange.SECA = articuloData.CodSec;
	134	+ articuloToChange.CodSec = articuloData.CodSec;
	135	+ articuloToChange.PreVen = articuloData.PreVen;
	136	+ articuloToChange.id = articuloData.id;
	137	+ articuloToChange.DET_LAR = articuloData.DET_LAR;
	138	+ articuloToChange.DetArt = articuloData.DetArt;
	139	+ articuloToChange.MKT_DESC = articuloData.MKT_DESC;
	140	+ }
129	141	}
...	...	@@ -121,14 +121,7 @@ export class HeaderPublicidadComponent implements OnInit {
121	121	for (const a of articulo.productos) {
122	122	for (const aRes of res.articulos) {
123	123	if (a.idSinonimo === aRes.ID_SIN) {
124		- a.CODA = aRes.CodArt;
125		- a.CodArt = aRes.CodArt;
126		- a.SECA = aRes.CodSec;
127		- aRes.CodSec = aRes.CodSec;
128		- a.PreVen = aRes.PreVen;
129		- a.id = aRes.id;
130		- a.DET_LAR = aRes.DET_LAR;
131		- a.DetArt = aRes.DetArt;
	124	+ this.articuloService.changeArticulo(a, aRes);
132	125	}
133	126	}
134	127	}
...	...	@@ -85,14 +85,7 @@ export class PromocionComponent implements OnInit {
85	85	for (const a of articulo.productos) {
86	86	for (const aRes of res.articulos) {
87	87	if (a.idSinonimo === aRes.ID_SIN) {
88		- a.CODA = aRes.CodArt;
89		- a.CodArt = aRes.CodArt;
90		- a.SECA = aRes.CodSec;
91		- aRes.CodSec = aRes.CodSec;
92		- a.PreVen = aRes.PreVen;
93		- a.id = aRes.id;
94		- a.DET_LAR = aRes.DET_LAR;
95		- a.DetArt = aRes.DetArt;
	88	+ this.articuloService.changeArticulo(a, aRes);
96	89	}
97	90	}
98	91	}
...	...	@@ -58,19 +58,14 @@ export class SinonimoComponent implements OnInit {
58	58
59	59	for (const articulo of this.articulosSelected) {
60	60	ID_SINS.push(articulo.ID_SIN);
61		- }
62		-
63		- for (const articulo of this.articulosSelected) {
64	61	observables.push(this.articuloService.getById(articulo.id));
65	62	}
66	63
67	64	forkJoin(observables)
68	65	.subscribe((res: IArticulo[]) => {
69		- for (const articulo of res) {
70		- for (const ID_SIN of ID_SINS) {
71		- articulo.ID_SIN = ID_SIN;
72		- }
73		- }
	66	+ res.forEach((articulo, i) => {
	67	+ articulo.ID_SIN = ID_SINS[i];
	68	+ });
74	69	this.modalRef.hide();
75	70	this.onClose.next({
76	71	articulos: res,