Luigi / foca-crear-nota-pedido

Browse Code »

Commit 4cee7ed9234aec711ed288935c0bc3d383b0cbfe

Authored by Eric Fernandez 2018-10-19 13:18:36 -0300

1 parent 29128b7e8e

Exists in master

demo

Showing 6 changed files with 75 additions and 14 deletions Show diff stats

gulpfile.js

Diff comments View file @ 4cee7ed

1	const templateCache = require('gulp-angular-templatecache');	1	const templateCache = require('gulp-angular-templatecache');
2	const clean = require('gulp-clean');	2	const clean = require('gulp-clean');
3	const concat = require('gulp-concat');	3	const concat = require('gulp-concat');
4	const htmlmin = require('gulp-htmlmin');	4	const htmlmin = require('gulp-htmlmin');
5	const rename = require('gulp-rename');	5	const rename = require('gulp-rename');
6	const uglify = require('gulp-uglify');	6	const uglify = require('gulp-uglify');
7	const gulp = require('gulp');	7	const gulp = require('gulp');
8	const pump = require('pump');	8	const pump = require('pump');
9	const jshint = require('gulp-jshint');	9	const jshint = require('gulp-jshint');
10	const replace = require('gulp-replace');	10	const replace = require('gulp-replace');
11	const connect = require('gulp-connect');	11	const connect = require('gulp-connect');
12		12
13	var paths = {	13	var paths = {
14	srcJS: 'src/js/*.js',	14	srcJS: 'src/js/*.js',
15	srcViews: 'src/views/*.html',	15	srcViews: 'src/views/*.html',
16	tmp: 'tmp',	16	tmp: 'tmp',
17	dist: 'dist/'	17	dist: 'dist/'
18	};	18	};
19		19
20	gulp.task('templates', ['clean'], function() {	20	gulp.task('templates', ['clean'], function() {
21	return pump(	21	return pump(
22	[	22	[
23	gulp.src(paths.srcViews),	23	gulp.src(paths.srcViews),
24	htmlmin(),	24	htmlmin(),
25	templateCache('views.js', {	25	templateCache('views.js', {
26	module: 'focaCrearNotaPedido',	26	module: 'focaCrearNotaPedido',
27	root: ''	27	root: ''
28	}),	28	}),
29	gulp.dest(paths.tmp)	29	gulp.dest(paths.tmp)
30	]	30	]
31	);	31	);
32	});	32	});
33		33
34	gulp.task('uglify', ['templates'], function() {	34	gulp.task('uglify', ['templates'], function() {
35	return pump(	35	return pump(
36	[	36	[
37	gulp.src([	37	gulp.src([
38	paths.srcJS,	38	paths.srcJS,
39	'tmp/views.js'	39	'tmp/views.js'
40	]),	40	]),
41	concat('foca-crear-nota-pedido.js'),	41	concat('foca-crear-nota-pedido.js'),
42	replace('src/views/', ''),	42	replace('src/views/', ''),
43	gulp.dest(paths.tmp),	43	gulp.dest(paths.tmp),
44	rename('foca-crear-nota-pedido.min.js'),	44	rename('foca-crear-nota-pedido.min.js'),
45	uglify(),	45	uglify(),
46	replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+	46	replace('"ngRoute","ui.bootstrap","focaModalVendedores","focaBusquedaProductos",'+
47	'"focaModalPetroleras","focaBusquedaCliente","focaModalPrecioCondicion",'+	47	'"focaModalPetroleras","focaBusquedaCliente","focaModalPrecioCondicion",'+
48	'"focaModalFlete"', ''),	48	'"focaModalFlete","focaModal"', ''),
49	gulp.dest(paths.dist)	49	gulp.dest(paths.dist)
50	]	50	]
51	);	51	);
52	});	52	});
53		53
54	gulp.task('clean', function(){	54	gulp.task('clean', function(){
55	return gulp.src(['tmp', 'dist'], {read: false})	55	return gulp.src(['tmp', 'dist'], {read: false})
56	.pipe(clean());	56	.pipe(clean());
57	});	57	});
58		58
59	gulp.task('pre-commit', function() {	59	gulp.task('pre-commit', function() {
60	return pump(	60	return pump(
61	[	61	[
62	gulp.src(paths.srcJS),	62	gulp.src(paths.srcJS),
63	jshint('.jshintrc'),	63	jshint('.jshintrc'),
64	jshint.reporter('default'),	64	jshint.reporter('default'),
65	jshint.reporter('fail')	65	jshint.reporter('fail')
66	]	66	]
67	);	67	);
68		68
69	gulp.start('uglify');	69	gulp.start('uglify');
70	});	70	});
71		71
72	gulp.task('webserver', function() {	72	gulp.task('webserver', function() {
73	pump [	73	pump [
74	connect.server({port: 3000})	74	connect.server({port: 3000})
75	]	75	]
76	});	76	});
77		77
78	gulp.task('clean-post-install', function() {	78	gulp.task('clean-post-install', function() {
79	return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',	79	return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
80	'index.html'], {read: false})	80	'index.html'], {read: false})
81	.pipe(clean());	81	.pipe(clean());
82	});	82	});
83		83
84	gulp.task('default', ['webserver']);	84	gulp.task('default', ['webserver']);
85		85

