@@ -, +, @@ self check --- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 23 +++++++++++++--------- opac/sco/sco-main.pl | 12 +++++------ 2 files changed, 19 insertions(+), 16 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ a/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 %]
--- a/opac/sco/sco-main.pl +++ a/opac/sco/sco-main.pl @@ -226,14 +226,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("AllowItemsOnHoldCheckoutSCO") + 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; } --