Merge branch 'master' into 'develop'

Master(mpuebla) See merge request !2

Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !2
Eric Fernandez
2 parents f748d65630 f5e403365c
Showing 3 changed files Show diff stats
src/js/controller.js
src/views/modal-forma-pago.html
src/views/modal-tarjetas.html
@@ -6,13 +6,13 @@ angular.module(&#39;focaModalFormaPago&#39;)
             $uibModalInstance, focaModalFormaPagoService) {
  
             //#region Variables
-            $scope.botonesTarjetas = [];
+            $scope.botones = [];
             //#endregion
  
             init();
  
             function init() {
-                $scope.botonesTarjetas = focaModalFormaPagoService.getBotonera();
+                $scope.botones = focaModalFormaPagoService.getBotonera();
             }
  
             $scope.seleccionarContado = function () {
@@ -30,7 +30,7 @@ angular.module(&#39;focaModalFormaPago&#39;)
                     'focaModalTarjetasController');
                 modalInstance.result
                     .then(function (data) {
-                        console.log(data);
+                        $uibModalInstance.close(data);
                     })
                     .catch(function (e) { console.error(e); });
             };
@@ -82,10 +82,6 @@ angular.module(&#39;focaModalFormaPago&#39;)
             $scope.cancel = function () {
                 $uibModalInstance.dismiss('cancel');
             };
-
-            $scope.select = function (iva) {
-                $uibModalInstance.close(iva);
-            };
         }]
     )
     .controller('focaModalTarjetasController', [
@@ -112,8 +108,8 @@ angular.module(&#39;focaModalFormaPago&#39;)
                 $uibModalInstance.dismiss('cancel');
             };
  
-            $scope.select = function (iva) {
-                $uibModalInstance.close(iva);
+            $scope.aceptarFormaDePago = function () {
+                $uibModalInstance.close('data de tarjeta');
             };
  
             function animateForm() {
@@ -8,7 +8,7 @@
             <div class="row mx-0 botonera-secundaria">
                 <div class="col-12">
                     <foca-botonera-forma-pago 
-                        botones="botonesTarjetas" 
+                        botones="botones" 
                         max="1" 
                         class="row justify-content-start mx-0"
                     >
@@ -64,7 +64,12 @@
 </div>
  
  
-<div class="modal-footer d-flex justify-content-between">
+<div class="modal-footer d-flex" ng-class="{ 'justify-content-between': showForm }">
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
-    <button class="btn btn-sm btn-primary" type="button" ng-click="cancel()">Aceptar</button>
+    <button
+        class="btn btn-sm btn-primary"
+        type="button"
+        ng-click="aceptarFormaDePago()"
+        ng-show="showForm">Aceptar
+    </button>
 </div>
...	...	@@ -6,13 +6,13 @@ angular.module('focaModalFormaPago')
6	6	$uibModalInstance, focaModalFormaPagoService) {
7	7
8	8	//#region Variables
9		- $scope.botonesTarjetas = [];
	9	+ $scope.botones = [];
10	10	//#endregion
11	11
12	12	init();
13	13
14	14	function init() {
15		- $scope.botonesTarjetas = focaModalFormaPagoService.getBotonera();
	15	+ $scope.botones = focaModalFormaPagoService.getBotonera();
16	16	}
17	17
18	18	$scope.seleccionarContado = function () {
...	...	@@ -30,7 +30,7 @@ angular.module('focaModalFormaPago')
30	30	'focaModalTarjetasController');
31	31	modalInstance.result
32	32	.then(function (data) {
33		- console.log(data);
	33	+ $uibModalInstance.close(data);
34	34	})
35	35	.catch(function (e) { console.error(e); });
36	36	};
...	...	@@ -82,10 +82,6 @@ angular.module('focaModalFormaPago')
82	82	$scope.cancel = function () {
83	83	$uibModalInstance.dismiss('cancel');
84	84	};
85		-
86		- $scope.select = function (iva) {
87		- $uibModalInstance.close(iva);
88		- };
89	85	}]
90	86	)
91	87	.controller('focaModalTarjetasController', [
...	...	@@ -112,8 +108,8 @@ angular.module('focaModalFormaPago')
112	108	$uibModalInstance.dismiss('cancel');
113	109	};
114	110
115		- $scope.select = function (iva) {
116		- $uibModalInstance.close(iva);
	111	+ $scope.aceptarFormaDePago = function () {
	112	+ $uibModalInstance.close('data de tarjeta');
117	113	};
118	114
119	115	function animateForm() {
...	...	@@ -8,7 +8,7 @@
8	8	<div class="row mx-0 botonera-secundaria">
9	9	<div class="col-12">
10	10	<foca-botonera-forma-pago
11		- botones="botonesTarjetas"
	11	+ botones="botones"
12	12	max="1"
13	13	class="row justify-content-start mx-0"
14	14	>
...	...	@@ -64,7 +64,12 @@
64	64	</div>
65	65
66	66
67		-<div class="modal-footer d-flex justify-content-between">
	67	+<div class="modal-footer d-flex" ng-class="{ 'justify-content-between': showForm }">
68	68	<button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
69		- <button class="btn btn-sm btn-primary" type="button" ng-click="cancel()">Aceptar</button>
	69	+ <button
	70	+ class="btn btn-sm btn-primary"
	71	+ type="button"
	72	+ ng-click="aceptarFormaDePago()"
	73	+ ng-show="showForm">Aceptar
	74	+ </button>
70	75	</div>