From 2692033263b55643b175cffdb2ebfce66235755f Mon Sep 17 00:00:00 2001
From: Benjamin <brodriguez@focasoftware.com>
Date: Wed, 29 Jan 2020 16:36:11 -0300
Subject: [PATCH] agrego boton cancel con misma funcionalidad que elegir
 producto solo en promocion

---
 src/app/modules/admin/admin.component.ts          | 14 +++++++-------
 src/app/shared/promocion/promocion.component.html | 13 ++++++++++---
 src/assets/img/icono-cancelar-blanco.svg          | 19 +++++++++++++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/img/icono-cancelar-blanco.svg

diff --git a/src/app/modules/admin/admin.component.ts b/src/app/modules/admin/admin.component.ts
index b2c5510..3577f55 100644
--- a/src/app/modules/admin/admin.component.ts
+++ b/src/app/modules/admin/admin.component.ts
@@ -14,17 +14,17 @@ export class AdminComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
-    this.inactiveScreen.startTimeOutInactividad();
+    // this.inactiveScreen.startTimeOutInactividad();
   }
 
   ngOnDestroy() {
-    clearTimeout(this.inactiveScreen.timerReposo);
+    // clearTimeout(this.inactiveScreen.timerReposo);
   }
 
-  @HostListener('document:click', ['$event'])
-  eventListener(event: Event) {
-    clearTimeout(this.inactiveScreen.timerReposo);
-    this.inactiveScreen.startTimeOutInactividad();
-  }
+  // @HostListener('document:click', ['$event'])
+  // eventListener(event: Event) {
+  //   clearTimeout(this.inactiveScreen.timerReposo);
+  //   this.inactiveScreen.startTimeOutInactividad();
+  // }
 
 }
diff --git a/src/app/shared/promocion/promocion.component.html b/src/app/shared/promocion/promocion.component.html
index e0f2995..0dc2ac2 100644
--- a/src/app/shared/promocion/promocion.component.html
+++ b/src/app/shared/promocion/promocion.component.html
@@ -4,10 +4,17 @@
     <span class="sr-only">Loading...</span>
   </div>
 </div> -->
-<div class="modal-header bg-primary rounded-top pt-4 px-2">
-  <div class="row mx-0 w-100 justify-content-between" *ngIf="articulosPromo.length">
+<div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length">
+  <img
+  draggable="false"
+  ondragstart="return false;"
+  (contextmenu)="false"
+  (click)="selectPromo(articulosPromo[0])"
+  class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0"
+  src="assets/img/icono-cancelar-blanco.svg">
+  <div class="row mx-0 w-100 justify-content-between mt-3">
     <div class="col-8">
-      <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
+      <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p>
     </div>
     <div class="col-4 align-self-center">
       <div
diff --git a/src/assets/img/icono-cancelar-blanco.svg b/src/assets/img/icono-cancelar-blanco.svg
new file mode 100644
index 0000000..1366372
--- /dev/null
+++ b/src/assets/img/icono-cancelar-blanco.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X7 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="19.8306mm" height="19.8306mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 1652 1652"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil0 {fill:#FEFEFE;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ <g id="Capa_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <polygon class="fil0" points="494,409 826,766 1158,409 1214,457 882,826 1214,1196 1158,1244 826,886 494,1244 439,1196 770,826 439,457 "/>
+  <path class="fil0" d="M1360 292c-136,-137 -325,-221 -534,-221 -208,0 -397,84 -534,221 -137,137 -221,326 -221,534 0,209 84,398 221,534 137,137 326,222 534,222 209,0 398,-85 534,-222 137,-136 222,-325 222,-534 0,-208 -85,-397 -222,-534zm-534 -292c228,0 435,92 584,242 150,149 242,356 242,584 0,228 -92,435 -242,584 -149,150 -356,242 -584,242 -228,0 -435,-92 -584,-242 -150,-149 -242,-356 -242,-584 0,-228 92,-435 242,-584 149,-150 356,-242 584,-242z"/>
+ </g>
+</svg>
-- 
1.9.1