Merge branch 'develop' into 'develop'

Develop See merge request !115

Merge branch 'develop' into 'develop'
Develop See merge request !115
Marcelo Puebla
2 parents 6cc7e71f1d 3c3ef99287
Showing 2 changed files Show diff stats
src/app/interfaces/IComanda.ts
src/app/modules/comanda/comanda.component.html
@@ -20,6 +20,7 @@ export interface IComandaDetalle {
   idArticulo: number;
   componentes: IComponente[];
   seeDetalle?: boolean;
+  MKT_DESC?: string;
 }
  
 export interface IComponente {
@@ -50,7 +50,7 @@
                   }">
                   <!-- DETALLE Y CANTIDAD -->
                   <p>
-                    <small>{{detalle.DetLar.toUpperCase()}}</small><br>
+                    <small>{{detalle.MKT_DESC ? detalle.MKT_DESC.toUpperCase() : detalle.DetArt.toUpperCase()}}</small><br>
                     <small>CANT.{{detalle.cantidad}}</small>
                   </p>
                   <div *ngFor="let componente of detalle.componentes">
@@ -72,13 +72,13 @@
                 (click)="updateComanda(comanda, 2, 'En elaboracion')">
                 <div class="row justify-content-between">
                   <div></div>
-                  <p class="ml-4" style="color: #fff;">Elaborar</p>
+                  <p class="ml-4 text-white">Elaborar</p>
                   <img
-                  draggable="false"
-                  ondragstart="return false;"
-                  (contextmenu)="false"
-                  class="icon-30 mr-2"
-                  src="assets/img/ir.svg">
+                    draggable="false"
+                    ondragstart="return false;"
+                    (contextmenu)="false"
+                    class="icon-30 mr-2"
+                    src="assets/img/ir.svg">
                 </div>
               </button>
               <button
...	...	@@ -20,6 +20,7 @@ export interface IComandaDetalle {
20	20	idArticulo: number;
21	21	componentes: IComponente[];
22	22	seeDetalle?: boolean;
	23	+ MKT_DESC?: string;
23	24	}
24	25
25	26	export interface IComponente {
...	...	@@ -50,7 +50,7 @@
50	50	}">
51	51	<!-- DETALLE Y CANTIDAD -->
52	52	<p>
53		- <small>{{detalle.DetLar.toUpperCase()}}</small><br>
	53	+ <small>{{detalle.MKT_DESC ? detalle.MKT_DESC.toUpperCase() : detalle.DetArt.toUpperCase()}}</small><br>
54	54	<small>CANT.{{detalle.cantidad}}</small>
55	55	</p>
56	56	<div *ngFor="let componente of detalle.componentes">
...	...	@@ -72,13 +72,13 @@
72	72	(click)="updateComanda(comanda, 2, 'En elaboracion')">
73	73	<div class="row justify-content-between">
74	74	<div></div>
75		- <p class="ml-4" style="color: #fff;">Elaborar</p>
	75	+ <p class="ml-4 text-white">Elaborar</p>
76	76	<img
77		- draggable="false"
78		- ondragstart="return false;"
79		- (contextmenu)="false"
80		- class="icon-30 mr-2"
81		- src="assets/img/ir.svg">
	77	+ draggable="false"
	78	+ ondragstart="return false;"
	79	+ (contextmenu)="false"
	80	+ class="icon-30 mr-2"
	81	+ src="assets/img/ir.svg">
82	82	</div>
83	83	</button>
84	84	<button