From e4bc9c01ad161096813f145d993e28f712b09a7a Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 16 Aug 2006 21:36:51 +0000
Subject: [PATCH] fleshing copy on circs and workstation on payment objects

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5548 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../OpenILS/Application/Collections.pm        | 73 ++++++++++++++++---
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
index f52877c03f..4e59a91ed4 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
@@ -8,6 +8,7 @@ use OpenILS::Utils::Fieldmapper;
 use base 'OpenSRF::Application';
 use OpenILS::Utils::CStoreEditor qw/:funcs/;
 use OpenILS::Event;
+use OpenILS::Const qw/:const/;
 my $U = "OpenILS::Application::AppUtils";
 
 
@@ -294,7 +295,7 @@ sub add_collections_fee {
 	my $bill = Fieldmapper::money::billing->new;
 	$bill->note($fee_note);
 	$bill->xact($xact->id);
-	$bill->billing_type('Fee for Collection'); # XXX
+	$bill->billing_type('SYSTEM: Long Overdue Processing Fee'); # XXX
 	$bill->amount($fee_amount);
 
 	$e->create_money_billing($bill) or return $e->event;
@@ -376,12 +377,12 @@ sub remove_from_collections {
 }
 
 
-__PACKAGE__->register_method(
-	method		=> 'transaction_details',
-	api_name		=> 'open-ils.collections.user_transaction_details.retrieve',
-	signature	=> q/
-	/
-);
+#__PACKAGE__->register_method(
+#	method		=> 'transaction_details',
+#	api_name		=> 'open-ils.collections.user_transaction_details.retrieve',
+#	signature	=> q/
+#	/
+#);
 
 
 __PACKAGE__->register_method(
@@ -482,12 +483,54 @@ sub transaction_details {
 				fetch_grocery_xacts($e, $uid, $org, $start_date, $end_date)
 		};
 
+		# for each transaction, flesh the workstatoin on any attached payment
+		# and make the payment object a real object (e.g. cash payment), 
+		# not just a generic payment object
+		for my $xact ( 
+			@{$blob->{transactions}->{circulations}}, 
+			@{$blob->{transactions}->{grocery}} ) {
+
+			my $ps;
+			if( $ps = $xact->payments and @$ps ) {
+				my @fleshed; my $evt;
+				for my $p (@$ps) {
+					($p, $evt) = flesh_payment($e,$p);
+					return $evt if $evt;
+					push(@fleshed, $p);
+				}
+				$xact->payments(\@fleshed);
+			}
+		}
+
 		push( @data, $blob );
 	}
 
 	return \@data;
 }
 
+sub flesh_payment {
+	my $e = shift;
+	my $p = shift;
+	my $type = $p->payment_type;
+	$logger->debug("collect: fleshing workstation on payment $type : ".$p->id);
+	my $meth = "retrieve_money_$type";
+	$p = $e->$meth($p->id) or return (undef, $e->event);
+	try {
+		$p->cash_drawer(
+			$e->retrieve_actor_workstation(
+				[
+					$p->cash_drawer,
+					{
+						flesh => 1,
+						flesh_fields => { aws => [ 'owning_lib' ] }
+					}
+				]
+			)
+		);
+	} catch Error with {};
+	return ($p);
+}
+
 
 # --------------------------------------------------------------
 # Collect all open circs for the user 
@@ -515,7 +558,6 @@ sub fetch_circ_xacts {
 						{
 							usr			=> $uid, 
 							circ_lib		=> $n->id,
-							xact_finish	=> undef, 
 						}, 
 						{idlist => 1}
 					)
@@ -536,7 +578,7 @@ sub fetch_circ_xacts {
 					{
 						flesh => 1,
 						flesh_fields => { 
-							circ => [ "billings", "payments", "circ_lib" ]
+							circ => [ "billings", "payments", "circ_lib", 'target_copy' ]
 						}
 					}
 				]
@@ -547,6 +589,18 @@ sub fetch_circ_xacts {
 	return \@data;
 }
 
+sub set_copy_price {
+	my( $e, $copy ) = @_;
+	return if $copy->price and $copy->price > 0;
+	my $vol = $e->retrieve_asset_call_number($copy->call_number);
+	my $org = ($vol and $vol->id != OILS_PRECAT_CALL_NUMBER) 
+		? $vol->owning_lib : $copy->circ_lib;
+	my $setting = $e->retrieve_actor_org_unit_setting(
+		{ org_unit => $org, name => OILS_SETTING_DEF_ITEM_PRICE } );
+	$copy->price($setting->value);
+}
+
+
 
 sub fetch_grocery_xacts {
 	my $e				= shift;
@@ -566,7 +620,6 @@ sub fetch_grocery_xacts {
 						{
 							usr					=> $uid, 
 							billing_location	=> $n->id,
-							#xact_finish			=> undef, 
 						}, 
 						{idlist => 1}
 					)
-- 
2.43.2