Commit 63d05e3575be6df93bed058466cc4588dae73c72
1 parent
c0938b7d0f
Exists in
master
refactor seleccionar efectivo
Showing
1 changed file
with
8 additions
and
9 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -376,7 +376,10 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 376 | 376 | controller: 'focaModalEfectivoController', |
| 377 | 377 | size: 'sm', |
| 378 | 378 | resolve: { |
| 379 | - sugerido: function() {return $scope.getTotalDeuda();} | |
| 379 | + sugerido: function() { | |
| 380 | + var sugerido = $scope.getTotalDeuda() + $scope.getTotalCobrado(); | |
| 381 | + return sugerido < 0 ? sugerido : null ; | |
| 382 | + } | |
| 380 | 383 | } |
| 381 | 384 | } |
| 382 | 385 | ); |
| ... | ... | @@ -387,15 +390,11 @@ angular.module('focaCrearCobranza') .controller('cobranzaController', |
| 387 | 390 | fecha: new Date(), |
| 388 | 391 | importe: efectivo * $scope.cobranza.cotizacion.VENDEDOR |
| 389 | 392 | }; |
| 390 | - var existeCobroEfectivo = $scope.cobrosTabla.filter(function(a) { | |
| 391 | - return a.tipo === 'Efectivo'; | |
| 393 | + $scope.cobrosTabla = $scope.cobrosTabla.filter(function(a) { | |
| 394 | + return a.tipo !== 'Efectivo'; | |
| 392 | 395 | }); |
| 393 | - if(existeCobroEfectivo.length > 0) { | |
| 394 | - existeCobroEfectivo[0].importe += efectivo * | |
| 395 | - $scope.cobranza.cotizacion.VENDEDOR; | |
| 396 | - } else { | |
| 397 | - $scope.cobrosTabla.push(cobro); | |
| 398 | - } | |
| 396 | + $scope.cobrosTabla.push(cobro); | |
| 397 | + | |
| 399 | 398 | }, function() { |
| 400 | 399 | |
| 401 | 400 | } |