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

[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  4efea97f1385be94a5d94caff7dae7dd9136e77f (commit)
      from  000cf61a0c9182e6edb5b3fd67b09c39eeb8c647 (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 4efea97f1385be94a5d94caff7dae7dd9136e77f
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Sep 11 13:54:32 2015 -0400

    lp1494427: Fix refund error
    
    Fixes an error that occurs when attempting to refund a negative balance from
    the patron's bill record. We removed the staff.patron.bills.handle_refund.
    confirm_message string, which caused the error when the handle_refund function
    tried to retrieve the string. It turns out the string never displayed in the
    client. Therefore, in this branch, we stop the handle_refund function from
    trying to retrieve the string. I did the confirmation message for the
    adjust_to_zero function since the same issue was occurring there.
    
    Test case: Find a negative balance transaction and, from the patron's bills
    record, select the transaction and select the option to Refund. Pre-patch, this
    action will generate an error message. Post-patch, this action should generate
    a prompt asking the user to confirm the action.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
index 401f19d..e8e48dc 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
@@ -49,7 +49,6 @@ staff.patron.bills.handle_refund.title=Refund Excess Payment
 staff.patron.bills.handle_refund.btn_yes=Yes
 staff.patron.bills.handle_refund.btn_no=No
 
-staff.patron.bills.handle_adjust_to_zero.confirm_message=Check here to confirm this message
 staff.patron.bills.handle_adjust_to_zero.message_plural=Are you sure you would like to adjust to zero the balance on bills %1$s?
 staff.patron.bills.handle_adjust_to_zero.message_singular=Are you sure you would like to adjust to zero the balance on bill %1$s?
 staff.patron.bills.handle_adjust_to_zero.title=Adjust to Zero
diff --git a/Open-ILS/xul/staff_client/server/patron/bill2.js b/Open-ILS/xul/staff_client/server/patron/bill2.js
index 3db87f9..ee0cc62 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.js
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.js
@@ -372,8 +372,7 @@ function handle_refund() {
     var r = g.error.yns_alert(msg,
         $("patronStrings").getString('staff.patron.bills.handle_refund.title'),
         $("patronStrings").getString('staff.patron.bills.handle_refund.btn_yes'),
-        $("patronStrings").getString('staff.patron.bills.handle_refund.btn_no'),null,
-        $("patronStrings").getString('staff.patron.bills.handle_refund.confirm_message'));
+        $("patronStrings").getString('staff.patron.bills.handle_refund.btn_no'),null);
     if (r == 0) {
         for (var i = 0; i < g.bill_list_selection.length; i++) {
             var bill_id = g.bill_list_selection[i];
@@ -408,10 +407,7 @@ function handle_adjust_to_zero() {
         $("patronStrings").getString(
             'staff.patron.bills.handle_adjust_to_zero.btn_yes'),
         $("patronStrings").getString(
-            'staff.patron.bills.handle_adjust_to_zero.btn_no'),null,
-        $("patronStrings").getString(
-            'staff.patron.bills.handle_adjust_to_zero.confirm_message'));
-
+            'staff.patron.bills.handle_adjust_to_zero.btn_no'),null);
     if (r == 0) {
         var xact_ids = [];
         for (var i = 0; i < g.bill_list_selection.length; i++) {

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

Summary of changes:
 .../server/locale/en-US/patron.properties          |    1 -
 Open-ILS/xul/staff_client/server/patron/bill2.js   |    8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS