[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4be8e6ae711ec7439f0ef8ad9f135af6a91591c8

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  4be8e6ae711ec7439f0ef8ad9f135af6a91591c8 (commit)
       via  3e30baccaeb654563fb5c4f51a2534a4e57ce547 (commit)
      from  6c17e1fa71115cea86399c6bf9e2f560c77a6bd7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4be8e6ae711ec7439f0ef8ad9f135af6a91591c8
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Nov 2 15:39:38 2017 -0400

    LP#1722899 - Fix bug due undefined pay note value
    
    Prevent error due to null or undefined pay_note.value
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 5b7c079..8f06491 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,8 @@ 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.value, cc_args);
+                        var note_text = pay_note ? pay_note.value || '' : null;
+                        sendPayment(note_text, cc_args);
                     })
                 });
             },

commit 3e30baccaeb654563fb5c4f51a2534a4e57ce547
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Fri Oct 13 13:23:22 2017 -0400

    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 <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 0aa98d3..5b7c079 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 b6198db..76d5425 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();
                     }
                 }

-----------------------------------------------------------------------

Summary of changes:
 .../web/js/ui/default/staff/circ/patron/bills.js   |    3 ++-
 Open-ILS/web/js/ui/default/staff/services/ui.js    |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS