just a snapshot

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
index a8c2610..6646839 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
@@ -6,6 +6,10 @@ function patron_bills_init(p) {
 
        p.patron_bills_cols = [
                {
+                       'id' : 'checkbox', 'label' : '', 'flex' : 0, 'primary' : false, 'hidden' : false,
+                       'render_xul' : 'checkbox'
+               },
+               {
                        'id' : 'xact_dates', 'label' : getString('bills_xact_dates_label'), 'flex' : 0,
                        'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 
                        'fm_field_render' : 'xact_dates_box($$)'
@@ -160,6 +164,7 @@ function patron_bills_add_patron_bills(p, bills) {
                        if (hash.render_xul) {
                                var xul = p.w.document.createElement( hash.render_xul );
                                listcell.appendChild( xul );
+                               if (hash.render_xul == 'checkbox') xul.setAttribute('checked', 'true');
                        }
                        cols.push( listcell );
                }

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
index 828cc9b..0ba030e 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -482,7 +482,13 @@ function patron_display_patron_holds_init(p) {
 }
 
 function patron_display_patron_bills_init(p) {
-       p.patron_bills = patron_bills_init( { 'w' : p.w, 'node' : p.patron_bills_node, 'debug' : p.app } );
+       p.patron_bills = patron_bills_init( { 
+               'w' : p.w, 
+               'node' : p.patron_bills_node, 
+               'debug' : p.app 
+       } );
+
+       p.patron_bills.update_callback = function { p.refresh(); }
 
        p.redraw_patron_bills = function() {
                try {
@@ -493,7 +499,6 @@ function patron_display_patron_bills_init(p) {
                        sdump('D_ERROR',js2JSON(E) + '\n');
                }
        }
-
 }
 
 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
index 538cd20..e069e4f 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
@@ -58,8 +58,8 @@
        <groupbox id="cssdgb4">
                <caption id="cssdgb4c" label="&patron_navbar.bills;"/>
                <box id="PatronBills_insert1" flex="0" />
-               <box id="PatronBills_main" flex="0" />
-               <box id="PatronBills_insert2" flex="1" />
+               <box id="PatronBills_main" flex="1" />
+               <box id="PatronBills_insert2" flex="0" />
        </groupbox>
        <box id="PatronEdit_main"><label value="edit" /></box>
        <box id="PatronInfo_main"><label value="info" /></box>
@@ -103,77 +103,66 @@
 </hbox>
 
 <box id="PatronBills_insert1" orient="vertical">
-       <hbox id="pbi1_hb">
-               <spacer id="pbi1_s1" flex="1" />
-               <grid id="pbi1_g1" style="border: solid thin black">
-                       <columns id="pbi1_gc">
-                               <column id="pbi1_gc1"/>
-                               <column id="pbi1_gc2"/>
-                       </columns>                                 
+</box>
+
+<box id="PatronBills_insert2" orient="vertical">
+       <label value=" "/>
+       <hbox>
+               <spacer flex="2"/>
+               <grid style="border: solid thin black">
+                       <columns><column /><column /></columns>                                 
                        <rows>
                                <row>
-                                       <label id="pbi1_l2" value="Payment Type" 
-                                               accesskey="t" control="pbi1_ml" 
-                                               style="font-family: bold" />
-       
-                                       <label id="pbi1_l1" value="Payment amount" 
-                                               accesskey="p" control="pbi1_tb1"
+                                       <label value="Total Owed"
                                                style="font-family: bold" />
+
+                                       <textbox id="bill_total_owed" value="" 
+                                               style="font-family: bold" disabled="true" />
                                </row>
                                <row>
-                                       <menulist id="pbi1_ml">
-                                               <menupopup id="pbi1_mp">
-                                                       <menuitem id="pbi1_mi1" label="Cash" />
-                                                       <menuitem id="pbi1_mi2" label="Credit Card" />
-                                                       <menuitem id="pbi1_mi3" label="Forward Balance" />
-                                                       <menuitem id="pbi1_mi4" label="Forgive" />
+                                       <label id="pbi1_l2" value="Payment Type" 
+                                               accesskey="t" control="pbi1_ml" 
+                                               style="font-family: bold" />
+                                       <menulist id="payment_type_menulist">
+                                               <menupopup id="payment_type_menupopup">
+                                                       <menuitem id="payment_type_menuitem1" label="Cash" />
+                                                       <menuitem id="payment_type_menuitem2" label="Credit Card" />
+                                                       <menuitem id="payment_type_menuitem3" label="Forward Balance" />
+                                                       <menuitem id="payment_type_menuitem4" label="Forgive" />
                                                </menupopup>
                                        </menulist>
+                               </row>
+                               <row>
+                                       <label value="Payment amount" 
+                                               accesskey="p" control="pbi1_tb1"
+                                               style="font-family: bold" />
                
                                        <textbox id="bill_payment_amount_textbox" />
                                </row>
-                       </rows>
-               </grid>
-               <spacer id="pbi1_s3" flex="1" />
-       </hbox>
-       <label id="pbi1_s2" value=" "/>
-</box>
-
-<box id="PatronBills_insert2" orient="vertical">
-       <label id="pbi2_s1" value=" "/>
-       <hbox id="pbi2_hb">
-               <spacer id="bpi2_s3" flex="1"/>
-               <grid id="pbi2_g1" style="border: solid thin black">
-                       <columns id="pbi2_gc">
-                               <column id="pbi2_gc1"/>
-                               <column id="pbi2_gc2"/>
-                               <column id="pbi2_gc3"/>
-                       </columns>                                 
-                       <rows>
                                <row>
-                                       <label id="pbi2_l2" value="Change" 
+                                       <label value="Change" 
                                                control="bill_change_amount_textbox" 
                                                style="font-family: bold" />
        
-                                       <label id="pbi2_l1" value="Forward Balance" 
-                                               control="bill_credit_amount_textbox"
-                                               style="font-family: bold" />
+                                       <textbox id="bill_change_amount_textbox" />
                                </row>
                                <row>
-                                       <hbox id="pbi2_hb2">
-                                               <textbox id="bill_change_amount_textbox" />
-                                               <button id="convert_change_to_credit_button" label="->" />
-                                       </hbox>
+
+                                       <button label="Forward Credit" 
+                                               style="font-family: bold" />
 
                                        <textbox id="bill_credit_amount_textbox" />
 
+                               </row>
+                               <row>
+                                       <spacer/>
                                        <button id="bill_apply_payment" label="Go!" accesskey="G"/>
                                </row>
                        </rows>
                </grid>
-               <spacer id="bpi2_s4" flex="1"/>
+               <spacer flex="1" />     
        </hbox>
-       <spacer id="pbi2_s2" flex="1" />        
+       <spacer flex="1" />     
 </box>
 
 <!-- Accelerator Keys (Accessor Keys are in DTD's) -->