Commit 95e614b148ef233585f97a18ece6371451c1cedb
Exists in
master
Merge branch 'master' into 'master'
fix flete See merge request modulos-npm/foca-crear-remito!25
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -140,11 +140,8 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 140 | 140 | }, |
| 141 | 141 | { |
| 142 | 142 | label: 'Flete:', |
| 143 | - valor: notaPedido.flete === 1 ? 'Si' : 'No' | |
| 144 | - }, | |
| 145 | - { | |
| 146 | - label: 'FOB:', | |
| 147 | - valor: notaPedido.fob === 1 ? 'Si' : 'No' | |
| 143 | + valor: notaPedido.fob === 1 ? 'FOB' : ( | |
| 144 | + notaPedido.flete === 1 ? 'Si' : 'No') | |
| 148 | 145 | }, |
| 149 | 146 | { |
| 150 | 147 | label: 'Precio condicion:', |
| ... | ... | @@ -252,11 +249,8 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 252 | 249 | }, |
| 253 | 250 | { |
| 254 | 251 | label: 'Flete:', |
| 255 | - valor: remito.flete === 1 ? 'Si' : 'No' | |
| 256 | - }, | |
| 257 | - { | |
| 258 | - label: 'FOB:', | |
| 259 | - valor: remito.fob === 1 ? 'Si' : 'No' | |
| 252 | + valor: remito.fob === 1 ? 'FOB' : ( | |
| 253 | + remito.flete === 1 ? 'Si' : 'No') | |
| 260 | 254 | }, |
| 261 | 255 | { |
| 262 | 256 | label: 'Precio condicion:', |