From 01ec7be1201e3fcb9ad45d0fd22ca221f9a38476 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Tue, 28 Mar 2017 14:21:29 -0400
Subject: [PATCH] Bug 18251: (QA follow-up) Add 'renew' operation and check
renewal vs checkout
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
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 14f543add4..317a8d3683 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
@@ -121,7 +121,7 @@
[% UNLESS ( renew ) %]
<form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
- <input type="hidden" name="op" value="checkout" />
+ <input type="hidden" name="op" value="renew" />
<input type="hidden" name="patronid" value="[% patronid | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]" />
<input type="hidden" name="confirmed" value="1" />
@@ -130,7 +130,7 @@
</form>
[% ELSE %]
<form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
- <input type="hidden" name="op" value="checkout" />
+ <input type="hidden" name="op" value="renew" />
<input type="hidden" name="patronid" value="[% patronid | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]" />
<input type="hidden" name="confirmed" value="1" />
@@ -296,7 +296,7 @@
<input type="hidden" name="barcode" value="[% ISSUE.barcode | html %]" />
<input type="hidden" name="newissues" value="[% newissues | html %]" />
[% IF ISSUE.can_be_renewed %]
- <input type="hidden" name="op" value="checkout" />
+ <input type="hidden" name="op" value="renew" />
<input type="hidden" name="confirmed" value="1" />
[% UNLESS ( ISSUE.renew ) %]
<input type="submit" value="Renew item" name="confirm " class="btn renew" />
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index bbe0e9086a..dcb4c9278b 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -131,7 +131,7 @@ elsif ( $op eq "returnbook" && $allowselfcheckreturns ) {
my ($doreturn) = AddReturn( $barcode, $branch );
$template->param( returned => $doreturn );
}
-elsif ( $patron and $op eq "checkout" ) {
+elsif ( $patron && ( $op eq 'checkout' || $op eq 'renew' ) ) {
my $impossible = {};
my $needconfirm = {};
( $impossible, $needconfirm ) = CanBookBeIssued(
@@ -174,7 +174,7 @@ elsif ( $patron 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.11.0