Merge branch 'master' into 'master'

Master(efernandez) See merge request !15

Merge branch 'master' into 'master'
Master(efernandez) See merge request !15
Jose Pinto
2 parents f29bdf77d6 cec5cabc6e
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -380,7 +380,10 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                         ariaLabelledBy: 'Carga de cheques',
                         templateUrl: 'modal-efectivo.html',
                         controller: 'focaModalEfectivoController',
-                        size: 'sm'
+                        size: 'sm',
+                        resolve: {
+                            sugerido: function() {return $scope.getTotalDeuda();}
+                        }
                     }
                 );
                 modalInstance.result.then(
@@ -390,7 +393,15 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                             fecha: new Date(),
                             importe: efectivo * $scope.cobranza.cotizacion.VENDEDOR
                         };
-                        $scope.cobrosTabla.push(cobro);
+                        var existeCobroEfectivo = $scope.cobrosTabla.filter(function(a) {
+                            return a.tipo === 'Efectivo';
+                        });
+                        if(existeCobroEfectivo.length > 0) {
+                            existeCobroEfectivo[0].importe += efectivo *
+                                $scope.cobranza.cotizacion.VENDEDOR;
+                        } else {
+                            $scope.cobrosTabla.push(cobro);
+                        }
                     }, function() {
  
                     }
...	...	@@ -380,7 +380,10 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
380	380	ariaLabelledBy: 'Carga de cheques',
381	381	templateUrl: 'modal-efectivo.html',
382	382	controller: 'focaModalEfectivoController',
383		- size: 'sm'
	383	+ size: 'sm',
	384	+ resolve: {
	385	+ sugerido: function() {return $scope.getTotalDeuda();}
	386	+ }
384	387	}
385	388	);
386	389	modalInstance.result.then(
...	...	@@ -390,7 +393,15 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
390	393	fecha: new Date(),
391	394	importe: efectivo * $scope.cobranza.cotizacion.VENDEDOR
392	395	};
393		- $scope.cobrosTabla.push(cobro);
	396	+ var existeCobroEfectivo = $scope.cobrosTabla.filter(function(a) {
	397	+ return a.tipo === 'Efectivo';
	398	+ });
	399	+ if(existeCobroEfectivo.length > 0) {
	400	+ existeCobroEfectivo[0].importe += efectivo *
	401	+ $scope.cobranza.cotizacion.VENDEDOR;
	402	+ } else {
	403	+ $scope.cobrosTabla.push(cobro);
	404	+ }
394	405	}, function() {
395	406
396	407	}