Merge branch 'master' into 'master'

agrego importe a los resultados See merge request !3

Merge branch 'master' into 'master'
agrego importe a los resultados See merge request !3
Eric Fernandez
2 parents d5cb584de9 fc631e0304
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-modal-cobranza.html
@@ -127,6 +127,14 @@ angular.module(&#39;focaModalCobranza&#39;)
                     }
                 };
  
+                $scope.getTotalCobrado = function(cobros) {
+                    var total = 0;
+                    for (var i = 0; i < cobros.length; i++) {
+                        total += cobros[i].importe;
+                    }
+                    return parseFloat(total.toFixed(2));
+                };
+
                 function calcularPages(paginaActual) {
                     var paginas = [];
                     paginas.push(paginaActual);
@@ -86,6 +86,7 @@
                 <th>Fecha</th>
                 <th>Cliente</th>
                 <th>Comprobante</th>
+                <th>Importe</th>
                 <th></th>
             </tr>
         </thead>
@@ -101,6 +102,7 @@
                 <td ng-bind="cobranza.fecha | date : 'dd/MM/yyyy'"></td>
                 <td ng-bind="cobranza.cliente.NOM"></td>
                 <td ng-bind="[cobranza.puntoVenta, cobranza.numeroRecibo] | comprobante"></td>
+                <td ng-bind="getTotalCobrado(cobranza.cobros) | number: 2"></td>
                 <td>
                     <button
                         type="button"
...	...	@@ -127,6 +127,14 @@ angular.module('focaModalCobranza')
127	127	}
128	128	};
129	129
	130	+ $scope.getTotalCobrado = function(cobros) {
	131	+ var total = 0;
	132	+ for (var i = 0; i < cobros.length; i++) {
	133	+ total += cobros[i].importe;
	134	+ }
	135	+ return parseFloat(total.toFixed(2));
	136	+ };
	137	+
130	138	function calcularPages(paginaActual) {
131	139	var paginas = [];
132	140	paginas.push(paginaActual);
...	...	@@ -86,6 +86,7 @@
86	86	<th>Fecha</th>
87	87	<th>Cliente</th>
88	88	<th>Comprobante</th>
	89	+ <th>Importe</th>
89	90	<th></th>
90	91	</tr>
91	92	</thead>
...	...	@@ -101,6 +102,7 @@
101	102	<td ng-bind="cobranza.fecha \| date : 'dd/MM/yyyy'"></td>
102	103	<td ng-bind="cobranza.cliente.NOM"></td>
103	104	<td ng-bind="[cobranza.puntoVenta, cobranza.numeroRecibo] \| comprobante"></td>
	105	+ <td ng-bind="getTotalCobrado(cobranza.cobros) \| number: 2"></td>
104	106	<td>
105	107	<button
106	108	type="button"