Merge conflicts

Marcelo Puebla
2 parents c1cab2898a 9cb0d72e9b
Showing 6 changed files Show diff stats
src/app/app.module.ts
src/app/modules/admin/admin.component.ts
src/app/modules/cancelar-compra/cancelar-compra.component.ts
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
src/scss/styles-bootstrap.scss
@@ -10,6 +10,7 @@ import { SplashScreenComponent } from &#39;./modules/splash-screen/splash-screen.com
 import { AdminComponent } from './modules/admin/admin.component';
 import { FooterComponent } from './shared/footer/footer.component';
 import { SharedModule } from './modules/shared/shared.module';
+import { ModalModule } from 'ngx-bootstrap/modal';
  
 @NgModule({
   declarations: [
@@ -25,6 +26,7 @@ import { SharedModule } from &#39;./modules/shared/shared.module&#39;;
     AppRoutingModule,
     HttpClientModule,
     FormsModule,
+    ModalModule.forRoot(),
     ReactiveFormsModule,
     ReactiveFormsModule.withConfig({ warnOnNgModelWithFormControl: 'never' }),
     SharedModule.forRoot(),
 import { Component, OnInit, HostListener } from '@angular/core';
 import { Router } from '@angular/router';
+import { BsModalRef } from 'ngx-bootstrap/modal';
  
 @Component({
   selector: 'app-admin',
@@ -12,19 +13,20 @@ export class AdminComponent implements OnInit {
  
   constructor(
     private router: Router,
+    // private modalRef: BsModalRef
     ) { }
  
-    ngOnInit() {
-      this.startTimeOutInactividad();
-    }
+  ngOnInit() {
+    // this.startTimeOutInactividad();
+  }
  
-    @HostListener('document:click', ['$event'])
+  @HostListener('document:click', ['$event'])
  
-  documentClick(event: MouseEvent) {
-    if (event) {
-      this.restartTimer();
-    }
-  }
+  // documentClick(event: MouseEvent) {
+  //   if (event) {
+  //     this.restartTimer();
+  //   }
+  // }
  
   restartTimer() {
     clearTimeout(this.timerReposo);
@@ -33,6 +35,7 @@ export class AdminComponent implements OnInit {
  
   startTimeOutInactividad() {
     this.timerReposo = setTimeout(() => {
+      // this.modalRef.hide();
       this.router.navigate(['cancelar-compra']);
     }, 90000);
   }
@@ -27,7 +27,7 @@ export class CancelarCompraComponent implements OnInit {
   }
  
   limpiarCarritoYvolver() {
-    this.articuloService.carrito = undefined;
+    this.articuloService.carrito = [];
     this.router.navigate(['/']);
   }
 }
@@ -81,6 +81,9 @@
                 class="col px-2 my-1 my-md-3 h-auto"
                 *ngFor="let articulo of auxArticulos | slice:0:showQuantity;">
                 <div class="swing-in-top-fwd card h-auto">
+                  <div *ngIf="articulo.PRO">
+                    <i class="fas fa-piggy-bank"></i>
+                  </div>
                   <img
                     draggable="false"
                     ondragstart="return false;"
@@ -97,7 +100,7 @@
                       <div
                         [ngClass]="{'bg-secondary': articulo.promo}"
                         class="row mx-0 justify-content-between bg-primary badge-pill"
-                        (click)="elegirArticulo(articulo)">
+                        (click)="!articulo.FPP ? elegirArticulo(articulo) : openModalPromos(articulo, templatePromos)">
                         <div class="col px-0 align-self-center text-white text-right">
                           {{articulo.PreVen | currency}}
                         </div>
@@ -221,3 +224,57 @@
   </div>
  
 </div>
+
+<ng-template #templatePromos>
+  <div class="modal-header bg-primary">
+    <div class="col-12">
+      <div class="row justify-content-between" *ngIf="articuloPromo.length">
+        <div>
+          <h3 class="ml-2 text-white mt-2">{{articuloPromo[0].DetArt}}</h3>
+        </div>
+        <div class="row"(click)="elegirArticulo(articuloPromo[0]); modalRef.hide()">
+          <div
+            class="row mr-3 justify-content-between bg-white badge-pill">
+            <div class="col px-0 align-self-center text-primary">
+              <p class="font-weight-bold">{{articuloPromo[0].PreVen | currency}}</p> 
+            </div>
+            <div class="col-3 px-0">
+              <img
+                draggable="false"
+                ondragstart="return false;"
+                (contextmenu)="false"
+                class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
+                src="assets/img/ir-color.svg">
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-12 border-bottom mt-3 mx-n3"></div>
+    </div>
+  </div>
+  <div class="modal-body bg-primary" *ngIf="articuloPromo.length">
+    <div class="row">
+      <div class="col-9">
+        <p class="text-white"><small>¿TE GUSTARIA LLEVAR ESTE ARTÍCULO</small></p>
+        <h1 class="text-white mb-4">en un combo?</h1>
+        <div *ngFor="let promo of promociones">
+          <div class="mx-0 bg-white badge-pill text-primary" (click)="elegirArticulo(promo); modalRef.hide()">
+            <div class="row justify-content-between">
+              <p class="ml-4 text-truncate">{{promo.DetArt}}</p>
+              <p class="mr-4 font-weight-bold">{{promo.PreVen | currency}}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-3 rounded-circle">
+        <img
+        draggable="false"
+        ondragstart="return false;"
+        (contextmenu)="false"
+        src="{{urlImagenes}}{{articuloPromo[0].imagenes[0].imagen}}"
+        onerror="this.src='assets/img/image-not-found.jpg'"
+        class="card-img-top h-90 w-90 rounded-circle">
+      </div>
+    </div>
+  </div>
+  </ng-template> 
 \ No newline at end of file
-import { Component, OnInit } from '@angular/core';
-import { BsModalRef } from 'ngx-bootstrap/modal';
+import { Component, OnInit, TemplateRef } from '@angular/core';
+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
+import { PromocionService } from 'src/app/services/promocion/promocion.service';
  
 @Component({
   selector: 'app-seleccion-articulos',
@@ -26,10 +27,14 @@ export class SeleccionArticulosComponent implements OnInit {
   allActive = true;
   modalRef: BsModalRef;
   total: number = 0;
+  articuloPromo: IArticulo[] = [];
+  promociones: IArticulo[] = [];
  
   constructor(
     public articuloService: ArticuloService,
     private categoriaService: CategoriaService,
+    private modalService: BsModalService,
+    private promocionService: PromocionService
   ) { }
  
   ngOnInit() {
@@ -127,6 +132,24 @@ export class SeleccionArticulosComponent implements OnInit {
       }, err => console.error(err));
   }
  
+  openModalPromos(articulo: IArticulo, templatePromos: TemplateRef<any>) {
+    this.articuloService.getById(articulo.id)
+    .subscribe((res: IArticulo) => {
+      this.articuloPromo[0] = res;
+      this.getPromociones();
+      }, err => console.error(err));
+    this.modalRef = this.modalService.show(templatePromos, { class: 'custom-modal modal-dialog-centered', backdrop: 'static' });
+  }
+
+  getPromociones() {
+    var sector = this.articuloPromo[0].CodSec;
+    var codigo = this.articuloPromo[0].CodArt;
+    this.promocionService.getPromociones(sector, codigo)
+      .subscribe((res: IArticulo[]) => {
+        this.promociones = res;
+      }, error => { console.error(error); })
+  }
+
   increaseShow() {
     this.showQuantity += 100;
   }
@@ -49,3 +49,10 @@ $border-radius-sm: 0.5rem;
 .min-h-60 {
   min-height: 60px;
 }
+
+.custom-modal > div > div {
+  background-color: $primary !important;
+  border: none !important;
+  border-radius: 10rem;
+  margin-left: 10px !important;
+}
...	...	@@ -10,6 +10,7 @@ import { SplashScreenComponent } from './modules/splash-screen/splash-screen.com
10	10	import { AdminComponent } from './modules/admin/admin.component';
11	11	import { FooterComponent } from './shared/footer/footer.component';
12	12	import { SharedModule } from './modules/shared/shared.module';
	13	+import { ModalModule } from 'ngx-bootstrap/modal';
13	14
14	15	@NgModule({
15	16	declarations: [
...	...	@@ -25,6 +26,7 @@ import { SharedModule } from './modules/shared/shared.module';
25	26	AppRoutingModule,
26	27	HttpClientModule,
27	28	FormsModule,
	29	+ ModalModule.forRoot(),
28	30	ReactiveFormsModule,
29	31	ReactiveFormsModule.withConfig({ warnOnNgModelWithFormControl: 'never' }),
30	32	SharedModule.forRoot(),
1	1	import { Component, OnInit, HostListener } from '@angular/core';
2	2	import { Router } from '@angular/router';
	3	+import { BsModalRef } from 'ngx-bootstrap/modal';
3	4
4	5	@Component({
5	6	selector: 'app-admin',
...	...	@@ -12,19 +13,20 @@ export class AdminComponent implements OnInit {
12	13
13	14	constructor(
14	15	private router: Router,
	16	+ // private modalRef: BsModalRef
15	17	) { }
16	18
17		- ngOnInit() {
18		- this.startTimeOutInactividad();
19		- }
	19	+ ngOnInit() {
	20	+ // this.startTimeOutInactividad();
	21	+ }
20	22
21		- @HostListener('document:click', ['$event'])
	23	+ @HostListener('document:click', ['$event'])
22	24
23		- documentClick(event: MouseEvent) {
24		- if (event) {
25		- this.restartTimer();
26		- }
27		- }
	25	+ // documentClick(event: MouseEvent) {
	26	+ // if (event) {
	27	+ // this.restartTimer();
	28	+ // }
	29	+ // }
28	30
29	31	restartTimer() {
30	32	clearTimeout(this.timerReposo);
...	...	@@ -33,6 +35,7 @@ export class AdminComponent implements OnInit {
33	35
34	36	startTimeOutInactividad() {
35	37	this.timerReposo = setTimeout(() => {
	38	+ // this.modalRef.hide();
36	39	this.router.navigate(['cancelar-compra']);
37	40	}, 90000);
38	41	}
...	...	@@ -27,7 +27,7 @@ export class CancelarCompraComponent implements OnInit {
27	27	}
28	28
29	29	limpiarCarritoYvolver() {
30		- this.articuloService.carrito = undefined;
	30	+ this.articuloService.carrito = [];
31	31	this.router.navigate(['/']);
32	32	}
33	33	}
...	...	@@ -81,6 +81,9 @@
81	81	class="col px-2 my-1 my-md-3 h-auto"
82	82	*ngFor="let articulo of auxArticulos \| slice:0:showQuantity;">
83	83	<div class="swing-in-top-fwd card h-auto">
	84	+ <div *ngIf="articulo.PRO">
	85	+ <i class="fas fa-piggy-bank"></i>
	86	+ </div>
84	87	<img
85	88	draggable="false"
86	89	ondragstart="return false;"
...	...	@@ -97,7 +100,7 @@
97	100	<div
98	101	[ngClass]="{'bg-secondary': articulo.promo}"
99	102	class="row mx-0 justify-content-between bg-primary badge-pill"
100		- (click)="elegirArticulo(articulo)">
	103	+ (click)="!articulo.FPP ? elegirArticulo(articulo) : openModalPromos(articulo, templatePromos)">
101	104	<div class="col px-0 align-self-center text-white text-right">
102	105	{{articulo.PreVen \| currency}}
103	106	</div>
...	...	@@ -221,3 +224,57 @@
221	224	</div>
222	225
223	226	</div>
	227	+
	228	+<ng-template #templatePromos>
	229	+ <div class="modal-header bg-primary">
	230	+ <div class="col-12">
	231	+ <div class="row justify-content-between" *ngIf="articuloPromo.length">
	232	+ <div>
	233	+ <h3 class="ml-2 text-white mt-2">{{articuloPromo[0].DetArt}}</h3>
	234	+ </div>
	235	+ <div class="row"(click)="elegirArticulo(articuloPromo[0]); modalRef.hide()">
	236	+ <div
	237	+ class="row mr-3 justify-content-between bg-white badge-pill">
	238	+ <div class="col px-0 align-self-center text-primary">
	239	+ <p class="font-weight-bold">{{articuloPromo[0].PreVen \| currency}}</p>
	240	+ </div>
	241	+ <div class="col-3 px-0">
	242	+ <img
	243	+ draggable="false"
	244	+ ondragstart="return false;"
	245	+ (contextmenu)="false"
	246	+ class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
	247	+ src="assets/img/ir-color.svg">
	248	+ </div>
	249	+ </div>
	250	+ </div>
	251	+ </div>
	252	+ <div class="col-12 border-bottom mt-3 mx-n3"></div>
	253	+ </div>
	254	+ </div>
	255	+ <div class="modal-body bg-primary" *ngIf="articuloPromo.length">
	256	+ <div class="row">
	257	+ <div class="col-9">
	258	+ <p class="text-white"><small>¿TE GUSTARIA LLEVAR ESTE ARTÍCULO</small></p>
	259	+ <h1 class="text-white mb-4">en un combo?</h1>
	260	+ <div *ngFor="let promo of promociones">
	261	+ <div class="mx-0 bg-white badge-pill text-primary" (click)="elegirArticulo(promo); modalRef.hide()">
	262	+ <div class="row justify-content-between">
	263	+ <p class="ml-4 text-truncate">{{promo.DetArt}}</p>
	264	+ <p class="mr-4 font-weight-bold">{{promo.PreVen \| currency}}</p>
	265	+ </div>
	266	+ </div>
	267	+ </div>
	268	+ </div>
	269	+ <div class="col-3 rounded-circle">
	270	+ <img
	271	+ draggable="false"
	272	+ ondragstart="return false;"
	273	+ (contextmenu)="false"
	274	+ src="{{urlImagenes}}{{articuloPromo[0].imagenes[0].imagen}}"
	275	+ onerror="this.src='assets/img/image-not-found.jpg'"
	276	+ class="card-img-top h-90 w-90 rounded-circle">
	277	+ </div>
	278	+ </div>
	279	+ </div>
	280	+ </ng-template>
224	281	\ No newline at end of file
1		-import { Component, OnInit } from '@angular/core';
2		-import { BsModalRef } from 'ngx-bootstrap/modal';
	1	+import { Component, OnInit, TemplateRef } from '@angular/core';
	2	+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
3	3	import { ArticuloService } from 'src/app/services/articulo/articulo.service';
4	4	import { IArticulo } from 'src/app/interfaces/IArticulo';
5	5	import { APP_SETTINGS } from 'src/etc/AppSettings';
6	6	import { ICategoria } from 'src/app/interfaces/ICategoria';
7	7	import { CategoriaService } from 'src/app/services/categoria/categoria.service';
	8	+import { PromocionService } from 'src/app/services/promocion/promocion.service';
8	9
9	10	@Component({
10	11	selector: 'app-seleccion-articulos',
...	...	@@ -26,10 +27,14 @@ export class SeleccionArticulosComponent implements OnInit {
26	27	allActive = true;
27	28	modalRef: BsModalRef;
28	29	total: number = 0;
	30	+ articuloPromo: IArticulo[] = [];
	31	+ promociones: IArticulo[] = [];
29	32
30	33	constructor(
31	34	public articuloService: ArticuloService,
32	35	private categoriaService: CategoriaService,
	36	+ private modalService: BsModalService,
	37	+ private promocionService: PromocionService
33	38	) { }
34	39
35	40	ngOnInit() {
...	...	@@ -127,6 +132,24 @@ export class SeleccionArticulosComponent implements OnInit {
127	132	}, err => console.error(err));
128	133	}
129	134
	135	+ openModalPromos(articulo: IArticulo, templatePromos: TemplateRef<any>) {
	136	+ this.articuloService.getById(articulo.id)
	137	+ .subscribe((res: IArticulo) => {
	138	+ this.articuloPromo[0] = res;
	139	+ this.getPromociones();
	140	+ }, err => console.error(err));
	141	+ this.modalRef = this.modalService.show(templatePromos, { class: 'custom-modal modal-dialog-centered', backdrop: 'static' });
	142	+ }
	143	+
	144	+ getPromociones() {
	145	+ var sector = this.articuloPromo[0].CodSec;
	146	+ var codigo = this.articuloPromo[0].CodArt;
	147	+ this.promocionService.getPromociones(sector, codigo)
	148	+ .subscribe((res: IArticulo[]) => {
	149	+ this.promociones = res;
	150	+ }, error => { console.error(error); })
	151	+ }
	152	+
130	153	increaseShow() {
131	154	this.showQuantity += 100;
132	155	}
...	...	@@ -49,3 +49,10 @@ $border-radius-sm: 0.5rem;
49	49	.min-h-60 {
50	50	min-height: 60px;
51	51	}
	52	+
	53	+.custom-modal > div > div {
	54	+ background-color: $primary !important;
	55	+ border: none !important;
	56	+ border-radius: 10rem;
	57	+ margin-left: 10px !important;
	58	+}