From d06c2319828608071f135759b662f5899f8c4a61 Mon Sep 17 00:00:00 2001 From: Elliott Davis Date: Tue, 17 Apr 2012 10:38:14 +0000 Subject: [PATCH] bug 7849 Instant Fine Calculation\n Adds functionality of calculate fines instantly. This is very important for Hourly loans becuase of a loophole from the cron. Signed-off-by: Kyle M Hall Signed-off-by: Paul Poulain --- C4/Circulation.pm | 16 ++++++++++++++++ C4/Overdues.pm | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 6ca860d36d..b7e08f2e50 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -37,6 +37,7 @@ use C4::Debug; use C4::Branch; # GetBranches use C4::Log; # logaction use C4::Koha qw(GetAuthorisedValueByCode); +use C4::Overdues qw(CalcFine UpdateFine); use Data::Dumper; use Koha::DateUtils; use Koha::Calendar; @@ -1598,6 +1599,8 @@ sub AddReturn { # case of a return of document (deal with issues and holdingbranch) if ($doreturn) { + my $today = DateTime->now( time_zone => C4::Context->tz() ); + my $datedue = $issue->{date_due}; $borrower or warn "AddReturn without current borrower"; my $circControlBranch; if ($dropbox) { @@ -1606,9 +1609,22 @@ sub AddReturn { # FIXME: check issuedate > returndate, factoring in holidays #$circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );; $circControlBranch = _GetCircControlBranch($item,$borrower); + my $datedue = $issue->{date_due}; + $issue->{'overdue'} = DateTime->compare($issue->{'date_due'}, $today ) == -1 ? 1 : 0; } if ($borrowernumber) { + if($issue->{'overdue'}){ + my ( $amount, $type, $daycounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today ); + my $type ||= q{}; + 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. } diff --git a/C4/Overdues.pm b/C4/Overdues.pm index 23e75f5653..c7430c99a7 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -255,7 +255,8 @@ sub CalcFine { my ( $item, $bortype, $branchcode, $due_dt, $end_date ) = @_; my $start_date = $due_dt->clone(); # get issuingrules (fines part will be used) - my $data = C4::Circulation::GetIssuingRule($bortype, $item->{itemtype}, $branchcode); + my $itemtype = $item->{itemtype} || $item->{itype}; + my $data = C4::Circulation::GetIssuingRule($bortype, $itemtype, $branchcode); my $fine_unit = $data->{lengthunit}; $fine_unit ||= 'days'; @@ -300,6 +301,9 @@ sub _get_chargeable_units { } else { $charge_duration = $dt2->delta_ms( $dt1 ); } + if($charge_duration->in_units('hours') == 0 && $charge_duration->in_units('seconds') > 0){ + return 1; + } return $charge_duration->in_units('hours'); } else { # days -- 2.39.5