From 7b5262f826d73f9fe21df008248dbe95f6397428 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 28 Mar 2017 14:21:29 -0400 Subject: [PATCH] Bug 18251 - (QA Followup) Add 'renew' operation and check renewal vs checkout Signed-off-by: Jonathan Druart --- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 +++--- opac/sco/sco-main.pl | 4 ++-- 2 files changed, 5 insertions(+), 5 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 d7ae78a..b785bb2 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 @@ -114,7 +114,7 @@ [% UNLESS ( renew ) %]
- + @@ -122,7 +122,7 @@
[% ELSE %]
- + @@ -281,7 +281,7 @@ [% IF ISSUE.can_be_renewed %] - + [% UNLESS ( ISSUE.renew ) %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 2edf4a6..0a94d0b 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -139,7 +139,7 @@ elsif ( $op eq "returnbook" && $allowselfcheckreturns ) { my ($doreturn) = AddReturn( $barcode, $branch ); $template->param( returned => $doreturn ); } -elsif ( $borrower and $op eq "checkout" ) { +elsif ( $borrower && ( $op eq 'checkout' || $op eq 'renew' ) ) { my $impossible = {}; my $needconfirm = {}; ( $impossible, $needconfirm ) = CanBookBeIssued( @@ -182,7 +182,7 @@ elsif ( $borrower and $op eq "checkout" ) { barcode => $barcode, ); } - } elsif ( $needconfirm->{RENEW_ISSUE} ) { + } elsif ( $needconfirm->{RENEW_ISSUE} || $op eq 'renew' ) { if ($confirmed) { #warn "renewing"; AddRenewal( $borrower->{borrowernumber}, $item->{itemnumber} ); -- 2.10.2