index.html

Diff comments View file @ 4cee7ed

 <html ng-app="focaCrearNotaPedido">
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <!--CSS-->
         <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
         <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
         <!--VENDOR JS-->
         <script src="node_modules/jquery/dist/jquery.min.js"></script>
         <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="node_modules/angular/angular.min.js"></script>
         <script src="node_modules/angular-route/angular-route.min.js"></script>
         <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
         <script src="node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
         <script src="node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
         <script src="node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
         <script src="node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script>
         <script src="node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
         <script src="node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
         <script src="node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
+        <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
         <script src="src/js/app.js"></script>
         <script src="src/js/controller.js"></script>
         <script src="src/js/service.js"></script>
         <script src="src/js/route.js"></script>
         <script src="src/etc/develop.js"></script>
     </head>
     <body>
         <div ng-view class="container-fluid"></div>
     </body>
 </html>

package.json

Diff comments View file @ 4cee7ed

 {
     "name": "foca-crear-nota-pedido",
     "version": "0.0.1",
     "description": "Listado y ABM nota de pedidos",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "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/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 git+https://debo.suite.repo/modulos-npm/foca-modal-flete"
+        "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 git+https://debo.suite.repo/modulos-npm/foca-modal-flete git+https://debo.suite.repo/modulos-npm/foca-modal.git"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "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/nguarnieri/foca-modal-busqueda-productos",
         "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
         "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git"
     },
     "devDependencies": {
         "angular": "^1.7.5",
         "angular-route": "^1.7.5",
         "bootstrap": "^4.1.3",
         "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": "git+https://debo.suite.repo/modulos-npm/foca-modal.git",
         "foca-modal-busqueda-productos": "git+https://debo.suite.repo/nguarnieri/foca-modal-busqueda-productos",
         "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-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",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "2.2.2",
         "gulp-clean": "^0.4.0",
         "gulp-concat": "^2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-jshint": "^2.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-sequence": "^1.0.0",
         "gulp-uglify": "^3.0.1",
         "gulp-uglify-es": "^1.0.4",
         "jasmine-core": "^3.2.1",
         "jquery": "^3.3.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0",
         "ui-bootstrap4": "^3.0.5"
     }
 }

src/js/app.js

Diff comments View file @ 4cee7ed

 angular.module('focaCrearNotaPedido', [
     'ngRoute',
     'ui.bootstrap',
     'focaModalVendedores',
     'focaBusquedaProductos',
     'focaModalPetroleras',
     'focaBusquedaCliente',
     'focaModalPrecioCondicion',
     'focaModalFlete',
-    'focaDirectivas'
+    'focaDirectivas',
+    'focaModal'
 ]);

src/js/controller.js

