Commit 83f7387951b0219352477809706d4f39886b9f31
Exists in
master
and in
1 other branch
Merge branch 'master' into 'develop'
Master(efernandez) See merge request !31
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -289,7 +289,7 @@ angular.module('focaCrearFactura').controller('facturaController', [ |
| 289 | 289 | { label: 'Cliente' })[0].checked = true; |
| 290 | 290 | |
| 291 | 291 | $scope.$broadcast('addCabecera', { |
| 292 | - label: 'Tipo de pago: ', | |
| 292 | + label: 'Forma de pago: ', | |
| 293 | 293 | valor: data.tipo |
| 294 | 294 | }); |
| 295 | 295 | }) |
src/js/controllerCombustibles.js
| ... | ... | @@ -39,9 +39,13 @@ angular.module('focaCrearFactura') |
| 39 | 39 | |
| 40 | 40 | $scope.mangueras = productosByMangera; |
| 41 | 41 | |
| 42 | - $scope.mangera.despachos.sort(function (a, b) { | |
| 43 | - return a.FEC - b.FEC; | |
| 42 | + $scope.mangueras.forEach(function (producto) { | |
| 43 | + | |
| 44 | + producto.despachos.sort(function (a, b) { | |
| 45 | + return a.FEC - b.FEC; | |
| 46 | + }); | |
| 44 | 47 | }); |
| 48 | + | |
| 45 | 49 | |
| 46 | 50 | $scope.aceptar = function (despacho) { |
| 47 | 51 | $uibModalInstance.close(despacho); |