Merge branch 'develop' into 'master'

Develop See merge request !6

Merge branch 'develop' into 'master'
Develop See merge request !6
Eric Fernandez
2 parents 7001935009 0f110cee2d
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-modal-cobranza.html
@@ -129,7 +129,7 @@ angular.module(&#39;focaModalCobranza&#39;)
                 $scope.getTotalCobrado = function(cobros) {
                     var total = 0;
                     for (var i = 0; i < cobros.length; i++) {
-                        total += cobros[i].importe;
+                        total += cobros[i].IMP;
                     }
                     return parseFloat(total.toFixed(2));
                 };
@@ -97,9 +97,9 @@
             <tr class="selectable"
                 ng-repeat="(key, cobranza) in currentPageCobranzas"
                 ng-click="select(cobranza)">
-                <td ng-bind="cobranza.fecha | date : 'dd/MM/yyyy'"></td>
+                <td ng-bind="cobranza.FEC | date : 'dd/MM/yyyy'"></td>
                 <td ng-bind="cobranza.cliente.NOM"></td>
-                <td ng-bind="[cobranza.puntoVenta, cobranza.numeroRecibo] | comprobante"></td>
+                <td ng-bind="[cobranza.PVE, cobranza.NCO] | comprobante"></td>
                 <td ng-bind="getTotalCobrado(cobranza.cobros) | number: 2"></td>
                 <td>
                     <button
...	...	@@ -129,7 +129,7 @@ angular.module('focaModalCobranza')
129	129	$scope.getTotalCobrado = function(cobros) {
130	130	var total = 0;
131	131	for (var i = 0; i < cobros.length; i++) {
132		- total += cobros[i].importe;
	132	+ total += cobros[i].IMP;
133	133	}
134	134	return parseFloat(total.toFixed(2));
135	135	};
...	...	@@ -97,9 +97,9 @@
97	97	<tr class="selectable"
98	98	ng-repeat="(key, cobranza) in currentPageCobranzas"
99	99	ng-click="select(cobranza)">
100		- <td ng-bind="cobranza.fecha \| date : 'dd/MM/yyyy'"></td>
	100	+ <td ng-bind="cobranza.FEC \| date : 'dd/MM/yyyy'"></td>
101	101	<td ng-bind="cobranza.cliente.NOM"></td>
102		- <td ng-bind="[cobranza.puntoVenta, cobranza.numeroRecibo] \| comprobante"></td>
	102	+ <td ng-bind="[cobranza.PVE, cobranza.NCO] \| comprobante"></td>
103	103	<td ng-bind="getTotalCobrado(cobranza.cobros) \| number: 2"></td>
104	104	<td>
105	105	<button