Diff comments View file @ 4cee7ed

 angular.module('focaCrearNotaPedido')
     .controller('notaPedidoCtrl',
-        ['$scope', '$uibModal', '$location', 'crearNotaPedidoService',
+        ['$scope', '$uibModal', '$location', 'crearNotaPedidoService', 'focaModalService',
-            function($scope, $uibModal, $location, crearNotaPedidoService) {
+            function($scope, $uibModal, $location, crearNotaPedidoService, focaModalService) {
                 $scope.show = false;
                 $scope.edit = false;
                 $scope.dateOptions = {
                     maxDate: new Date(),
                     minDate: new Date(2010, 0, 1)
                 };
                 $scope.notaPedido = {
                     vendedor: {},
                     cliente: {}
                 };
                 $scope.articulosTabla = [];
                 var idLista;
                 var notaPedidoTemp = crearNotaPedidoService.getNotaPedido();
                 $scope.domiciliosCliente = crearNotaPedidoService.getDomicilios(1);
                 crearNotaPedidoService.getPrecioCondicion().then(
                     function(res) {
                         $scope.precioCondiciones = res.data;
                     }
                 );
                 if (notaPedidoTemp !== undefined) {
                     notaPedidoTemp.fechaCarga = new Date(notaPedidoTemp.fechaCarga);
                     $scope.notaPedido = notaPedidoTemp;
                     $scope.notaPedido.flete = ($scope.notaPedido.flete).toString();
                     $scope.notaPedido.bomba = ($scope.notaPedido.bomba).toString();
                     idLista = $scope.notaPedido.precioCondicion;
                     crearNotaPedidoService
                         .getArticulosByIdNotaPedido($scope.notaPedido.id).then(
                             function(res) {
                                 $scope.articulosTabla = res.data;
                             }
                         );
                     crearNotaPedidoService.getDomiciliosByIdNotaPedido($scope.notaPedido.id).then(
                         function(res) {
                             $scope.notaPedido.domicilio = res.data;
                         }
                     );
                 } else {
                     $scope.notaPedido.fechaCarga = new Date();
                     $scope.notaPedido.domicilio = [{ id: 0 }];
                     $scope.notaPedido.bomba = '1';
                     $scope.notaPedido.flete = '0';
                     idLista = undefined;
                 }
                 $scope.addNewDom = function() {
                     $scope.notaPedido.domicilio.push({ 'id': 0 });
                 };
                 $scope.removeNewChoice = function(choice) {
                     if ($scope.notaPedido.domicilio.length > 1) {
                         $scope.notaPedido.domicilio.splice($scope.notaPedido.domicilio.findIndex(
                             function(c) {
                                 return c.$$hashKey === choice.$$hashKey;
                             }
                         ), 1);
                     }
                 };
                 $scope.crearNotaPedido = function() {
                     var notaPedido = {
                         id: 0,
                         precioCondicion: $scope.notaPedido.precioCondicion,
                         fechaCarga: $scope.notaPedido.fechaCarga,
                         vendedor: $scope.notaPedido.vendedor,
                         cliente: $scope.notaPedido.cliente,
                         producto: $scope.notaPedido.producto,
                         bomba: $scope.notaPedido.bomba,
                         petrolera: $scope.notaPedido.petrolera,
                         domicilio: $scope.notaPedido.domicilio,
                         kilometros: $scope.notaPedido.kilometros,
                         jurisdiccionIIBB: $scope.notaPedido.jurisdiccionIIBB,
                         costoFinanciacion: $scope.notaPedido.costoFinanciacion,
                         flete: $scope.notaPedido.flete,
                         costoUnitarioKmFlete: $scope.notaPedido.costoUnitarioKmFlete,
                         total: $scope.articulosTabla[0].subTotal
                     };
                     crearNotaPedidoService.crearNotaPedido(notaPedido).then(
                         function() {
-                            alert('Nota pedido creada');
+                            focaModalService('Nota pedido creada');
                             $location.path('/venta-nota-pedido');
                         }
                     );
                     var articulosNotaPedido = $scope.articulosTabla;
                     for(var i = 0; i< articulosNotaPedido.length;i++) {
                         crearNotaPedidoService
                             .crearArticulosParaNotaPedido(articulosNotaPedido[i]).then(
                                 function() {
                                     return;
                                 }
                             );
                     }
                 };
                 $scope.siguienteTab = function() {
                     $scope.active = 1;
                 };
                 $scope.seleccionarArticulo = function() {
                     if (idLista === undefined) {
-                        alert('primero seleccione una lista de precio y condicion');
+                        focaModalService.alert(
+                            'primero seleccione una lista de precio y condicion');
                         return;
                     }
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Productos',
                             templateUrl: 'modal-busqueda-productos.html',
                             controller: 'modalBusquedaProductosCtrl',
                             resolve: { idLista: function() { return idLista; } },
                             size: 'lg'
                         }
                     );
                     modalInstance.result.then(
                         function(producto) {
                             var newArt =
                             {
                                 id: 0,
                                 codigo: producto.codigo,
                                 sector: producto.sector,
                                 descripcion: producto.descripcion,
                                 item: $scope.articulosTabla.length + 1,
                                 nombre: producto.descripcion,
                                 precio: producto.precio.toFixed(2),
                                 costoUnitario: producto.costo,
                                 cantidad: 1
                             };
                             $scope.articuloACargar = newArt;
                         }, function() {
                             // funcion ejecutada cuando se cancela el modal
                         }
                     );
                 };
                 $scope.seleccionarVendedor = function() {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Vendedores',
                             templateUrl: 'modal-vendedores.html',
                             controller: 'modalVendedoresCtrl',
                             size: 'lg'
                         }
                     );
                     modalInstance.result.then(
                         function(vendedor) {
                             $scope.notaPedido.vendedor.nombre = vendedor.NomVen;
                         }, function() {
                         }
                     );
                 };
                 $scope.seleccionarPetrolera = function() {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Petrolera',
                             templateUrl: 'modal-petroleras.html',
                             controller: 'modalPetrolerasCtrl',
                             size: 'lg'
                         }
                     );
                     modalInstance.result.then(
                         function(petrolera) {
                             $scope.notaPedido.petrolera = petrolera.NOM;
                         }, function() {
                         }
                     );
                 };
                 $scope.seleccionarCliente = function() {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Cliente',
                             templateUrl: 'foca-busqueda-cliente-modal.html',
                             controller: 'focaBusquedaClienteModalController',
                             size: 'lg'
                         }
                     );
                     modalInstance.result.then(
                         function(cliente) {
                             $scope.notaPedido.cliente.nombre = cliente.nom;
                         }, function() {
                         }
                     );
                 };
                 $scope.mostrarFichaCliente = function() {
                     $uibModal.open(
                         {
                             ariaLabelledBy: 'Datos del Cliente',
                             templateUrl: 'foca-crear-nota-pedido-ficha-cliente.html',
                             controller: 'focaCrearNotaPedidoFichaClienteController',
                             size: 'lg'
                         }
                     );
                 };
                 $scope.obtenerDomicilios = function(id) {
                     crearNotaPedidoService.getDomicilios(id).then(
                         function(res) {
                             $scope.notaPedido.domicilio = res.data;
                         }
                     );
                 };
                 $scope.getTotal = function() {
                     var total = 0;
                     var array = $scope.articulosTabla;
                     for (var i = 0; i < array.length; i++) {
                         total += array[i].precio * array[i].cantidad;
                     }
                     return total.toFixed(2);
                 };
                 $scope.getSubTotal = function() {
                     if($scope.articuloACargar) {
                         return $scope.articuloACargar.precio * $scope.articuloACargar.cantidad;
                     }
                 };
                 $scope.cargarArticulos = function() {
                     idLista = $scope.notaPedido.precioCondicion;
                     $scope.articulosTabla = [];
                 };
                 $scope.abrirModalListaPrecio = function() {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Busqueda de Precio Condición',
                             templateUrl: 'modal-precio-condicion.html',
                             controller: 'focaModalPrecioCondicionController',
                             size: 'lg'
                         }
                     );
                     modalInstance.result.then(
                         function(precioCondicion) {
                             $scope.notaPedido.precioCondicion = precioCondicion.nombre;
                             idLista = precioCondicion.idListaPrecio;
                             $scope.articulosTabla = [];
                         }, function() {
                         }
                     );
                 };
                 $scope.abrirModalFlete = function() {
                     if($scope.notaPedido.flete === '1') {
                         var modalInstance = $uibModal.open(
                             {
                                 ariaLabelledBy: 'Busqueda de Flete',
                                 templateUrl: 'modal-flete.html',
                                 controller: 'focaModalFleteController',
                                 size: 'lg'
                             }
                         );
                         modalInstance.result.then(
                             function(flete) {
+                                $scope.choferes = '';
+                                $scope.vehiculos = '';
                                 $scope.notaPedido.fleteNombre = flete.nombre;
                                 $scope.notaPedido.costoUnitarioKmFlete = flete.costoKilometro;
+                                $scope.choferes = flete.chofer;
+                                $scope.vehiculos = flete.vehiculo;
                             }, function() {
                             }
                         );
                     }
                 };
                 $scope.agregarATabla = function(key) {
                     if(key === 13) {
                         $scope.articulosTabla.unshift($scope.articuloACargar);
                         $scope.articuloACargar = undefined;
                     }
                 };
                 $scope.quitarArticulo = function(key) {
                     $scope.articulosTabla.splice(key, 1);
                 };
                 $scope.editarArticulo = function(key) {
                     if(key === 13) {
                         $scope.edit = false;
                     }
                 };
                 $scope.cambioEdit = function() {
                     $scope.edit = !$scope.edit ? true : false;
                 };
