From 3e30baccaeb654563fb5c4f51a2534a4e57ce547 Mon Sep 17 00:00:00 2001 From: Cesar Velez Date: Fri, 13 Oct 2017 13:23:22 -0400 Subject: [PATCH] LP#1722899 - Fix issues with Patron Bill payment annotation dialog/modal The annotation modal's result was not actually being returned, so I fixed ui.js's egPromptDialog. Signed-off by: Cesar Velez Signed-off-by: Galen Charlton --- Open-ILS/web/js/ui/default/staff/circ/patron/bills.js | 2 +- Open-ILS/web/js/ui/default/staff/services/ui.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js index 0aa98d3cb3..5b7c0796d9 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js @@ -503,7 +503,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location, function() { // amount confirmed add_payment_note().then(function(pay_note) { add_cc_args().then(function(cc_args) { - sendPayment(pay_note, cc_args); + sendPayment(pay_note.value, cc_args); }) }); }, diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js index b6198db427..76d5425115 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -459,11 +459,11 @@ function($uibModal, $interpolate) { $scope.args = {value : promptValue || ''}; $scope.focus = true; $scope.ok = function() { - if (msg_scope.ok) msg_scope.ok($scope.args.value); - $uibModalInstance.close() + if (msg_scope && msg_scope.ok) msg_scope.ok($scope.args.value); + $uibModalInstance.close($scope.args); } $scope.cancel = function() { - if (msg_scope.cancel) msg_scope.cancel(); + if (msg_scope && msg_scope.cancel) msg_scope.cancel(); $uibModalInstance.dismiss(); } } -- 2.43.2