From 0593c84d7f5a43aac0bf20708be4cfa7a42a9950 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 21 Dec 2005 01:16:58 +0000
Subject: [PATCH] bill details shows payments and billings

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2485 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../server/patron/bill_details.xul            | 76 +++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
index ffee08b2c2..31bcc86063 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
@@ -38,6 +38,7 @@
 				JSAN.use('util.error'); g.error = new util.error();
 				JSAN.use('util.network'); g.network = new util.network();
 				JSAN.use('util.date');
+				JSAN.use('util.money');
 
 				g.error.sdump('D_TRACE','my_init() for bill_details.xul');
 
@@ -53,7 +54,7 @@
 					[ session, mbts_id ]
 				);
 
-				var rows = document.getElementById('g_rows');
+				var rows = document.getElementById('bill_rows');
 				for (var i = 0; i < mb_list.length; i++) {
 
 					var row = document.createElement('row');
@@ -73,13 +74,49 @@
 
 						var c4 = document.createElement('label');
 						row.appendChild(c4);
-						c4.setAttribute('value', mb_list[0].amount());
+						c4.setAttribute('value', util.money.sanitize( mb_list[0].amount() ) );
+						c4.setAttribute('class','text-right');
 
 						var c5 = document.createElement('label');
 						row.appendChild(c5);
 						c5.setAttribute('value', mb_list[0].note());
 				}
 
+				var mp_list = g.network.request(
+					api.fm_mp_retrieve_via_mbts_id.app,
+					api.fm_mp_retrieve_via_mbts_id.method,
+					[ session, mbts_id ]
+				);
+
+				var rows = document.getElementById('pay_rows');
+				for (var i = 0; i < mp_list.length; i++) {
+
+					var row = document.createElement('row');
+					rows.appendChild(row);
+
+						var c1 = document.createElement('label');
+						row.appendChild(c1);
+						//c1.setAttribute('value', mp_list[0].voided() ? 'Yes' : 'No' );
+						c1.setAttribute('value', 'No' );
+
+						var c2 = document.createElement('label');
+						row.appendChild(c2);
+						c2.setAttribute('value', util.date.formatted_date( mp_list[0].payment_ts(),'%F' ));
+
+						var c3 = document.createElement('label');
+						row.appendChild(c3);
+						c3.setAttribute('value', mp_list[0].payment_type());
+
+						var c4 = document.createElement('label');
+						row.appendChild(c4);
+						c4.setAttribute('value', util.money.sanitize( mp_list[0].amount() ) );
+						c4.setAttribute('class','text-right');
+
+						var c5 = document.createElement('label');
+						row.appendChild(c5);
+						c5.setAttribute('value', mp_list[0].note());
+				}
+
 	
 			} catch(E) {
 				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
@@ -96,9 +133,38 @@
 		<groupbox orient="vertical" flex="1">
 			<caption label="Full Details"/>
 			<grid>
-				<columns> <column /> <column /> <column /> <column /> </columns>
-				<rows id="g_rows">
-					<row><label value="Voided" /><label value="When"/><label value="Type" /><label value="Amount" /><label value="Note"/></row>
+				<columns> <column /> <column /> </columns>
+				<rows>
+					<row>
+						<label value="Bills" class="header" style="color: red;" />
+						<grid>
+							<columns> <column /> <column /> <column /> <column /> </columns>
+							<rows id="bill_rows">
+								<row>
+									<label value="Voided" class="header" />
+									<label value="When" class="header" />
+									<label value="Type" class="header" />
+									<label value="Amount" class="header" />
+									<label value="Note" class="header" />
+								</row>
+							</rows>
+						</grid>
+					</row>
+					<row>
+						<label value="Payments" class="header" style="color: green;" />
+						<grid>
+							<columns> <column /> <column /> <column /> <column /> </columns>
+							<rows id="pay_rows">
+								<row>
+									<label value="Voided" class="header" />
+									<label value="When" class="header" />
+									<label value="Type" class="header" />
+									<label value="Amount" class="header" />
+									<label value="Note" class="header" />
+								</row>
+							</rows>
+						</grid>
+					</row>
 				</rows>
 			</grid>
 		</groupbox>
-- 
2.43.2