+                $scope.limpiarFlete = function() {
+                    $scope.notaPedido.fleteNombre = '';
+                    $scope.notaPedido.chofer = '';
+                    $scope.notaPedido.vehiculo = '';
+                    $scope.notaPedido.kilometros = '';
+                    $scope.notaPedido.costoUnitarioKmFlete = '';
+                };
+                $scope.crearPedidoDemo = function() {
+                    focaModalService.alert('Pedido Creado');
+                    $scope.notaPedido.precioCondicion = '';
+                    $scope.articulosTabla = [];
+                    $scope.notaPedido.fleteNombre = '';
+                    $scope.notaPedido.chofer = '';
+                    $scope.notaPedido.vehiculo = '';
+                    $scope.notaPedido.kilometros = '';
+                    $scope.notaPedido.costoUnitarioKmFlete = '';
+                    $scope.notaPedido.vendedor.nombre = '';
+                    $scope.notaPedido.cliente.nombre = '';
+                    $scope.domicilio.dom = '';
+                    $scope.notaPedido.flete = 0;
+                };
             }
         ]
     )
     .controller('notaPedidoListaCtrl', [
         '$scope',
         'crearNotaPedidoService',
         '$location',
         function($scope, crearNotaPedidoService, $location) {
             crearNotaPedidoService.obtenerNotaPedido().then(function(datos) {
                 $scope.notaPedidos = datos.data;
             });
             $scope.editar = function(notaPedido) {
                 crearNotaPedidoService.setNotaPedido(notaPedido);
                 $location.path('/venta-nota-pedido/abm/');
             };
             $scope.crearPedido = function() {
                 crearNotaPedidoService.clearNotaPedido();
                 $location.path('/venta-nota-pedido/abm/');
             };
         }
     ])
     .controller('focaCrearNotaPedidoFichaClienteController', [
         '$scope',
         'crearNotaPedidoService',
         '$location',
         function($scope, crearNotaPedidoService, $location) {
             crearNotaPedidoService.obtenerNotaPedido().then(function(datos) {
                 $scope.notaPedidos = datos.data;
             });
             $scope.editar = function(notaPedido) {
                 crearNotaPedidoService.setNotaPedido(notaPedido);
                 $location.path('/venta-nota-pedido/abm/');
             };
             $scope.crearPedido = function() {
                 crearNotaPedidoService.clearNotaPedido();
                 $location.path('/venta-nota-pedido/abm/');
             };
         }
     ]);

