Luigi / foca-crear-nota-pedido

Download as
Browse Code »

Commit 165431d34b9f0d4cd6ee337bd8c23b1bd7ef1249

Authored by Pablo Marco del Pont
2 parents 0eb9138d2b cb25b05320
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request modulos-npm/foca-crear-nota-pedido!7
Showing 6 changed files   Show diff stats
... ... @@ -44,7 +44,7 @@ gulp.task('uglify', ['templates'], function() {
44 44 rename('foca-crear-nota-pedido.min.js'),
45 45 uglify(),
46 46 replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+
47   - '"focaModalPetroleras","focaBusquedaCliente"', ''),
  47 + '"focaModalPetroleras","focaBusquedaCliente","focaModalPrecioCondicion"', ''),
48 48 gulp.dest(paths.dist)
49 49 ]
50 50 );
... ... @@ -19,6 +19,7 @@
19 19 <script src="node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
20 20 <script src="node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script>
21 21 <script src="node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
  22 + <script src="node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
22 23  
23 24 <script src="src/js/app.js"></script>
24 25 <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/nguarnieri/foca-modal-busqueda-productos git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.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/nguarnieri/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"
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-busqueda-productos": "git+https://debo.suite.repo/nguarnieri/foca-modal-busqueda-productos",
36 36 "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
  37 + "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
37 38 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
38 39 "font-awesome": "^4.7.0",
39 40 "gulp": "^3.9.1",
... ... @@ -4,5 +4,6 @@ angular.module(&#39;focaCrearNotaPedido&#39;, [
4 4 'focaModalVendedores',
5 5 'focaBusquedaProductos',
6 6 'focaModalPetroleras',
7   - 'focaBusquedaCliente'
  7 + 'focaBusquedaCliente',
  8 + 'focaModalPrecioCondicion'
8 9 ]);
src/js/controller.js
Diff comments   View file @ 165431d
... ... @@ -199,6 +199,23 @@ angular.module(&#39;focaCrearNotaPedido&#39;)
199 199 idLista = $scope.notaPedido.precioCondicion;
200 200 $scope.articulosTabla = [];
201 201 };
  202 + $scope.abrirModalListaPrecio = function() {
  203 + var modalInstance = $uibModal.open(
  204 + {
  205 + ariaLabelledBy: 'Busqueda de Precio Condición',
  206 + templateUrl: 'modal-precio-condicion.html',
  207 + controller: 'focaModalPrecioCondicionController',
  208 + size: 'lg'
  209 + }
  210 + );
  211 + modalInstance.result.then(
  212 + function(precioCondicion) {
  213 + $scope.notaPedido.precioCondicion = precioCondicion.nombre;
  214 + }, function() {
  215 +
  216 + }
  217 + );
  218 + };
202 219 }
203 220 ]
204 221 )
src/views/nota-pedido.html
Diff comments   View file @ 165431d
... ... @@ -57,7 +57,7 @@
57 57 class="form-control selectable"
58 58 type="text"
59 59 readonly="true"
60   - ng-bind="vendedor.nombre"
  60 + ng-bind="notaPedido.precioCondicion"
61 61 ng-click="abrirModalListaPrecio()"
62 62 placeholder="Seleccione Lista de precio"
63 63 >