diff --git a/src/js/controller.js b/src/js/controller.js index 5d015a5..9e2e112 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,9 +1,9 @@ angular.module('focaModalFormaPago') .controller('focaModalFormaPagoController', [ '$timeout', '$filter', '$scope', '$uibModal', - '$uibModalInstance', 'focaModalFormaPagoService', 'parametros', + '$uibModalInstance', 'focaModalFormaPagoService', 'parametros', 'focaModalService', function ($timeout, $filter, $scope, $uibModal, - $uibModalInstance, focaModalFormaPagoService, parametros) { + $uibModalInstance, focaModalFormaPagoService, parametros, focaModalService) { //#region Variables $scope.botones = []; @@ -16,11 +16,10 @@ angular.module('focaModalFormaPago') } $scope.seleccionarEfectivo = function () { - var modalInstance = abrirModal('modal-tarjetas.html', - 'focaModalTarjetasController'); - modalInstance.result + var modalInstance = focaModalService.prompt({ titulo: 'Ingrese monto' }); + modalInstance .then(function (data) { - console.log(data); + $uibModalInstance.close({ data: data, tipo: 'efectivo' }); }) .catch(function (e) { console.error(e); }); }; @@ -30,7 +29,7 @@ angular.module('focaModalFormaPago') 'focaModalTarjetasController'); modalInstance.result .then(function (data) { - $uibModalInstance.close({data: data, tipo: 'tarjeta'}); + $uibModalInstance.close({ data: data, tipo: 'tarjeta' }); }) .catch(function (e) { console.error(e); }); }; @@ -71,9 +70,11 @@ angular.module('focaModalFormaPago') templateUrl: templateUrl, controller: controller, resolve: { - parametros: function () { return { - importe: parametros.importe - }; }, + parametros: function () { + return { + importe: parametros.importe + }; + }, }, size: 'lg', } @@ -90,8 +91,7 @@ angular.module('focaModalFormaPago') '$timeout', '$filter', '$scope', '$uibModalInstance', 'focaModalTarjetasService', 'parametros', function ($timeout, $filter, $scope, $uibModalInstance, focaModalTarjetasService, - parametros) - { + parametros) { $scope.parametros = parametros; @@ -105,7 +105,7 @@ angular.module('focaModalFormaPago') function init() { - focaModalTarjetasService.getTarjetas().then(function(res) { + focaModalTarjetasService.getTarjetas().then(function (res) { res.data.forEach(function (boton) { $scope.botonesTarjetas.push({ diff --git a/src/js/service.js b/src/js/service.js index d3c5be1..0280f6e 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -6,7 +6,7 @@ angular.module('focaModalFormaPago') { label: 'Efectivo', image: 'efectivo.png', - disabled: true + disabled: false }, { label: 'Tarjetas',