Commit f7a60a682355c1dced6049b94bd6e54025cf9386
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'upstream/master'
Showing
4 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -46,8 +46,8 @@ 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 | - '"focaModalMoneda","focaModalCotizacion","focaSeguimiento","angular-ladda",'+ | |
| 50 | - '"cordovaGeolocationModule"', ''), | |
| 49 | + '"focaModalMoneda","focaModalCotizacion","focaSeguimiento"'+ | |
| 50 | + ',"focaBotoneraLateral","angular-ladda","cordovaGeolocationModule"', ''), | |
| 51 | 51 | gulp.dest(paths.dist) |
| 52 | 52 | ] |
| 53 | 53 | ); |
src/js/app.js
src/js/controller.js
| 1 | 1 | angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', |
| 2 | 2 | [ |
| 3 | - '$scope', '$uibModal', '$location', '$filter', 'crearNotaPedidoService', | |
| 4 | - 'focaModalService', 'notaPedidoBusinessService', '$rootScope', 'focaSeguimientoService', | |
| 3 | + '$scope', | |
| 4 | + '$uibModal', | |
| 5 | + '$location', | |
| 6 | + '$filter', | |
| 7 | + '$timeout', | |
| 8 | + 'crearNotaPedidoService', | |
| 9 | + 'focaBotoneraLateralService', | |
| 10 | + 'focaModalService', | |
| 11 | + 'notaPedidoBusinessService', | |
| 12 | + '$rootScope', | |
| 13 | + 'focaSeguimientoService', | |
| 5 | 14 | function( |
| 6 | - $scope, $uibModal, $location, $filter, crearNotaPedidoService, focaModalService, | |
| 7 | - notaPedidoBusinessService, $rootScope, focaSeguimientoService) | |
| 15 | + $scope, $uibModal, $location, $filter, $timeout, | |
| 16 | + crearNotaPedidoService, focaBotoneraLateralService, | |
| 17 | + focaModalService, notaPedidoBusinessService, $rootScope, focaSeguimientoService) | |
| 8 | 18 | { |
| 9 | 19 | |
| 10 | 20 | $scope.botonera = crearNotaPedidoService.getBotonera(); |
| ... | ... | @@ -44,6 +54,13 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', |
| 44 | 54 | $scope.articulosTabla = []; |
| 45 | 55 | $scope.idLista = undefined; |
| 46 | 56 | |
| 57 | + //SETEO BOTONERA LATERAL | |
| 58 | + $timeout(function() { | |
| 59 | + focaBotoneraLateralService.showSalir(true); | |
| 60 | + focaBotoneraLateralService.showPausar(true); | |
| 61 | + focaBotoneraLateralService.showGuardar(true, $scope.crearNotaPedido); | |
| 62 | + }); | |
| 63 | + | |
| 47 | 64 | crearNotaPedidoService.getPrecioCondicion().then( |
| 48 | 65 | function(res) { |
| 49 | 66 | $scope.precioCondiciones = res.data; |
src/views/nota-pedido.html
| 1 | 1 | <div class="crear-nota-pedido foca-crear row"> |
| 2 | 2 | <foca-cabecera-facturador |
| 3 | - titulo="'NOTA DE PEDIDO'" | |
| 3 | + titulo="'Nota de pedido'" | |
| 4 | 4 | numero="puntoVenta + '-' + comprobante" |
| 5 | 5 | fecha="now" |
| 6 | 6 | class="mb-0 col-lg-12" |
| ... | ... | @@ -408,34 +408,6 @@ |
| 408 | 408 | </table> |
| 409 | 409 | </div> |
| 410 | 410 | </div> |
| 411 | - <div class="col-auto my-2 col-lg-2 botonera-lateral d-none"> | |
| 412 | - <div class="col-12 mt-auto"> | |
| 413 | - <button | |
| 414 | - ng-click="crearNotaPedido()" | |
| 415 | - type="submit" | |
| 416 | - title="Crear nota pedido" | |
| 417 | - class="btn btn-default btn-block mb-2 border border-dark" | |
| 418 | - ng-disabled="notaPedido.idRemito || saveLoading" | |
| 419 | - > | |
| 420 | - <strong>GUARDAR</strong> | |
| 421 | - </button> | |
| 422 | - <!-- AGREGAR FUNCIONALIDAD PAUSAR --> | |
| 423 | - <button | |
| 424 | - type="submit" | |
| 425 | - title="Crear nota pedido" | |
| 426 | - class="btn btn-default btn-block mb-2 border border-dark" | |
| 427 | - > | |
| 428 | - <strong>PAUSAR</strong> | |
| 429 | - </button> | |
| 430 | - <button | |
| 431 | - ng-click="salir()" | |
| 432 | - type="button" | |
| 433 | - title="Salir" | |
| 434 | - class="btn btn-default btn-block border border-dark"> | |
| 435 | - <strong>SALIR</strong> | |
| 436 | - </button> | |
| 437 | - </div> | |
| 438 | - </div> | |
| 439 | 411 | </div> |
| 440 | 412 | </div> |
| 441 | 413 | <div class="row d-md-none fixed-bottom"> |