From 76834ec2d7da00b9d6c2f6e7175ad6e616c815b8 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 30 Apr 2013 08:28:23 +1200 Subject: [PATCH] [Signed off] Bug 10120 : Tidy up the code so we can see what is going on Signed-off-by: David Cook --- C4/Circulation.pm | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index e069132..f7cb4de 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1785,21 +1785,28 @@ sub AddReturn { } if ($borrowernumber) { - if( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'}){ - # we only need to calculate and change the fines if we want to do that on return - # Should be on for hourly loans - my ( $amount, $type, $unitcounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today ); + if ( C4::Context->preference('CalculateFinesOnReturn') + && $issue->{'overdue'} ) + { +# we only need to calculate and change the fines if we want to do that on return +# Should be on for hourly loans + my ( $amount, $type, $unitcounttotal ) = + C4::Overdues::CalcFine( $item, $borrower->{categorycode}, + $branch, $datedue, $today ); $type ||= q{}; - if ( $amount > 0 && ( C4::Context->preference('finesMode') eq 'production' )) { - C4::Overdues::UpdateFine( - $issue->{itemnumber}, - $issue->{borrowernumber}, - $amount, $type, output_pref($datedue) - ); - } + if ( $amount > 0 + && ( C4::Context->preference('finesMode') eq 'production' ) + ) + { + C4::Overdues::UpdateFine( $issue->{itemnumber}, + $issue->{borrowernumber}, + $amount, $type, output_pref($datedue) ); + } } - MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'}); - $messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash. + MarkIssueReturned( $borrowernumber, $item->{'itemnumber'}, + $circControlBranch, '', $borrower->{'privacy'} ); + $messages->{'WasReturned'} = + 1; # FIXME is the "= 1" right? This could be the borrower hash. } ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'}); -- 1.7.7.4