Merge branch 'master' into 'develop'

Master(mpuebla) See merge request !3

Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !3
Eric Fernandez
2 parents 7ead2bdea5 aec90d8f92
Showing 2 changed files Show diff stats
src/js/controller.js
src/js/service.js
@@ -15,7 +15,7 @@ angular.module(&#39;focaModalFormaPago&#39;)
                 $scope.botones = focaModalFormaPagoService.getBotonera();
             }
  
-            $scope.seleccionarContado = function () {
+            $scope.seleccionarEfectivo = function () {
                 var modalInstance = abrirModal('modal-tarjetas.html',
                     'focaModalTarjetasController');
                 modalInstance.result
@@ -4,8 +4,8 @@ angular.module(&#39;focaModalFormaPago&#39;)
             getBotonera: function () {
                 return [
                     {
-                        label: 'Contado',
-                        image: 'contado.png',
+                        label: 'Efectivo',
+                        image: 'efectivo.png',
                         disabled: true
                     },
                     {
...	...	@@ -15,7 +15,7 @@ angular.module('focaModalFormaPago')
15	15	$scope.botones = focaModalFormaPagoService.getBotonera();
16	16	}
17	17
18		- $scope.seleccionarContado = function () {
	18	+ $scope.seleccionarEfectivo = function () {
19	19	var modalInstance = abrirModal('modal-tarjetas.html',
20	20	'focaModalTarjetasController');
21	21	modalInstance.result
...	...	@@ -4,8 +4,8 @@ angular.module('focaModalFormaPago')
4	4	getBotonera: function () {
5	5	return [
6	6	{
7		- label: 'Contado',
8		- image: 'contado.png',
	7	+ label: 'Efectivo',
	8	+ image: 'efectivo.png',
9	9	disabled: true
10	10	},
11	11	{