From e429d90fb3065a7c7c4bd6951ffb9d47135aa5ce Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Mon, 5 Oct 2020 12:37:01 +0100
Subject: [PATCH] Bug 24083: (follow-up) Include SelfCheckInModule

As highlighted by Katrin, the selfcheckin module was not aware of this
work. This commits gives it awareness of the too_unseen renew error and
the "seen" argument that can be passed to AddRenewal

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++++
 opac/sco/sco-main.pl                                     | 5 +++--
 2 files changed, 7 insertions(+), 2 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 5f503d1006..f2115e9f7a 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
@@ -133,6 +133,7 @@
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="confirmed" value="1" />
+                                    <input type="hidden" name="seen" value="1" />
                                     <input type="hidden" name="newissues" value="[% newissues | html %]" />
                                     <button type="submit" name="confirm" class="btn btn-primary"><i class="fa fa-refresh" aria-hidden="true"></i> Renew item</button>
                                   </form>
@@ -142,6 +143,7 @@
                                     <input type="hidden" name="patronid" value="[% patronid | html %]" />
                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
                                     <input type="hidden" name="confirmed" value="1" />
+                                    <input type="hidden" name="seen" value="1" />
                                     <input type="hidden" name="newissues" value="[% newissues | html %]" />
                                     <button type="submit" class="btn btn-primary"><i class="fa fa-refresh" aria-hidden="true"></i> Renew item</button>
                                 </form>
@@ -341,6 +343,8 @@
                                                                     <span>This item has been scheduled for automatic renewal and cannot be renewed</span>
                                                                 [% ELSIF ISSUE.renew_error == 'onsite_checkout' %]
                                                                     <span>This is a on-site checkout, it cannot be renewed.</span>
+                                                                [% ELSIF ISSUE.renew_error == 'too_unseen' %]
+                                                                    <span>You have renewed this item the maximum number of consecutive times without it being seen by the library.</span>
                                                                 [% ELSE %]
                                                                     <span>No renewals allowed</span>
                                                                 [% END %]
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 75b64e5a13..fa72f8496c 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -99,13 +99,14 @@ if (defined C4::Context->preference('SCOAllowCheckin')) {
 }
 
 my $issuerid = $loggedinuser;
-my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = (
+my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $seen, $newissues) = (
     $query->param("op")         || '',
     $query->param("patronid")   || '',
     $query->param("patronlogin")|| '',
     $query->param("patronpw")   || '',
     $query->param("barcode")    || '',
     $query->param("confirmed")  || '',
+    $query->param("seen")       || 0,
     $query->param("newissues")  || '',
 );
 
@@ -268,7 +269,7 @@ if ( $patron && ( $op eq 'renew' ) ) {
     my ($status,$renewerror) = CanBookBeRenewed( $borrower->{borrowernumber}, $item->itemnumber );
     if ($status) {
         #warn "renewing";
-        AddRenewal( $borrower->{borrowernumber}, $item->itemnumber );
+        AddRenewal( $borrower->{borrowernumber}, $item->itemnumber, undef, undef, undef, undef, $seen );
         push @newissueslist, $barcode;
         $template->param( renewed => 1 );
     }
-- 
2.39.5