Commit 870fbfe18ed73f4592bcccf83d7ddeaa0ff41f1b
Exists in
master
Merge branch 'develop' into 'master'
Develop See merge request !75
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -139,8 +139,8 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 139 | 139 | NCO: $scope.comprobante, |
| 140 | 140 | LOP: 'L', |
| 141 | 141 | TIL: $scope.cobranza.facturas[i].TCO, |
| 142 | - COM: $scope.cobranza.facturas[i].COM + '-' + | |
| 143 | - $filter('rellenarDigitos')($scope.cobranza.facturas[i].NCU,2), | |
| 142 | + COM: $scope.cobranza.facturas[i].numeroFactura + '-' + | |
| 143 | + $filter('rellenarDigitos')($scope.cobranza.facturas[i].NCU), | |
| 144 | 144 | FEC: new Date($scope.cobranza.FEC) |
| 145 | 145 | .toISOString().slice(0, 19).replace('T', ' '), |
| 146 | 146 | IMP: Math.abs($scope.cobranza.facturas[i].IMP || |
| ... | ... | @@ -150,11 +150,8 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 150 | 150 | NCU: $scope.cobranza.facturas[i].NCU |
| 151 | 151 | }; |
| 152 | 152 | cuerpos.push(cuerpoFactura); |
| 153 | - | |
| 154 | 153 | } |
| 155 | - | |
| 156 | 154 | for (var j = 0; j < $scope.cobranza.cobros.length; j++) { |
| 157 | - | |
| 158 | 155 | var efectivo = $scope.cobranza.cobros[j].tipo === 'Efectivo'; |
| 159 | 156 | var cuerpoCobros = { |
| 160 | 157 | CYV: 'V', |
| ... | ... | @@ -283,15 +280,16 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 283 | 280 | }, |
| 284 | 281 | cliente: $scope.cobranza.cliente, |
| 285 | 282 | imgs: imgs, |
| 286 | - observacion: observacion | |
| 283 | + observacion: observacion, | |
| 284 | + facturasACobrar: $scope.cobranza.facturas | |
| 287 | 285 | }; |
| 288 | 286 | //COPIO cobranzaMail Y A cobranza LE ELIMINO EL VALOR NCU DE LOS CUERPOS |
| 289 | 287 | var cobranzaMail = angular.copy(cobranza); |
| 288 | + | |
| 290 | 289 | cobranza.cuerpo = cobranza.cuerpo.map(function(c) { |
| 291 | 290 | if (c.NCU) delete c.NCU; |
| 292 | 291 | return c; |
| 293 | 292 | }); |
| 294 | - | |
| 295 | 293 | focaCrearCobranzaService |
| 296 | 294 | .guardarCobranza(cobranza) |
| 297 | 295 | .then( |
| ... | ... | @@ -307,7 +305,7 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 307 | 305 | '' |
| 308 | 306 | ); |
| 309 | 307 | |
| 310 | - init(); | |
| 308 | + config(); | |
| 311 | 309 | }, function(error) { |
| 312 | 310 | focaModalService.alert('Hubo un problema al cargar la cobranza'); |
| 313 | 311 | focaBotoneraLateralService.endGuardar(); |