From 51100380231c18b464d1aafa22052752ad78cc9d Mon Sep 17 00:00:00 2001 From: efernandez Date: Thu, 15 Nov 2018 11:59:31 -0300 Subject: [PATCH] fix flete --- src/js/controller.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 022bd24..57934d0 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -140,11 +140,8 @@ angular.module('focaCrearRemito') .controller('remitoController', }, { label: 'Flete:', - valor: notaPedido.flete === 1 ? 'Si' : 'No' - }, - { - label: 'FOB:', - valor: notaPedido.fob === 1 ? 'Si' : 'No' + valor: notaPedido.fob === 1 ? 'FOB' : ( + notaPedido.flete === 1 ? 'Si' : 'No') }, { label: 'Precio condicion:', @@ -252,11 +249,8 @@ angular.module('focaCrearRemito') .controller('remitoController', }, { label: 'Flete:', - valor: remito.flete === 1 ? 'Si' : 'No' - }, - { - label: 'FOB:', - valor: remito.fob === 1 ? 'Si' : 'No' + valor: remito.fob === 1 ? 'FOB' : ( + remito.flete === 1 ? 'Si' : 'No') }, { label: 'Precio condicion:', -- 1.9.1