[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. f4c1c11c69f2409211a85082c02a470eb1c7c807

[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, rel_3_0 has been updated
       via  f4c1c11c69f2409211a85082c02a470eb1c7c807 (commit)
       via  2288a231e075d1046a08ebacba43bbe340471947 (commit)
      from  8fd07d2747a5aaae7777c1efe1abceda97170d75 (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 f4c1c11c69f2409211a85082c02a470eb1c7c807
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>
    
    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 daa5ae4..1ead1cc 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 2288a231e075d1046a08ebacba43bbe340471947
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>
    
    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 4fa6398..daa5ae4 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 b33358f..38f775d 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -455,11 +455,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