Marcelo Puebla / foca-crear-nota-pedido

Download as
Browse Code ยป

Commit b131f7c474d7cae0fb69063299317a5ccf17cc9b

Authored by Pablo Marco del Pont
2 parents 3011e0a3f1 dbc9294752
Exists in master and in 1 other branch develop

Merge branch 'master' of https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido

Showing 5 changed files   Show diff stats
... ... @@ -45,7 +45,7 @@ gulp.task('uglify', ['templates'], function() {
45 45 uglify(),
46 46 replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+
47 47 '"focaModalPetroleras","focaBusquedaCliente","focaModalPrecioCondicion",'+
48   - '"focaModalFlete","focaDirectivas","focaModal"', ''),
  48 + '"focaModalFlete","focaDirectivas","focaModal","focaModalDomicilio"', ''),
49 49 gulp.dest(paths.dist)
50 50 ]
51 51 );
... ... @@ -22,6 +22,7 @@
22 22 <script src="node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
23 23 <script src="node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
24 24 <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
  25 + <script src="node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
25 26  
26 27 <script src="src/js/app.js"></script>
27 28 <script src="src/js/controller.js"></script>
... ... @@ -8,7 +8,7 @@
8 8 "compile": "gulp uglify",
9 9 "gulp-pre-commit": "gulp pre-commit",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "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"
  11 + "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"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -34,6 +34,7 @@
34 34 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
35 35 "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git",
36 36 "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos",
  37 + "foca-modal-domicilio": "git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git",
37 38 "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete",
38 39 "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
39 40 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
... ... @@ -8,5 +8,6 @@ angular.module(&#39;focaCrearNotaPedido&#39;, [
8 8 'focaModalPrecioCondicion',
9 9 'focaModalFlete',
10 10 'focaDirectivas',
11   - 'focaModal'
  11 + 'focaModal',
  12 + 'focaModalDomicilio'
12 13 ]);
src/js/controller.js
Diff comments   View file @ b131f7c
... ... @@ -229,10 +229,29 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
229 229 );
230 230 return;
231 231 }
232   - $scope.domiciliosCliente = data.data;
  232 + var modalInstanceDomicilio = $uibModal.open(
  233 + {
  234 + ariaLabelledBy: 'Busqueda de Domicilios',
  235 + templateUrl: 'modal-domicilio.html',
  236 + controller: 'focaModalDomicilioController',
  237 + resolve: { idCliente: function() { return cliente.cod; }},
  238 + size: 'lg',
  239 + backdrop: 'static',
  240 + }
  241 + );
  242 + modalInstanceDomicilio.result.then(
  243 + function(domicilio) {
  244 + focaModalService.alert('Domicilio elegido' + domicilio.dom);
  245 + }, function() {
  246 + $scope.notaPedido.cliente.nombre = '';
  247 + $scope.notaPedido.cliente.id = '';
  248 + removeCabecera('Cliente:');
  249 + $scope.seleccionarCliente();
  250 + return;
  251 + }
  252 + );
233 253 }
234 254 );
235   -
236 255 addCabecera('Cliente:', cliente.nom);
237 256 }, function() {
238 257