From 27d7f85de94bcf35475b203dd55538ec9c2a16f9 Mon Sep 17 00:00:00 2001 From: pines Date: Tue, 5 Sep 2006 17:56:07 +0000 Subject: [PATCH] Bill, would you sanity check this? appears to work on dev git-svn-id: svn://svn.open-ils.org/ILS/trunk@5965 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm | 9 +++++++++ Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm index a46cc7cf68..c522581587 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm @@ -959,6 +959,15 @@ sub fetch_billable_xact { return ($xact, $evt); } +sub fetch_billable_xact_summary { + my( $self, $id ) = @_; + my($xact, $evt); + $logger->debug("Fetching billable transaction summary %id"); + $xact = $self->cstorereq( + 'open-ils.cstore.direct.money.billable_transaction_summary.retrieve', $id ); + $evt = OpenILS::Event->new('MONEY_BILLABLE_TRANSACTION_NOT_FOUND') unless $xact; + return ($xact, $evt); +} sub fetch_fleshed_copy { my( $self, $id ) = @_; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm index a41b892fad..f8cc997dac 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm @@ -82,7 +82,8 @@ sub make_payments { my $amount = $pay->[1]; $amount =~ s/\$//og; # just to be safe - ($trans, $evt) = $apputils->fetch_open_billable_transaction($transid); + #($trans, $evt) = $apputils->fetch_open_billable_transaction($transid); + ($trans, $evt) = $apputils->fetch_billable_xact_summary($transid); return $evt if $evt; if($trans->usr != $userid) { # Do we need to restrict this in some way ?? -- 2.43.2