src/views/nota-pedido.html

Diff comments View file @ 4cee7ed

 <div class="row">
     <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
         <div class="row bg-secondary p-3">
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <div class="input-group">
                     <input
                         type="text"
                         class="form-control"
                         uib-datepicker-popup="dd/MM/yyyy"
                         ng-model="notaPedido.fechaCarga"
                         is-open="popup1.opened"
                         datepicker-options="dateOptions"
                         close-text="Cerrar"
                         current-text="Hoy"
                         clear-text="Borrar"
                         alt-input-formats="altInputFormats"
                     />
                     <span class="input-group-append">
                         <button type="button" class="btn btn-default" ng-click="popup1.opened = true">
                             <i class="fa fa-calendar"></i>
                         </button>
                     </span>
                 </div>
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <div class="input-group">
                     <input
                         class="form-control"
                         type="text"
                         ng-model="notaPedido.vendedor.nombre"
                         placeholder="Seleccione Vendedor"
                         readonly="true"
                     >
                     <span class="input-group-append">
                         <button type="button" class="btn btn-default" ng-click="seleccionarVendedor()">
                             <i class="fa fa-search"></i>
                         </button>
                     </span>
                 </div>
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <div class="input-group">
                     <input
                         class="form-control selectable"
                         type="text"
                         ng-model="notaPedido.cliente.nombre"
                         placeholder="Seleccione Cliente"
                         readonly="true"
-                        ng-click="mostrarFichaCliente()"
+                        ng-click="seleccionarCliente()"
                     >
                     <span class="input-group-append">
                         <button type="button" class="btn btn-default" ng-click="seleccionarCliente()">
                             <i class="fa fa-search"></i>
                         </button>
                     </span>
                 </div>
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <input
                     class="form-control selectable"
                     type="text"
-                    readonly="true"
+                    ng-model="domicilio.dom"
-                    ng-bind="vendedor.nombre"
                     ng-click="abrirModalDomicilio()"
                     placeholder="Seleccione Domicilio"
