Commit 8ab810754ba49276628fbea4f35910e8b1f4597e
Exists in
master
Merge branch 'master' into 'master'
agrego foca-botonera-lateral See merge request !10
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","focaConfiguracion","angular-ladda",'+ | |
| 50 | + '"focaModalNotaPedido","focaBotoneraLateral"', ''), | |
| 51 | 51 | gulp.dest(paths.dist) |
| 52 | 52 | ] |
| 53 | 53 | ); |
src/js/app.js
src/js/controller.js
| 1 | 1 | angular.module('focaCrearRemito') .controller('remitoController', |
| 2 | 2 | [ |
| 3 | - '$scope', '$uibModal', '$location', '$filter', 'crearRemitoService', | |
| 4 | - 'focaModalService', 'remitoBusinessService', '$rootScope', | |
| 3 | + '$scope', '$uibModal', '$location', '$filter', 'crearRemitoService', '$timeout', | |
| 4 | + 'focaModalService', 'remitoBusinessService', '$rootScope', 'focaBotoneraLateralService', | |
| 5 | 5 | function( |
| 6 | - $scope, $uibModal, $location, $filter, crearRemitoService, focaModalService, | |
| 7 | - remitoBusinessService, $rootScope) | |
| 6 | + $scope, $uibModal, $location, $filter, crearRemitoService, $timeout, focaModalService, | |
| 7 | + remitoBusinessService, $rootScope, focaBotoneraLateralService) | |
| 8 | 8 | { |
| 9 | 9 | $scope.botonera = crearRemitoService.getBotonera(); |
| 10 | 10 | $scope.isNumber = angular.isNumber; |
| ... | ... | @@ -48,6 +48,13 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 48 | 48 | $scope.articulosTabla = []; |
| 49 | 49 | $scope.idLista = undefined; |
| 50 | 50 | |
| 51 | + //SETEO BOTONERA LATERAL | |
| 52 | + $timeout(function() { | |
| 53 | + focaBotoneraLateralService.showSalir(true); | |
| 54 | + focaBotoneraLateralService.showPausar(true); | |
| 55 | + focaBotoneraLateralService.showGuardar(true, $scope.crearRemito); | |
| 56 | + }); | |
| 57 | + | |
| 51 | 58 | crearRemitoService.getPrecioCondicion().then( |
| 52 | 59 | function(res) { |
| 53 | 60 | $scope.precioCondiciones = res.data; |
| ... | ... | @@ -857,9 +864,6 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 857 | 864 | $event.target.select(); |
| 858 | 865 | }; |
| 859 | 866 | |
| 860 | - $scope.salir = function() { | |
| 861 | - $location.path('/'); | |
| 862 | - }; | |
| 863 | 867 | function addArrayCabecera(array) { |
| 864 | 868 | for(var i = 0; i < array.length; i++) { |
| 865 | 869 | $scope.$broadcast('addCabecera',{ |
src/views/remito.html
| ... | ... | @@ -380,31 +380,6 @@ |
| 380 | 380 | </table> |
| 381 | 381 | </div> |
| 382 | 382 | </div> |
| 383 | - <div class="col-auto my-2 col-lg-2 botonera-lateral d-none"> | |
| 384 | - <div class="col-12 mt-auto"> | |
| 385 | - <button | |
| 386 | - ng-click="crearRemito()" | |
| 387 | - type="submit" | |
| 388 | - title="Crear nota remito" | |
| 389 | - class="btn btn-default btn-block mb-2 border border-dark" | |
| 390 | - ng-disabled="remito.estado === 5 || saveLoading" | |
| 391 | - ><strong>GUARDAR</strong> | |
| 392 | - </button> | |
| 393 | - <button | |
| 394 | - type="button" | |
| 395 | - title="Pausar" | |
| 396 | - class="btn btn-default btn-block border border-dark"> | |
| 397 | - <strong>PAUSAR</strong> | |
| 398 | - </button> | |
| 399 | - <button | |
| 400 | - ng-click="salir()" | |
| 401 | - type="button" | |
| 402 | - title="Salir" | |
| 403 | - class="btn btn-default btn-block border border-dark"> | |
| 404 | - <strong>SALIR</strong> | |
| 405 | - </button> | |
| 406 | - </div> | |
| 407 | - </div> | |
| 408 | 383 | </div> |
| 409 | 384 | </div> |
| 410 | 385 | <div class="row d-md-none fixed-bottom"> |