From d365ea3cbce85908c1bf76d3f90ce0011936e058 Mon Sep 17 00:00:00 2001 From: Lyon3 Team Date: Tue, 23 Apr 2013 07:17:57 -0400 Subject: [PATCH] Bug 8231 Systematic warning at check in if borrower is restricted Display, at check in, a reminder of an already existing suspension date even if the returned document is not late --- C4/Circulation.pm | 23 ++++++++++++++----- circ/returns.pl | 3 ++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 1de40e8..f515f61 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1848,11 +1848,21 @@ sub AddReturn { my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox); defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->{itemnumber}...) failed!"; # zero is OK, check defined - if ( $issue->{overdue} && $issue->{date_due} ) { + if ( $issue->{overdue} && $issue->{date_due} ) { # fix fine days - my $debardate = - _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today ); - $messages->{Debarred} = $debardate if ($debardate); + my ($debardate,$reminder) = _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today ); + if ($reminder){ + $messages->{'PrevDebarred'} = $debardate; + } else { + $messages->{'Debarred'} = $debardate if $debardate; + } + } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) { + my $borrower_debar_dt = dt_from_string( $borrower->{debarred} ); + $borrower_debar_dt->truncate(to => 'day'); + my $today_dt = $today->clone()->truncate(to => 'day'); + if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) { + $messages->{'PrevDebarred'} = $borrower->{'debarred'}; + } } } @@ -2029,12 +2039,13 @@ sub _debar_user_on_return { $dt_today->clone()->add_duration( $deltadays * $finedays ); if ( $borrower->{debarred} ) { my $borrower_debar_dt = dt_from_string( $borrower->{debarred} ); - + $borrower_debar_dt->truncate(to => 'day'); + $new_debar_dt->truncate(to=>'day'); # Update patron only if new date > old if ( DateTime->compare( $borrower_debar_dt, $new_debar_dt ) != -1 ) { - return; + return ($borrower_debar_dt,1); } } diff --git a/circ/returns.pl b/circ/returns.pl index 9472797..22246ec 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -457,6 +457,9 @@ foreach my $code ( keys %$messages ) { $err{debarborrowernumber} = $borrower->{borrowernumber}; $err{debarname} = "$borrower->{firstname} $borrower->{surname}"; } + elsif ( $code eq 'PrevDebarred' ) { + $err{prevdebarred} = $messages->{'PrevDebarred'}; + } else { die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die. # This forces the issue of staying in sync w/ Circulation.pm diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 8923188..35e1b8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -350,6 +350,9 @@ $(document).ready(function () { [% IF ( errmsgloo.debarred ) %]

[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %]) is now debarred until [% errmsgloo.debarred | $KohaDates %]

[% END %] + [% IF ( errmsgloo.prevdebarred ) %] +

Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]

+ [% END %] [% END %] [% IF ( soundon ) %] -- 1.7.2.5