From 96b0d99fe339b04ae527b8f4eb34107bfc1ace99 Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 18 Nov 2005 13:24:03 +0000 Subject: [PATCH] display tweak git-svn-id: svn://svn.open-ils.org/ILS/trunk@2067 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../content/evergreen/patron/patron_bills.js | 51 +++++++++++++++++-- .../locale/en-US/evergreen/OpenILS.properties | 4 +- 2 files changed, 48 insertions(+), 7 deletions(-) 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 7a1706649a..4da92a1aee 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js @@ -214,7 +214,7 @@ function patron_bills_list_box_init( p ) { 'fm_field_render' : 'xact_dates_box($$)' }, { - 'id' : 'notes', 'label' : getString('bills_information'), 'flex' : 1, + 'id' : 'notes', 'label' : getString('bills_information'), 'flex' : 0, 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : 'info_box($$)' }, @@ -337,12 +337,53 @@ function patron_bills_add_patron_bills(p, bills) { function info_box( mbts ) { var vbox = p.w.document.createElement('vbox'); - var label = p.w.document.createElement('label'); - vbox.appendChild( label ); - label.setAttribute( 'value', mbts.last_billing_note() ); + var grid = p.w.document.createElement('grid'); + vbox.appendChild( grid ); + + var cols = p.w.document.createElement('columns'); + grid.appendChild( cols ); + cols.appendChild( p.w.document.createElement('column') ); + cols.appendChild( p.w.document.createElement('column') ); + var rows = p.w.document.createElement('rows'); + grid.appendChild( rows ); + + var xact_type = p.w.document.createElement('row'); + rows.appendChild( xact_type ); + + var xt_label = p.w.document.createElement('label'); + xact_type.appendChild( xt_label ); + xt_label.setAttribute( 'value', 'Type' ); + var xt_value = p.w.document.createElement('label'); + xact_type.appendChild( xt_value ); + xt_value.setAttribute( 'value', mbts.xact_type() ); + + var last_billing = p.w.document.createElement('row'); + rows.appendChild( last_billing ); + + var lb_label = p.w.document.createElement('label'); + last_billing.appendChild( lb_label ); + lb_label.setAttribute( 'value', 'Last Billing:' ); + + var lb_value = p.w.document.createElement('label'); + last_billing.appendChild( lb_value ); + if (mbts.last_billing_type()) + lb_value.setAttribute( 'value', mbts.last_billing_type() ); + + var last_payment = p.w.document.createElement('row'); + rows.appendChild( last_payment ); + + var lp_label = p.w.document.createElement('label'); + last_payment.appendChild( lp_label ); + lp_label.setAttribute( 'value', 'Last Payment:' ); + + var lp_value = p.w.document.createElement('label'); + last_payment.appendChild( lp_value ); + if (mbts.last_payment_type()) + lp_value.setAttribute( 'value', mbts.last_payment_type() ); + var btn = p.w.document.createElement('button'); vbox.appendChild( btn ); - btn.setAttribute( 'label', 'Details' ); + btn.setAttribute( 'label', 'Full Details' ); btn.setAttribute( 'bill_id', mbts.id() ); return vbox; } diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties index 3bd8ae540b..d39c680900 100644 --- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties +++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties @@ -103,8 +103,8 @@ bills_xact_dates_label=Record / Dates bills_money_label=Money mbts_balance_owed_label=Balance Owed -mbts_id_label=Bill Id -mbts_total_owed_label=Original Bill +mbts_id_label=Bill # +mbts_total_owed_label=Total Billed mbts_total_paid_label=Total Paid mbts_xact_finish_label=Finish mbts_xact_start_label=Start -- 2.43.2