Merge branch 'master' into 'develop'

Master(efernandez) See merge request !7

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !7
Eric Fernandez
2 parents 24b8eee01c f07e18559e
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -30,7 +30,7 @@ angular.module(&#39;focaModalFormaPago&#39;)
                     'focaModalTarjetasController');
                 modalInstance.result
                     .then(function (data) {
-                        $uibModalInstance.close(data);
+                        $uibModalInstance.close({data: data, tipo: 'tarjeta'});
                     })
                     .catch(function (e) { console.error(e); });
             };
...	...	@@ -30,7 +30,7 @@ angular.module('focaModalFormaPago')
30	30	'focaModalTarjetasController');
31	31	modalInstance.result
32	32	.then(function (data) {
33		- $uibModalInstance.close(data);
	33	+ $uibModalInstance.close({data: data, tipo: 'tarjeta'});
34	34	})
35	35	.catch(function (e) { console.error(e); });
36	36	};