get refresh working again from bill_history so void total will be updated. tweak...

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

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
index 9d91b92..8b13e92 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
@@ -167,7 +167,7 @@ OpenILS.data.prototype = {
                                }, 
                                'bill_payment' : {
                                        'type' : 'payment',
-                                       'header' : 'Welcome to %LIBRARY%!<br/>A receipt of your  transaction:<hr/> <table width="100%"> <tr> <td>Original Balance:</td> <td align="right">$%original_balance%</td> </tr> <tr> <td>Payment Method:</td> <td align="right">%payment_type%</td> </tr> <tr> <td>Payment Received:</td> <td align="right">$%payment_received%</td> </tr> <tr> <td>Payment Applied:</td> <td align="right">$%payment_applied%</td> </tr> <tr> <td>Billings Voided:</td> <td align="right">$%voided_balance%</td> </tr> <tr> <td>Change Given:</td> <td align="right">$%change_given%</td> </tr> <tr> <td>New Balance:</td> <td align="right">$%new_balance%</td> </tr> </table> <p> Note: %note% </p> <p> Specific bills: <blockquote>',
+                                       'header' : 'Welcome to %LIBRARY%!<br/>A receipt of your  transaction:<hr/> <table width="100%"> <tr> <td>Original Balance:</td> <td align="right">$%original_balance%</td> </tr> <tr> <td>Payment Method:</td> <td align="right">%payment_type%</td> </tr> <tr> <td>Payment Received:</td> <td align="right">$%payment_received%</td> </tr> <tr> <td>Payment Applied:</td> <td align="right">$%payment_applied%</td> </tr> <tr> <td>Billings Voided:</td> <td align="right">%voided_balance%</td> </tr> <tr> <td>Change Given:</td> <td align="right">$%change_given%</td> </tr> <tr> <td>New Balance:</td> <td align="right">$%new_balance%</td> </tr> </table> <p> Note: %note% </p> <p> Specific bills: <blockquote>',
                                        'line_item' : 'Bill #%bill_id%  Received: $%payment%<br />',
                                        'footer' : '</blockquote> </p> <hr />%PINES_CODE% %TODAY_TRIM%<br/> <br/> ',
                                },

diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
index 1f5fb0b..86ff884 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -268,6 +268,7 @@
                                retrieve_mbts_for_list();
                                //g.data.temp = 'refresh'; g.data.stash('temp');
                                if (typeof window.refresh == 'function') window.refresh();
+                               if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
                        }
                }
 
@@ -280,6 +281,12 @@
                                'test_billdetails',
                                'modal,chrome,resizable'
                        );
+                       //g.data.temp = 'refresh'; g.data.stash('temp');
+                       g.data.stash_retrieve();
+                       if (g.data.temp == 'refresh') {
+                               if (typeof window.refresh == 'function') window.refresh();
+                               if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
+                       }
                }
 
                function print_bills() {

diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js
index 2f29f58..51725d3 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bills.js
+++ b/Open-ILS/xul/staff_client/server/patron/bills.js
@@ -179,6 +179,7 @@ patron.bills.prototype = {
                                                                                        //'chrome,resizable,modal'
                                                                                        'chrome,resizable'
                                                                                );
+                                                                               w.xulG = { 'refresh' : function() { obj.refresh(); } };
                                                                                //obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); }
                                                                                w.refresh = function() { obj.refresh(); };
                                                                        } catch(E) {
@@ -200,6 +201,7 @@ patron.bills.prototype = {
                                                                                        //'chrome,resizable,modal'
                                                                                        'chrome,resizable'
                                                                                );
+                                                                               w.xulG = { 'refresh' : function() { obj.refresh(); } };
                                                                                //obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); }
                                                                                w.refresh = function() { obj.refresh(); };
                                                                        } catch(E) {