Merge branch 'develop' into 'develop'

Develop See merge request !136

Merge branch 'develop' into 'develop'
Develop See merge request !136
Marcelo Puebla
2 parents f0394b94c4 7c6f55f57c
Showing 2 changed files Show diff stats
src/app/interfaces/IComanda.ts
src/app/modules/comanda/comanda.component.html
@@ -20,7 +20,7 @@ export interface IComandaDetalle {
   idArticulo: number;
   componentes: IComponente[];
   seeDetalle?: boolean;
-  MKT_DESC?: string;
+  MktDesc?: string;
 }
  
 export interface IComponente {
@@ -50,7 +50,7 @@
                   }">
                   <!-- DETALLE Y CANTIDAD -->
                   <p>
-                    <small>{{detalle.MKT_DESC ? detalle.MKT_DESC.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br>
+                    <small>{{detalle.MktDesc ? detalle.MktDesc.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br>
                     <small>CANT.{{detalle.cantidad}}</small>
                   </p>
                   <div *ngFor="let componente of detalle.componentes">
...	...	@@ -20,7 +20,7 @@ export interface IComandaDetalle {
20	20	idArticulo: number;
21	21	componentes: IComponente[];
22	22	seeDetalle?: boolean;
23		- MKT_DESC?: string;
	23	+ MktDesc?: string;
24	24	}
25	25
26	26	export interface IComponente {
...	...	@@ -50,7 +50,7 @@
50	50	}">
51	51	<!-- DETALLE Y CANTIDAD -->
52	52	<p>
53		- <small>{{detalle.MKT_DESC ? detalle.MKT_DESC.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br>
	53	+ <small>{{detalle.MktDesc ? detalle.MktDesc.toUpperCase() : detalle.DetLar.toUpperCase()}}</small><br>
54	54	<small>CANT.{{detalle.cantidad}}</small>
55	55	</p>
56	56	<div *ngFor="let componente of detalle.componentes">