Marcelo Puebla / foca-crear-remito

Download as
Browse Code ยป

Commit 59fd4f02c7cfb4955341eea9f8631ced8f073e8e

Authored by Luis Suarez
2 parents e5c4b5bb60 9f5911c6d0
Exists in develop

Merge branch 'develop' of git.focasoftware.com:lsuarez/foca-crear-remito into develop 

actualizar rama
Showing 3 changed files   Show diff stats
... ... @@ -28,7 +28,7 @@
28 28 <script src="node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
29 29 <script src="node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
30 30 <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
31   - <script src="node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
  31 + <script src="node_modules/foca-modal-domicilio/dist/foca-modal-domicilio.min.js"></script>
32 32 <script src="./node_modules/foca-configuracion/dist/foca-configuracion.min.js"></script>
33 33 <script src="node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
34 34 <script src="node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
1 1 {
2 2 "name": "foca-crear-remito",
3   - "version": "0.0.1",
  3 + "version": "v0.1.1B",
4 4 "description": "Listado y ABM nota de remitos",
5 5 "main": "index.js",
6 6 "scripts": {
src/js/controller.js
Diff comments   View file @ 59fd4f0
... ... @@ -295,9 +295,11 @@ angular.module(&#39;focaCrearRemito&#39;).controller(&#39;remitoController&#39;,
295 295  
296 296 focaBotoneraLateralService.startGuardar();
297 297 $scope.saveLoading = true;
298   - var rutaJson = JSON.parse($localStorage.rutas);
299   - removeItemFromArr(rutaJson, 'venta-remito/crear');
300   - $localStorage.rutas = JSON.stringify(rutaJson);
  298 + if ($localStorage.rutas) {
  299 + var rutaJson = JSON.parse($localStorage.rutas);
  300 + removeItemFromArr(rutaJson, 'venta-remito/crear');
  301 + $localStorage.rutas = JSON.stringify(rutaJson);
  302 + }
301 303  
302 304 var save = {
303 305 remito: {
... ... @@ -509,6 +511,7 @@ angular.module(&#39;focaCrearRemito&#39;).controller(&#39;remitoController&#39;,
509 511 };
510 512 },
511 513 },
  514 + backdrop: false,
512 515 size: 'lg'
513 516 }
514 517 );
... ... @@ -615,6 +618,7 @@ angular.module(&#39;focaCrearRemito&#39;).controller(&#39;remitoController&#39;,
615 618 ariaLabelledBy: 'Busqueda de Domicilios',
616 619 templateUrl: 'modal-domicilio.html',
617 620 controller: 'focaModalDomicilioController',
  621 + backdrop: false,
618 622 size: 'lg',
619 623 resolve: {
620 624 idCliente: function () {
... ... @@ -1287,7 +1291,7 @@ angular.module(&#39;focaCrearRemito&#39;).controller(&#39;remitoController&#39;,
1287 1291 mailCliente: cliente.MAIL,
1288 1292 url: '/remito/mail',
1289 1293 },
1290   - envioSinValorizar:{
  1294 + envioSinValorizar: {
1291 1295 mailCliente: cliente.MAIL,
1292 1296 url: '/remito/mail-sin-valorizar'
1293 1297 },