+                    uib-typeahead="
+                                    domi.dom
+                                    for domi
+                                    in domiciliosCliente
+                                "
+                    typeahead-min-length="0"
                 >
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <input
                     class="form-control selectable"
                     type="text"
                     readonly="true"
                     ng-model="notaPedido.precioCondicion"
                     ng-click="abrirModalListaPrecio()"
                     placeholder="Seleccione Lista de precio"
                 >
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <label>Flete</label>
                 <div class="form-check custom-radio custom-control-inline">
                     <input
+                        ng-change="limpiarFlete()"
                         class="form-check-input"
                         type="radio"
                         name="radioFlete"
                         value="1"
                         ng-model="notaPedido.flete">
                     <label class="form-check-label">Si</label>
                 </div>
                 <div class="form-check custom-radio custom-control-inline">
                     <input
                         class="form-check-input"
                         type="radio"
                         name="radioFlete"
                         value="0"
                         ng-model="notaPedido.flete">
                     <label class="form-check-label">No</label>
                 </div>
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <input
                     class="form-control selectable"
                     type="text"
                     readonly="true"
+                    ng-show="notaPedido.flete == 1"
                     ng-model="notaPedido.fleteNombre"
                     ng-click="abrirModalFlete()"
                     placeholder="Seleccione Flete"
                 >
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
+                <input
+                    class="form-control selectable"
+                    type="text"
+                    ng-show="notaPedido.flete == 1"
+                    ng-model="notaPedido.chofer"
+                    placeholder="Seleccione Chofer"
+                    uib-typeahead="chofer.nombre for chofer in choferes"
+                    typeahead-min-length="0"
+                >
+            </div>
+            <div class="form-group col-12 col-sm-6 col-md-4">
+                <input
+                    class="form-control selectable"
+                    type="text"
+                    ng-show="notaPedido.flete == 1"
+                    ng-model="notaPedido.vehiculo"
+                    placeholder="Seleccione Vehículo"
+                    uib-typeahead="vehiculo.tractor for vehiculo in vehiculos"
+                    typeahead-min-length="0"
+                >
+            </div>
+            <div class="form-group col-12 col-sm-6 col-md-4">
                 <input
                     class="form-control selectable"
                     type="number"
                     step="0.01"
-                    ng-disabled="notaPedido.flete == 0"
+                    ng-show="notaPedido.flete == 1"
                     ng-model="notaPedido.costoUnitarioKmFlete"
                     placeholder="Costo por kilómetro"
                 >
             </div>
             <div class="form-group col-12 col-sm-6 col-md-4">
                 <input
                     class="form-control selectable"
                     type="number"
                     step="0.1"
-                    ng-disabled="notaPedido.flete == 0"
+                    ng-show="notaPedido.flete == 1"
                     ng-model="notaPedido.kilometros"
                     placeholder="Kilómetros recorridos"
                 >
             </div>
         </div>
     </div>
