Attachment 109503 Details for Bug 25261 – Bug 25261: (QA follow-up) Add handling to SCI

[patch] Bug 25261: (QA follow-up) Add handling to SCI

Bug-25261-QA-follow-up-Add-handling-to-SCI.patch (text/plain), 2.86 KB, created by Martin Renvoize (ashimema) on 2020-09-02 11:03:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-02 11:03:03 UTC

Size: 2.86 KB

patch

obsolete

>From 3ec9ca722a330f21ccf6f83a2ddee4d95012f3d6 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 13 Aug 2020 17:52:18 +0100
>Subject: [PATCH] Bug 25261: (QA follow-up) Add handling to SCI
>
>Test plan
>1/ Enable the feature as per previous patches
>2/ Attempt to return an item with materials attached via the SCI
>3/ Note that the return is blocked with the message '(The item
>cannot be returned at a self service terminal, please see library
>staff for assistance)'
>4/ Signoff
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../bootstrap/en/modules/sci/sci-main.tt | 2 ++
> opac/sci/sci-main.pl | 17 +++++++++++++++--
> 2 files changed, 17 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>index f7d166e715..e0167f728d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>@@ -14,6 +14,8 @@
> (Item is withdrawn and check-in blocked by policy, please see library staff for assistance)
> [% ELSIF messages.NotIssued %]
> (The book is not currently on loan, please see library staff for assistance)
>+ [% ELSIF messages.additional_materials %]
>+ (The item cannot be returned at a self service terminal, please see library staff for assistance)
> [% ELSE %]
> (There was a problem returning this item, please see library staff for assistance)
> [% END %]
>diff --git a/opac/sci/sci-main.pl b/opac/sci/sci-main.pl
>index 84d2a6cb67..d4c561a1a5 100755
>--- a/opac/sci/sci-main.pl
>+++ b/opac/sci/sci-main.pl
>@@ -22,6 +22,7 @@ use CGI qw ( -utf8 );
> use C4::Auth qw(get_template_and_user checkpw);
> use C4::Circulation;
> use C4::Output;
>+use Koha::Items;
> 
> use List::MoreUtils qw( uniq );
> use Try::Tiny;
>@@ -65,8 +66,20 @@ if ( $op eq 'check_in' ) {
> # Return items
> foreach my $barcode (@barcodes) {
> try {
>- my ( $success, $messages, $checkout, $patron ) =
>- AddReturn( $barcode, $library );
>+ my ( $success, $messages, $checkout, $patron );
>+ my $item = Koha::Items->find( { barcode => $barcode } );
>+ my $human_required = 0;
>+ if ( C4::Context->preference("CircConfirmItemParts")
>+ && defined($item)
>+ && $item->materials )
>+ {
>+ $human_required = 1;
>+ $success = 0;
>+ $messages->{additional_materials} = 1;
>+ }
>+
>+ ( $success, $messages, $checkout, $patron ) =
>+ AddReturn( $barcode, $library ) unless $human_required;
> if ($success) {
> push @success,
> {
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25261: 103856 | 103857 | 104011 | 104012 | 104013 | 104404 | 104405 | 104406 | 104407 | 104408 | 104409 | 104410 | 104411 | 104412 | 104413 | 104414 | 107217 | 107218 | 107219 | 107220 | 107221 | 107222 | 107228 | 107229 | 107230 | 107231 | 107232 | 107233 | 107234 | 107285 | 107331 | 107822 | 107823 | 108196 | 108197 | 108198 | 108199 | 108200 | 108201 | 108202 | 108203 | 108204 | 108205 | 108206 | 108207 | 108208 | 108230 | 108231 | 108232 | 108233 | 108234 | 108235 | 108236 | 108237 | 108238 | 108239 | 108240 | 108241 | 108242 | 109478 | 109479 | 109480 | 109481 | 109482 | 109483 | 109484 | 109485 | 109486 | 109487 | 109488 | 109489 | 109490 | 109491 | 109492 | 109493 | 109494 | 109495 | 109496 | 109497 | 109498 | 109499 | 109500 | 109501 | 109502 | 109503 | 109504 | 109508 | 110038 | 110039 | 110040 | 110041 | 110042 | 110043 | 110044 | 110045 | 110046 | 110047 | 110048 | 110049 | 110050 | 110051 | 110052 | 110133 | 110184 | 110258 | 110259 | 110268 | 110322 | 110323 | 110324 | 110325 | 110326 | 110327 | 110328 | 110329 | 110330 | 110331 | 110332 | 110333 | 110334 | 110335 | 110336 | 110337 | 110338 | 110339 | 110340 | 110341 | 110356 | 110357 | 110358 | 110359 | 110360 | 110361 | 110362 | 110363 | 110364 | 110365 | 110366 | 110367 | 110368 | 110369 | 110370 | 110371 | 110372 | 110373 | 110374 | 110375 | 110915 | 110916 | 110917 | 110918 | 110919 | 110920 | 110921 | 110922 | 110923 | 110924 | 110925 | 110926 | 110927 | 110928 | 110929 | 110930 | 110931 | 110932 | 110933 | 110934 | 111027