From 17918e1eff73325cfa5cab63afabd52821048ecb Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 13 Aug 2020 16:27:50 +0100
Subject: [PATCH] Bug 25261: (QA follow-up) Add handling to SCO

Test plan
1/ Enable the feature as per previous patches
2/ Attempt to checkout an item with materials attached via the SCO
3/ Note that the checkut is blocked with the message 'Item must be
issued at a circulation desk'
4/ Signoff

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 ++
 opac/sco/sco-main.pl                                     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 8a05dd4d0b..56922c8428 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
@@ -82,6 +82,8 @@
                                     Your contact information seems to be incomplete.
                                 [% ELSIF ( circ_error_INVALID_DATE ) %]
                                     Due date is not valid.
+                                [% ELSIF ( circ_error_additional_materials ) %]
+                                    Item must be issued at a circulation desk.
                                 [% END %]
                                 Please see a member of the library staff.
                             </p>
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 83a37aca46..a1a460f77c 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -151,7 +151,7 @@ elsif ( $patron && ( $op eq 'checkout' || $op eq 'renew' ) ) {
     );
     my $issue_error;
     if ( $confirm_required = scalar keys %$needconfirm ) {
-        for my $error ( qw( UNKNOWN_BARCODE max_loans_allowed ISSUED_TO_ANOTHER NO_MORE_RENEWALS NOT_FOR_LOAN DEBT WTHDRAWN RESTRICTED RESERVED ITEMNOTSAMEBRANCH EXPIRED DEBARRED CARD_LOST GNA INVALID_DATE UNKNOWN_BARCODE TOO_MANY DEBT_GUARANTEES USERBLOCKEDOVERDUE PATRON_CANT PREVISSUE NOT_FOR_LOAN_FORCING ITEM_LOST) ) {
+        for my $error ( qw( UNKNOWN_BARCODE max_loans_allowed ISSUED_TO_ANOTHER NO_MORE_RENEWALS NOT_FOR_LOAN DEBT WTHDRAWN RESTRICTED RESERVED ITEMNOTSAMEBRANCH EXPIRED DEBARRED CARD_LOST GNA INVALID_DATE UNKNOWN_BARCODE TOO_MANY DEBT_GUARANTEES USERBLOCKEDOVERDUE PATRON_CANT PREVISSUE NOT_FOR_LOAN_FORCING ITEM_LOST additional_materials) ) {
             if ( $needconfirm->{$error} ) {
                 $issue_error = $error;
                 $confirmed = 0;
-- 
2.20.1