Merge branch 'develop' into 'develop'

Develop See merge request !110

Merge branch 'develop' into 'develop'
Develop See merge request !110
Marcelo Puebla
2 parents 380fad6ece 994ed32ee7
Showing 3 changed files Show diff stats
src/app/interfaces/IArticulo.ts
src/app/shared/promocion/promocion.component.html
src/app/shared/sinonimo/sinonimo.component.html
@@ -30,6 +30,7 @@ export interface IArticulo {
   CODP?: number;
   SECA?: number;
   SECP?: number;
+  MKT_DESC?: string;
 }
  
 export interface ICodigoBarra {
@@ -9,7 +9,7 @@
       src="assets/img/icono-cancelar-blanco.svg">
     <div class="row w-100 no-gutters justify-content-between">
       <div class="col align-self-center">
-        <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
+        <p class="h3 text-white">{{articulosPromo[0].MKT_DESC ? articulosPromo[0].MKT_DESC.toUpperCase() : articulosPromo[0].DetArt.toUpperCase()}}</p>
       </div>
       <div class="col-auto align-self-center mt-4 pl-2">
         <div
@@ -63,7 +63,7 @@
             class="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="text-truncate mr-auto my-auto"><small>{{promo.MKT_DESC ? promo.MKT_DESC.toUpperCase() : promo.DetArt.toUpperCase()}}</small></p>
               <p class="font-weight-bold ml-auto my-auto pr-2">
                 <span>{{promo.PreVen | currency}}</span>
               </p>
@@ -7,7 +7,7 @@
       (click)="close()"
       class="btn-effect icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
       src="assets/img/icono-cancelar-blanco.svg">
-    <p class="col-7 h4 px-0 align-self-center">{{articulo.DetArt}}</p>
+    <p class="col-7 h4 px-0 align-self-center">{{ articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase() }}</p>
     <div class="col-5 pt-4 pr-0 text-right">
       <p *ngFor="let s of sinonimos; let i = index">
         <span
...	...	@@ -30,6 +30,7 @@ export interface IArticulo {
30	30	CODP?: number;
31	31	SECA?: number;
32	32	SECP?: number;
	33	+ MKT_DESC?: string;
33	34	}
34	35
35	36	export interface ICodigoBarra {
...	...	@@ -9,7 +9,7 @@
9	9	src="assets/img/icono-cancelar-blanco.svg">
10	10	<div class="row w-100 no-gutters justify-content-between">
11	11	<div class="col align-self-center">
12		- <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
	12	+ <p class="h3 text-white">{{articulosPromo[0].MKT_DESC ? articulosPromo[0].MKT_DESC.toUpperCase() : articulosPromo[0].DetArt.toUpperCase()}}</p>
13	13	</div>
14	14	<div class="col-auto align-self-center mt-4 pl-2">
15	15	<div
...	...	@@ -63,7 +63,7 @@
63	63	class="btn-effect bg-white badge-pill text-primary"
64	64	(click)="selectPromo(promo)">
65	65	<div class="d-flex">
66		- <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
	66	+ <p class="text-truncate mr-auto my-auto"><small>{{promo.MKT_DESC ? promo.MKT_DESC.toUpperCase() : promo.DetArt.toUpperCase()}}</small></p>
67	67	<p class="font-weight-bold ml-auto my-auto pr-2">
68	68	<span>{{promo.PreVen \| currency}}</span>
69	69	</p>
...	...	@@ -7,7 +7,7 @@
7	7	(click)="close()"
8	8	class="btn-effect icon-30 mt-2 mr-2 position-absolute right-0 top-0 z-index"
9	9	src="assets/img/icono-cancelar-blanco.svg">
10		- <p class="col-7 h4 px-0 align-self-center">{{articulo.DetArt}}</p>
	10	+ <p class="col-7 h4 px-0 align-self-center">{{ articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase() }}</p>
11	11	<div class="col-5 pt-4 pr-0 text-right">
12	12	<p *ngFor="let s of sinonimos; let i = index">
13	13	<span