diff --git a/gulpfile.js b/gulpfile.js index e3e46b5..feeee5f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,10 +82,14 @@ gulp.task('clean-post-install', function(){ gulp.task('default', ['webserver']); gulp.task('watch', function() { - gulp.watch([paths.srcJS, paths.srcViews], ['copy']) + gulp.watch([paths.srcJS, paths.srcViews], ['uglify']) }); gulp.task('copy', ['uglify'], function(){ gulp.src('dist/*.js') .pipe(gulp.dest('../../wrapper-demo/node_modules/foca-modal-nota-pedido/dist')); }); + +gulp.task('watchAndCopy', function() { + return gulp.watch([paths.srcJS, paths.srcViews], ['copy']); +}); diff --git a/src/js/controller.js b/src/js/controller.js index 1b7c986..ac71a13 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -26,14 +26,7 @@ angular.module('focaModalNotaPedido') $scope.busquedaPress = function(key) { if (key === 13) { $scope.searchLoading = true; - if(parametroNotaPedido.idLista > 0) { - focaModalNotaPedidoService - .getNotasPedidoByIdLista(parametroNotaPedido.idLista, $scope.filters) - .then(llenarDatos); - } else if(parametroNotaPedido.idLista === -1) { - focaModalNotaPedidoService.getNotasPedido() - .then(llenarDatos); - } + focaModalNotaPedidoService.getNotasPedido().then(llenarDatos); } }; function llenarDatos(res) { diff --git a/src/js/service.js b/src/js/service.js index fc79d57..efb9b36 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -5,11 +5,7 @@ angular.module('focaModalNotaPedido') function($http, API_ENDPOINT) { return { getNotasPedido: function() { - return $http.get(API_ENDPOINT.URL + '/articulos'); - }, - getNotasPedidoByIdLista: function(id, filters) { - return $http.post(API_ENDPOINT.URL + '/articulos/lista', - {filters: filters, id: id}); + return $http.get(API_ENDPOINT.URL + '/nota-pedido'); } }; } diff --git a/src/views/foca-modal-nota-pedido.html b/src/views/foca-modal-nota-pedido.html index bf4c452..d2a6c84 100644 --- a/src/views/foca-modal-nota-pedido.html +++ b/src/views/foca-modal-nota-pedido.html @@ -29,10 +29,9 @@ - - - - + + + @@ -45,10 +44,9 @@ - - - - + + +
Sec.Cod.DescripciónP. BaseFechaClienteComprobante