Merge remote-tracking branch 'upstream/develop'

Luigi
2 parents 15ecb29ee4 0325ebb8ee
Showing 2 changed files Show diff stats
package.json
src/js/controller.js
@@ -4,6 +4,7 @@
     "description": "sistema de cobranzas a partir de facturas",
     "main": "index.js",
     "scripts": {
+        "refresh": "gulp uglify && cp tmp/foca-crear-cobranza.js ../wrapper-demo/node_modules/foca-crear-cobranza/dist/foca-crear-cobranza.min.js",
         "test": "test.html",
         "compile": "gulp uglify",
         "gulp-pre-commit": "gulp pre-commit",
@@ -350,7 +350,8 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                         templateUrl: 'modal-resumen-cuenta.html',
                         controller: 'focaModalResumenCuentaController',
                         resolve: {
-                            cliente: function() { return $scope.cobranza.cliente; }
+                            cliente: function() { return $scope.cobranza.cliente; },
+                            idMoneda: function() { return $scope.cobranza.moneda.ID; }
                         },
                         size: 'lg'
                     }
...	...	@@ -4,6 +4,7 @@
4	4	"description": "sistema de cobranzas a partir de facturas",
5	5	"main": "index.js",
6	6	"scripts": {
	7	+ "refresh": "gulp uglify && cp tmp/foca-crear-cobranza.js ../wrapper-demo/node_modules/foca-crear-cobranza/dist/foca-crear-cobranza.min.js",
7	8	"test": "test.html",
8	9	"compile": "gulp uglify",
9	10	"gulp-pre-commit": "gulp pre-commit",
...	...	@@ -350,7 +350,8 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
350	350	templateUrl: 'modal-resumen-cuenta.html',
351	351	controller: 'focaModalResumenCuentaController',
352	352	resolve: {
353		- cliente: function() { return $scope.cobranza.cliente; }
	353	+ cliente: function() { return $scope.cobranza.cliente; },
	354	+ idMoneda: function() { return $scope.cobranza.moneda.ID; }
354	355	},
355	356	size: 'lg'
356	357	}