diff --git a/index.html b/index.html index aa71710..6c50334 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/package.json b/package.json index b5496d1..17447c6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "compile": "gulp uglify", "gulp-pre-commit": "gulp pre-commit", "postinstall": "npm run compile && gulp clean-post-install", - "install-dev": "npm install -D jasmine-core pre-commit angular angular-ladda ladda@1.0.6 angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+https://debo.suite.repo/modulos-npm/foca-directivas.git git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git git+https://debo.suite.repo/modulos-npm/foca-modal-flete git+https://debo.suite.repo/modulos-npm/foca-modal.git git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git git+https://debo.suite.repo/modulos-npm/foca-seguimiento.git git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git git+https://debo.suite.repo/modulos-npm/foca-modal-cotizacion.git" + "install-dev": "npm install -D jasmine-core pre-commit angular angular-ladda ladda@1.0.6 angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+https://debo.suite.repo/modulos-npm/foca-directivas.git git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git git+https://debo.suite.repo/modulos-npm/foca-modal-flete git+https://debo.suite.repo/modulos-npm/foca-modal.git git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git git+https://debo.suite.repo/modulos-npm/foca-seguimiento.git git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git git+https://debo.suite.repo/modulos-npm/foca-modal-cotizacion.git git+https://debo.suite.repo/modulos-npm/foca-configuracion.git" }, "pre-commit": [ "gulp-pre-commit" @@ -63,6 +63,8 @@ "ladda": "1.0.6", "pre-commit": "^1.2.2", "pump": "^3.0.0", - "ui-bootstrap4": "^3.0.5" + "ui-bootstrap4": "^3.0.5", + "angular-cookies": "^1.7.5", + "foca-configuracion": "git+https://debo.suite.repo/modulos-npm/foca-configuracion.git" } } diff --git a/src/js/app.js b/src/js/app.js index 341fe24..43a8019 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1,5 +1,6 @@ angular.module('focaCrearRemito', [ 'ngRoute', + 'ngCookies', 'ui.bootstrap', 'focaModalVendedores', 'focaBusquedaProductos', @@ -12,7 +13,6 @@ angular.module('focaCrearRemito', [ 'focaModalDomicilio', 'focaModalMoneda', 'focaModalCotizacion', - 'focaSeguimiento', - 'angular-ladda', - 'cordovaGeolocationModule' + 'focaConfiguracion', + 'angular-ladda' ]); diff --git a/src/js/controller.js b/src/js/controller.js index 96368e2..438a283 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,10 +1,10 @@ angular.module('focaCrearRemito') .controller('remitoController', [ '$scope', '$uibModal', '$location', '$filter', 'crearRemitoService', - 'focaModalService', 'focaSeguimientoService', 'remitoBusinessService', + 'focaModalService', 'remitoBusinessService', function( $scope, $uibModal, $location, $filter, crearRemitoService, focaModalService, - focaSeguimientoService, remitoBusinessService + remitoBusinessService ) { $scope.botonera = [ {texto: 'Vendedor', accion: function() {$scope.seleccionarVendedor();}}, @@ -69,6 +69,17 @@ angular.module('focaCrearRemito') .controller('remitoController', $scope.precioCondiciones = res.data; } ); + + crearRemitoService.getNumeroRemito().then( + function(res) { + $scope.puntoVenta = rellenar(res.data.sucursal, 4); + $scope.comprobante = rellenar(res.data.numeroNotaPedido, 8); + }, + function(err) { + focaModalService.alert('La terminal no esta configurada correctamente'); + console.info(err); + } + ); //La pantalla solo se usa para cargar remitos // if (remitoTemp !== undefined) { // remitoTemp.fechaCarga = new Date(remitoTemp.fechaCarga); @@ -164,7 +175,6 @@ angular.module('focaCrearRemito') .controller('remitoController', function(data) { remitoBusinessService.addArticulos($scope.articulosTabla, data.data.id, $scope.remito.cotizacion.COTIZACION); - focaSeguimientoService.guardarPosicion('crear nota remito', ''); var plazos = $scope.plazosPagos; for(var j = 0; j < plazos.length; j++) { var json = { @@ -580,6 +590,15 @@ angular.module('focaCrearRemito') .controller('remitoController', $scope.cabecera.splice($scope.cabecera.indexOf(propiedad[0]), 1); } } + + function rellenar(relleno, longitud) { + relleno = '' + relleno; + while (relleno.length < longitud) { + relleno = '0' + relleno; + } + + return relleno; + } } ] ) diff --git a/src/js/service.js b/src/js/service.js index 9d03861..68b5998 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -52,6 +52,9 @@ angular.module('focaCrearRemito') }, crearEstadoParaRemito: function(estado) { return $http.post(route + '/estado', {estado: estado}); + }, + getNumeroRemito: function() { + return $http.get(route + '/nota-pedido/numero-siguiente'); } }; }]);