Eric Fernandez / foca-crear-nota-pedido

Download as
Browse Code ยป

Commit 60727f1f8dd99bc5e1ad1bb90ba95d86fe6171d9

Authored by Eric Fernandez
2 parents df5db9d148 d2986e26f7
Exists in master

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

# Conflicts:
#	src/js/controller.js
Showing 5 changed files   Show diff stats
... ... @@ -46,7 +46,7 @@ gulp.task('uglify', ['templates'], function() {
46 46 replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+
47 47 '"focaModalProveedor","focaBusquedaCliente","focaModalPrecioCondicion",'+
48 48 '"focaModalFlete","focaDirectivas","focaModal","focaModalDomicilio",'+
49   - '"angular-ladda","focaModalMoneda","focaModalCotizacion"', ''),
  49 + '"focaModalMoneda","focaModalCotizacion","focaSeguimiento","angular-ladda"', ''),
50 50 gulp.dest(paths.dist)
51 51 ]
52 52 );
... ... @@ -29,6 +29,7 @@
29 29 <script src="node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
30 30 <script src="node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
31 31 <script src="node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
  32 + <script src="node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
32 33  
33 34 <script src="src/js/app.js"></script>
34 35 <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-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-modal-moneda.git git+https://debo.suite.repo/modulos-npm/foca-modal-cotizacion.git"
  11 + "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"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -25,6 +25,7 @@
25 25 "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos",
26 26 "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git",
27 27 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git"
  28 + "foca-seguimiento": "git+https://debo.suite.repo/modulos-npm/foca-seguimiento.git"
28 29 },
29 30 "devDependencies": {
30 31 "angular": "^1.7.5",
... ... @@ -42,6 +43,7 @@
42 43 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
43 44 "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git",
44 45 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
  46 + "foca-seguimiento": "git+https://debo.suite.repo/modulos-npm/foca-seguimiento.git",
45 47 "font-awesome": "^4.7.0",
46 48 "gulp": "^3.9.1",
47 49 "gulp-angular-templatecache": "^2.2.2",
... ... @@ -10,7 +10,8 @@ angular.module(&#39;focaCrearNotaPedido&#39;, [
10 10 'focaDirectivas',
11 11 'focaModal',
12 12 'focaModalDomicilio',
13   - 'angular-ladda',
14 13 'focaModalMoneda',
15   - 'focaModalCotizacion'
  14 + 'focaModalCotizacion',
  15 + 'focaSeguimiento',
  16 + 'angular-ladda'
16 17 ]);
src/js/controller.js
Diff comments   View file @ 60727f1
1 1 angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
2 2 [
3 3 '$scope', '$uibModal', '$location', '$filter', 'crearNotaPedidoService',
4   - 'focaModalService',
  4 + 'focaModalService', 'focaSeguimientoService',
5 5 function(
6   - $scope, $uibModal, $location, $filter, crearNotaPedidoService, focaModalService
  6 + $scope, $uibModal, $location, $filter, crearNotaPedidoService, focaModalService,
  7 + focaSeguimientoService
7 8 ) {
8 9 $scope.botonera = [
9 10 {texto: 'Vendedor', accion: function() {$scope.seleccionarVendedor();}},
... ... @@ -155,7 +156,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
155 156 };
156 157 crearNotaPedidoService.crearNotaPedido(notaPedido).then(
157 158 function(data) {
158   -
  159 + focaSeguimientoService.guardarPosicion('crear nota pedido', '');
159 160 var articulosNotaPedido = $scope.articulosTabla;
160 161 for(var i = 0; i < articulosNotaPedido.length; i++) {
161 162 delete articulosNotaPedido[i].editCantidad;