Attachment 20581 Details for Bug 8231 – [SIGNED-OFF] Bug 8231 Systematic warning at check in if borrower is restricted

[patch] [SIGNED-OFF] Bug 8231 Systematic warning at check in if borrower is restricted

SIGNED-OFF-Bug-8231-Systematic-warning-at-check-in.patch (text/plain), 5.03 KB, created by Owen Leonard on 2013-08-23 14:04:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2013-08-23 14:04:25 UTC

Size: 5.03 KB

patch

obsolete

>From 17f9f5f90d46cb5d94585d1ee35be860c6c42b7e Mon Sep 17 00:00:00 2001
>From: Lyon3 Team <koha@univ-lyon3.fr>
>Date: Tue, 23 Apr 2013 07:17:57 -0400
>Subject: [PATCH] [SIGNED-OFF] Bug 8231 Systematic warning at check in if
> borrower is restricted
>Content-Type: text/plain; charset="utf-8"
>
>Display, at check in, a reminder of an already existing suspension date
>even if the returned document is not late
>
>Test plan :
>1) Apply the patch
>2) Go to a borrower checkout page and checkout some documents with
> different passed duedate using "Specify due date" function. Checkout
> out one with the default duedate.
>3) Check in the document with the bigger delay :
> You will get the message : 'X is now restricted until ...'
>4) Check in one of the document with a smaller delay :
> You'll get a different message : 'Reminder : Patron was earlier
> restricted until...'
>5) Check in the document which is not late :
> You'll get the same message as the previous one
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> 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 2c568b4b..bfaf73d 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1873,11 +1873,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'};
>+ }
> }
> }
> 
>@@ -2054,12 +2064,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 775454f..8b1841c 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 ) %]
> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] 
> [% END %]
>+ [% IF ( errmsgloo.prevdebarred ) %]
>+ Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]
>+ [% END %]
> [% END %]
> [% IF ( soundon ) %]
> <audio src="[% interface %]/[% theme %]/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 8231: 10206 | 10584 | 10585 | 10586 | 15332 | 16263 | 17273 | 18077 | 20581 | 21080 | 22883 | 24220 | 24230 | 24273