Commit 9e483702bf2e3ea6c07280b8af869d4100c1385e
Exists in
master
Merge branch 'master' into 'master'
refactor servicios See merge request modulos-npm/foca-hoja-ruta!15
Showing
3 changed files
Show diff stats
package.json
| ... | ... | @@ -28,22 +28,23 @@ |
| 28 | 28 | "foca-modal-remito": "git+https://debo.suite.repo/modulos-npm/foca-modal-remito.git", |
| 29 | 29 | "font-awesome": "^4.7.0", |
| 30 | 30 | "gulp": "^3.9.1", |
| 31 | - "gulp-angular-templatecache": "2.2.5", | |
| 31 | + "gulp-angular-templatecache": "^2.2.5", | |
| 32 | 32 | "gulp-clean": "^0.4.0", |
| 33 | 33 | "gulp-concat": "^2.6.1", |
| 34 | 34 | "gulp-connect": "^5.6.1", |
| 35 | - "gulp-htmlmin": "5.0.1", | |
| 36 | - "gulp-jshint": "2.1.0", | |
| 37 | - "gulp-rename": "1.4.0", | |
| 38 | - "gulp-replace": "1.0.0", | |
| 35 | + "gulp-htmlmin": "^5.0.1", | |
| 36 | + "gulp-jshint": "^2.1.0", | |
| 37 | + "gulp-rename": "^1.4.0", | |
| 38 | + "gulp-replace": "^1.0.0", | |
| 39 | 39 | "gulp-sequence": "^1.0.0", |
| 40 | - "gulp-uglify": "3.0.1", | |
| 40 | + "gulp-uglify": "^3.0.1", | |
| 41 | + "gulp-uglify-es": "^1.0.4", | |
| 41 | 42 | "jasmine-core": "^3.3.0", |
| 42 | 43 | "jquery": "^3.3.1", |
| 43 | - "jshint": "2.9.6", | |
| 44 | + "jshint": "^2.9.6", | |
| 44 | 45 | "ladda": "1.0.6", |
| 45 | 46 | "pre-commit": "^1.2.2", |
| 46 | - "pump": "3.0.0", | |
| 47 | + "pump": "^3.0.0", | |
| 47 | 48 | "ui-bootstrap4": "^3.0.5" |
| 48 | 49 | } |
| 49 | 50 | } |
src/js/controller.js
| ... | ... | @@ -7,9 +7,9 @@ angular.module('focaHojaRuta') |
| 7 | 7 | $scope.hojasRuta = hojaRuta; |
| 8 | 8 | $scope.puntoVenta = hojaRuta.sucursal; |
| 9 | 9 | $scope.comprobante = hojaRuta.numeroHojaRuta; |
| 10 | - addCabecera('Transportista:', hojaRuta.transportista[0].nombre); | |
| 11 | - addCabecera('Chofer:', hojaRuta.chofer[0].nombre); | |
| 12 | - addCabecera('Vehículo:', hojaRuta.vehiculo[0].tractor); | |
| 10 | + addCabecera('Transportista:', hojaRuta.transportista.NOM); | |
| 11 | + addCabecera('Chofer:', hojaRuta.chofer.nombre); | |
| 12 | + addCabecera('Vehículo:', hojaRuta.vehiculo.tractor); | |
| 13 | 13 | }); |
| 14 | 14 | $scope.cabecera = []; |
| 15 | 15 | $scope.showCabecera = true; |
src/views/lista-hoja-ruta.html