+    <div class="col-auto my-2">
+        <button ng-click="crearPedidoDemo()" type="button" title="Crear nota pedido" class="btn btn-primary float-right">Crear</button>
+    </div>
 </div>
 <div class="row">
     <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2">
         <div class="row">
         </div>
         <div class="row">
             <table class="table table-striped table-sm">
                 <thead>
                     <tr>
                         <th>Sector</th>
                         <th>Código</th>
                         <th>Descripción</th>
                         <th>Precio Unitario</th>
                         <th>Cantidad</th>
                         <th>SubTotal</th>
                         <th>
                             <button class="btn btn-outline-secondary selectable" style="float: right;" ng-click="show = !show; masMenos()" >
                                 <i class="fa fa-chevron-down" ng-hide="show" aria-hidden="true"></i>
                                 <i class="fa fa-chevron-up" ng-show="show" aria-hidden="true"></i>
                             </button>
                         </th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr ng-show="!articuloACargar">
                         <td colspan="2"><input placeholder="Seleccione Articulo" class="form-control" readonly ng-click="seleccionarArticulo()"></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
                     </tr>
                     <tr ng-show="articuloACargar">
                         <td><input
                                 class="form-control"
                                 ng-model="articuloACargar.sector"
                                 readonly></td>
                         <td><input
                                 class="form-control"
                                 ng-model="articuloACargar.codigo"
                                 readonly></td>
                         <td><input
                                 class="form-control"
                                 ng-model="articuloACargar.descripcion"
                                 readonly></td>
                         <td><input
                                 class="form-control"
                                 ng-value="articuloACargar.precio | currency:'$'"
                                 readonly></td>
                         <td><input
                                 class="form-control"
                                 type="number"
                                 min="1"
                                 value="1"
                                 ng-model="articuloACargar.cantidad"
                                 foca-focus="articuloACargar.cantidad == 1"
                                 ng-keypress="agregarATabla($event.keyCode)"></td>
                         <td><input
                                 class="form-control"
                                 ng-value="getSubTotal() | currency:'$'"
                                 readonly></td>
                         <td class="text-center"><button
                                 class="btn btn-outline-secondary btn-sm"
                                 ng-click="agregarATabla(13)">
                             <i class="fa fa-save"></i>
                         </button></td>
                     </tr>
                     <tr ng-repeat="(key, articulo) in articulosTabla" ng-show="show || key == 0">
                         <td ng-bind="articulo.sector"></td>
                         <td ng-bind="articulo.codigo"></td>
                         <td ng-bind="articulo.descripcion"></td>
                         <td ng-bind="articulo.precio | currency:'$'"></td>
                         <td><input
                                 ng-show="edit"
                                 ng-model="articulo.cantidad"
                                 class="form-control"
                                 type="number"
                                 min="1"
                                 value="1"
                                 foca-focus="edit"
                                 ng-keypress="editarArticulo($event.keyCode)">
                             <i class="selectable" ng-click="cambioEdit()" ng-hide="edit" ng-bind="articulo.cantidad"></i>
                         </td>
                         <td ng-bind="(articulo.precio * articulo.cantidad) | currency: '$'"></td>
                         <td class="text-center">
                             <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo(key)">
                                 <i class="fa fa-trash"></i>
                             </button>
                         </td>
                     </tr>
                 </tbody>
                 <tfoot>
                     <tr class="table-secondary">
                         <td colspan="5"><b>Cantidad Items:</b> <a ng-bind="articulosTabla.length"></a> </td>
                         <td colspan="3">{{getTotal() | currency:'$'}}</td>
                     </tr>
                 </tfoot>
             </table>
         </div>
     </div>
 </div>
 <!--
 <form name="formCrearNota">
     <uib-tabset active="active">
         <uib-tab index="0" heading="General">
             <input type="hidden" name="id" ng-model="notaPedido.id" />
             <div>
                 <div class="col-auto my-2">
                     <button type="submit" title="Siguiente" class="btn btn-primary float-right">Siguiente</button>
                 </div>
             </div>
             <br>
             <br>
             <div class="row">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Fecha de carga</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="date" class="form-control" ng-model="notaPedido.fechaCarga" ng-required="true">
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Kilómetros</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="number" min="0" step="0.01" class="form-control" placeholder="Kilómetros recorridos para la entrega en el cliente"
                             ng-model="notaPedido.kilometros" ng-required="true">
                     </div>
                 </div>
             </div>
             <div class="row my-3">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Jurisdicción de IIBB</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="text" class="form-control" placeholder="Jurisdicción de IIBB donde se realiza la entrega"
                             ng-model="notaPedido.jurisdiccionIIBB" ng-required="true">
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Costo de financiación</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <div class="input-group mb-2">
                             <div class="input-group-prepend">
                                 <div class="input-group-text">$</div>
                             </div>
                             <input type="number" min="0" step="0.01" class="form-control" placeholder="Costo de financiación"
                                 ng-model="notaPedido.costoFinanciacion">
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Bomba</label>
                     </div>
                 </div>
                 <div class="col-md-1">
                     <div class="col-auto">
                         <div class="form-check custom-radio custom-control-inline">
                             <input class="form-check-input" type="radio" name="radioBomba" value="1" ng-model="notaPedido.bomba">
                             <label class="form-check-label">
                                 Si
                             </label>
                         </div>
                         <div class="form-check custom-radio custom-control-inline">
                             <input class="form-check-input" type="radio" name="radioBomba" value="0" ng-model="notaPedido.bomba">
                             <label class="form-check-label">
                                 No
                             </label>
                         </div>
                     </div>
                 </div>
                 <div class="col-md-1">
                     <div class="col-auto">
                         <label>Flete</label>
                     </div>
                 </div>
                 <div class="col-md-1">
                     <div class="col-auto">
                         <div class="form-check custom-radio custom-control-inline">
                             <input class="form-check-input" type="radio" name="radioFlete" value="1" ng-model="notaPedido.flete">
                             <label class="form-check-label">
                                 Si
                             </label>
                         </div>
                         <div class="form-check custom-radio custom-control-inline">
                             <input class="form-check-input" type="radio" name="radioFlete" value="0" ng-model="notaPedido.flete">
                             <label class="form-check-label">
                                 FOB
                             </label>
                         </div>
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Costo unitario kilometro flete</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <div class="input-group mb-2">
                             <div class="input-group-prepend">
                                 <div class="input-group-text">$</div>
                             </div>
                             <input type="number" min="0" step="0.01" class="form-control" placeholder="Costo unitario del kilometro del flete"
                                 ng-model="notaPedido.costoUnitarioKmFlete" ng-required="true">
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row my-3">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Vendedor</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="text" class="form-control" placeholder="Seleccione vendedor" ng-model="notaPedido.vendedor"
                             ng-click="seleccionarVendedor()" readonly>
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Petrolera</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="text" class="form-control" placeholder="Seleccione petrolera" ng-model="notaPedido.petrolera"
                             ng-click="seleccionarPetrolera()" readonly>
                     </div>
                 </div>
             </div>
             </div>
             <div class="row">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Cliente</label>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="col-auto">
                         <input type="text" class="form-control" placeholder="Seleccione cliente" ng-model="notaPedido.cliente"
                             ng-click="seleccionarCliente()" ng-change="obtenerDomicilios()" readonly>
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Domicilio</label>
                     </div>
                 </div>
                 <div class="col-md-4">
                     <div class="col-md-12 row" ng-repeat="domicilio in notaPedido.domicilio">
                         <div class="col-auto">
                             <input type="text" ng-model="domicilio.dom" placeholder="Domicilio" uib-typeahead="
                                     domi.dom
                                     for domi
                                     in domiciliosCliente
                                 "
                                 typeahead-no-results="sinResultados" typeahead-min-length="0" typeahead-on-select="seleccionar($item)"
                                 class="form-control mb-2" ng-disabled="domicilio.id > 0" ng-required="true">
                             <i ng-show="cargandoClientes" class="fas fa-sync"></i>
                             <div ng-show="sinResultados">
                                 No se encontraron resultados.
                             </div>
                         </div>
                         <a class="btn" ng-click="removeNewChoice(domicilio)" ng-if="domicilio.id==0">-</a>
                         <a class="btn" ng-click="addNewDom()">+</a>
                     </div>
                 </div>
             </div>
         </uib-tab>
         <uib-tab index="1" heading="Producto" disable="formCrearNota.$invalid">
             <div>
                 <div class="col-auto my-2">
                     <button ng-click="crearNotaPedido()" type="button" title="Crear nota pedido" class="btn btn-primary float-right">Crear</button>
                 </div>
             </div>
             <br>
             <br>
             <div class="row">
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Precios y condiciones</label>
                     </div>
                 </div>
                 <div class="col-md-4">
                     <div class="col-auto">
                         <select class="form-control" ng-change="cargarArticulos()" ng-model="notaPedido.precioCondicion" ng-options="preCond.id as preCond.nombre for preCond in precioCondiciones">
                         </select>
                     </div>
                 </div>
                 <div class="col-md-2">
                     <div class="col-auto">
                         <label>Producto</label>
                     </div>
                 </div>
                 <div class="col-md-4">
                     <div class="col-auto">
                         <input type="text" class="form-control" placeholder="Seleccione producto" ng-model="notaPedido.producto"
                             ng-click="seleccionarArticulo()" readonly>
                     </div>
                 </div>
             </div>
             <div class="col-md-12">
                 <table class="table my-3 table-hover table-nonfluid">
                     <thead>
                         <tr>
                             <th>Código</th>
                             <th>Nombre</th>
                             <th>Precio unitario</th>
                             <th>Costo unitario bruto</th>
                             <th>Cantidad</th>
                             <th>Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr ng-repeat="articulo in articulosTabla">
                             <td ng-bind="articulo.codigo"></td>
                             <td ng-bind="articulo.nombre"></td>
                             <td ng-bind="articulo.precio"></td>
                             <td ng-bind="articulo.costoUnitario"></td>
                             <td><input ng-model="articulo.cantidad" class="form-control" type="number" min="0" value="1"></td>
                             <td ng-bind="getSubTotal(articulo.item)"></td>
                         </tr>
                     </tbody>
                 </table>
             </div>
         </uib-tab>
     </uib-tabset>