Added an Annotate Payment checkbox to bill interface. Fixed a regression with xulG...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7533 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js
index 8b8ef0d..33b7b1f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bills.js
+++ b/Open-ILS/xul/staff_client/server/patron/bills.js
@@ -455,29 +455,31 @@ patron.bills.prototype = {
                                var win = new util.window();
                                switch(obj.controller.view.payment_type.value) {
                                        case 'credit_card_payment' :
-                                               //obj.OpenILS.data.temp = '';
-                                               //obj.OpenILS.data.stash('temp');
+                                               obj.OpenILS.data.temp = '';
+                                               obj.OpenILS.data.stash('temp');
                                                var my_xulG = win.open(
                                                        urls.XUL_PATRON_BILL_CC_INFO,
                                                        'billccinfo',
                                                        'chrome,resizable,modal'
                                                );
-                                               //obj.OpenILS.data.stash_retrieve();
-                                               payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+                                               obj.OpenILS.data.stash_retrieve();
+                                               //payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+                                               payment_blob = JSON2js( obj.OpenILS.data.temp );
                                        break;
                                        case 'check_payment' :
-                                               //obj.OpenILS.data.temp = '';
-                                               //obj.OpenILS.data.stash('temp');
+                                               obj.OpenILS.data.temp = '';
+                                               obj.OpenILS.data.stash('temp');
                                                var my_xulG = win.open(
                                                        urls.XUL_PATRON_BILL_CHECK_INFO,
                                                        'billcheckinfo',
                                                        'chrome,resizable,modal'
                                                );
-                                               //obj.OpenILS.data.stash_retrieve();
-                                               payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+                                               obj.OpenILS.data.stash_retrieve();
+                                               //payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+                                               payment_blob = JSON2js( obj.OpenILS.data.temp );
                                        break;
                                }
-                               if (payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
+                               if ((typeof payment_blob == 'undefined') || payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
                                payment_blob.userid = obj.patron_id;
                                payment_blob.note = payment_blob.note || '';
                                //payment_blob.cash_drawer = 1; // FIXME: get new Config() to work
@@ -543,6 +545,10 @@ patron.bills.prototype = {
        'pay' : function(payment_blob) {
                var obj = this;
                try {
+            var x = document.getElementById('annotate_payment');
+            if (x && x.checked && (! payment_blob.note)) {
+                payment_blob.note = window.prompt('Please annotate this payment:','','Annotate Payment');
+            }
                        obj.previous_summary = {
                                original_balance : obj.controller.view.bill_total_owed.value,
                                voided_balance : obj.controller.view.voided_balance.value,

diff --git a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
index b69c1ef..0b9bcce 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
@@ -107,6 +107,7 @@
                <button id="bill_wizard" label="Bill Patron" accesskey="B" command="cmd_bill_wizard"/>
                <button id="bill_history" label="History" accesskey="H" command="cmd_bill_history"/>
                <spacer flex="2"/>
+               <checkbox id="annotate_payment" label="Annotate Payment" persist="checked" checked="false" />
                <checkbox id="auto_print" label="Auto-Print" persist="checked" checked="true" />
                <button class="hide_patron_credit" hidden="true" disabled="true" id="change_to_credit" label="Convert Change to Patron Credit" command="cmd_change_to_credit"/>
                <button id="bill_apply_payment" label="Apply Payment!" accesskey="P" command="cmd_bill_apply_payment"/>