diff --git a/gulpfile.js b/gulpfile.js index 0eca41b..18368de 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -44,7 +44,7 @@ gulp.task('uglify', ['templates'], function() { rename('foca-crear-nota-pedido.min.js'), uglify(), replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+ - '"focaModalPetroleras","focaBusquedaCliente","focaModalPrecioCondicion",'+ + '"focaModalProveedor","focaBusquedaCliente","focaModalPrecioCondicion",'+ '"focaModalFlete","focaDirectivas","focaModal","focaModalDomicilio"', ''), gulp.dest(paths.dist) ] diff --git a/index.html b/index.html index 494fcf9..35300bc 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ - + diff --git a/package.json b/package.json index 608143e..8d8df59 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-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-petroleras.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" + "install-dev": "npm install -D jasmine-core pre-commit angular 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" }, "pre-commit": [ "gulp-pre-commit" @@ -23,7 +23,7 @@ "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git", "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos", - "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git", + "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git", "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git" }, "devDependencies": { @@ -36,7 +36,7 @@ "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos", "foca-modal-domicilio": "git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git", "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete", - "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git", + "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git", "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git", "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git", "font-awesome": "^4.7.0", diff --git a/src/js/app.js b/src/js/app.js index e373587..c904a8c 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -3,7 +3,7 @@ angular.module('focaCrearNotaPedido', [ 'ui.bootstrap', 'focaModalVendedores', 'focaBusquedaProductos', - 'focaModalPetroleras', + 'focaModalProveedor', 'focaBusquedaCliente', 'focaModalPrecioCondicion', 'focaModalFlete', diff --git a/src/js/controller.js b/src/js/controller.js index 3fbeac2..e5f86fe 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -8,7 +8,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', $scope.botonera = [ {texto: 'Vendedor', accion: function() {$scope.seleccionarVendedor();}}, {texto: 'Cliente', accion: function() {$scope.seleccionarCliente();}}, - {texto: 'Proveedor', accion: function() {}}, + {texto: 'Proveedor', accion: function() {$scope.seleccionarProveedor();}}, {texto: 'Moneda', accion: function() {$scope.abrirModalMoneda();}}, { texto: 'Precios y condiciones', @@ -188,18 +188,19 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', ); }; - $scope.seleccionarPetrolera = function() { + $scope.seleccionarProveedor = function() { var modalInstance = $uibModal.open( { - ariaLabelledBy: 'Busqueda de Petrolera', - templateUrl: 'modal-petroleras.html', - controller: 'modalPetrolerasCtrl', + ariaLabelledBy: 'Busqueda de Proveedor', + templateUrl: 'modal-proveedor.html', + controller: 'focaModalProveedorCtrl', size: 'lg' } ); modalInstance.result.then( - function(petrolera) { - $scope.notaPedido.petrolera = petrolera.NOM; + function(proveedor) { + $scope.notaPedido.proveedor = proveedor.NOM; + addCabecera('Proveedor:', proveedor.NOM); }, function() { } diff --git a/src/views/nota-pedido-lista.html b/src/views/nota-pedido-lista.html index e64cd14..9fd3fa2 100644 --- a/src/views/nota-pedido-lista.html +++ b/src/views/nota-pedido-lista.html @@ -4,7 +4,7 @@