From 00c8b878a8899939ccbd092631ad284b8a42aa7a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 19 Aug 2016 12:01:32 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 16873: Improve renewal error messages on self check When a patron is not allowed to renew from the self check module, the only message displayed is "No renewals allowed". It would be nicer to let him/her know that the renewal is not allowed because it's a on-site checkout or automatic renewal. To do so we can call CanBookBeRenewed instead of CanBookBeIssued and get the renewal error. Test plan: 0/ Switch off AllowSelfCheckReturns 1/ check out an item and tick "auto renewal" 2/ Go on the self check module => auto renewal message is displayed 3/ check out an item and tick "on-site checkout" 4/ Go on the self check module => on-site checkout message is displayed 5/ check out an item without ticking any checkboxes (regular checkout) Renew it to reach the max renew allowed 6/ Go on the self check module => regular checkout message is displayed 7/ Switch on AllowSelfCheckReturns and repeat previous steps => "Return this item" button is displayed in addition of the renewal error message Signed-off-by: Josef Moravec --- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 23 +++++++++++++--------- opac/sco/sco-main.pl | 12 +++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 3e5d7f4..d97c5f1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -250,15 +250,7 @@
- [% IF ( ISSUE.norenew ) %] - [% IF ( AllowSelfCheckReturns ) %] - - - - [% ELSE %] - No renewals allowed - [% END %] - [% ELSE %] + [% IF ISSUE.can_be_renewed %] [% UNLESS ( ISSUE.renew ) %] @@ -266,6 +258,19 @@ [% ELSE %] [% END %] + [% ELSE %] + [% IF ISSUE.renew_error == 'auto_renew' OR ISSUE.renew_error == 'auto_too_soon' %] + This item has been scheduled for automatic renewal and cannot be renewed + [% ELSIF ISSUE.renew_error == 'onsite_checkout' %] + This is a on-site checkout, it cannot be renewed. + [% ELSE %] + No renewals allowed + [% END %] + [% IF AllowSelfCheckReturns %] + + + + [% END %] [% END %]
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 0a59d3b..f0b91f4 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -227,14 +227,12 @@ if ($borrower->{cardnumber}) { my @issues; my ($issueslist) = GetPendingIssues( $borrower->{'borrowernumber'} ); foreach my $it (@$issueslist) { - my ($renewokay, $renewerror) = CanBookBeIssued( - $borrower, - $it->{'barcode'}, - undef, - 0, - C4::Context->preference("AllowItemsOnHoldCheckout") + my ($can_be_renewed, $renew_error) = CanBookBeRenewed( + $borrower->{borrowernumber}, + $it->{itemnumber}, ); - $it->{'norenew'} = 1 if $renewokay->{'NO_MORE_RENEWALS'}; + $it->{can_be_renewed} = $can_be_renewed; + $it->{renew_error} = $renew_error; $it->{date_due} = $it->{date_due_sql}; push @issues, $it; } -- 2.1.4