[open-ils-commits] r14200 - in trunk/Open-ILS: src/perlmods/OpenILS/Application xul/staff_client/chrome/content/main (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-09-29 09:08:07 -0400 (Tue, 29 Sep 2009)
New Revision: 14200

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
   trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
Log:
Spruce up open-ils.actor.user.transaction.fleshed.retrieve.  The new bill history interface will use it



Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-09-29 12:19:31 UTC (rev 14199)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-09-29 13:08:07 UTC (rev 14200)
@@ -1605,7 +1605,7 @@
 	api_name	=> "open-ils.actor.user.transaction.fleshed.retrieve",
 	argc		=> 1,
 	notes		=> <<"	NOTES");
-	Returns a fleshedtransaction record
+	Returns a fleshed transaction record
 	NOTES
 __PACKAGE__->register_method(
 	method	=> "user_transaction_retrieve",
@@ -1617,7 +1617,7 @@
 sub user_transaction_retrieve {
 	my( $self, $client, $login_session, $bill_id ) = @_;
 
-	# XXX I think I'm deprecated... make sure
+	# I think I'm deprecated... make sure.   phasefx says, "No, I'll use you :)
 
 	my $trans = $apputils->simple_scalar_request( 
 		"open-ils.cstore",
@@ -1639,7 +1639,7 @@
 
 	my $circ = $apputils->simple_scalar_request(
 			"open-ils.cstore",
-			"open-ils..direct.action.circulation.retrieve",
+			"open-ils.cstore.direct.action.circulation.retrieve",
 			$trans->id );
 
 	return {transaction => $trans} unless $circ;
@@ -1654,17 +1654,17 @@
 	$logger->debug("Found the circ title");
 
 	my $mods;
+    my $copy = $apputils->simple_scalar_request(
+        "open-ils.cstore",
+        "open-ils.cstore.direct.asset.copy.retrieve",
+        $circ->target_copy );
+
 	try {
 		my $u = OpenILS::Utils::ModsParser->new();
 		$u->start_mods_batch($title->marc());
 		$mods = $u->finish_mods_batch();
 	} otherwise {
 		if ($title->id == OILS_PRECAT_RECORD) {
-			my $copy = $apputils->simple_scalar_request(
-				"open-ils.cstore",
-				"open-ils.cstore.direct.asset.copy.retrieve",
-				$circ->target_copy );
-
 			$mods = new Fieldmapper::metabib::virtual_record;
 			$mods->doc_id(OILS_PRECAT_RECORD);
 			$mods->title($copy->dummy_title);
@@ -1674,7 +1674,7 @@
 
 	$logger->debug("MODSized the circ title");
 
-	return {transaction => $trans, circ => $circ, record => $mods };
+	return {transaction => $trans, circ => $circ, record => $mods, copy => $copy };
 }
 
 

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js	2009-09-29 12:19:31 UTC (rev 14199)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js	2009-09-29 13:08:07 UTC (rev 14200)
@@ -48,6 +48,7 @@
 	'BILL_PAY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment' },
 	'BLOB_AU_PARTS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve.parts', 'cacheable' : true, 'ttl' : 120000 },
 	'BLOB_MARC_CALLNUMBERS_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc_cn.retrieve', 'secure' : false },
+    'BLOB_MBTS_DETAILS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transaction.fleshed.retrieve', 'secure' : false },
 	'BLOB_MOBTS_CIRC_MVR_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.fleshed' },
 	'BLOB_MOBTS_CIRC_MVR_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.fleshed' },
 	'BUCKET_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.create' },