Attachment 108241 Details for Bug 25261 – Bug 25261: (QA follow-up) Catch check in SIP Checkin

[patch] Bug 25261: (QA follow-up) Catch check in SIP Checkin

Bug-25261-QA-follow-up-Catch-check-in-SIP-Checkin.patch (text/plain), 2.22 KB, created by Martin Renvoize (ashimema) on 2020-08-14 06:16:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-14 06:16:18 UTC

Size: 2.22 KB

patch

obsolete

>From d9536966c10f36f0a0b74ce4850d6ae0628723fb Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 13 Aug 2020 16:44:28 +0100
>Subject: [PATCH] Bug 25261: (QA follow-up) Catch check in SIP Checkin
>
>Test plan
>1/ Enable the feature as per previous patches
>2/ Attempt to return an item with materials attached via a SIP unit
>3/ Note that the return is blocked with an alert type of '99'
>4/ Signoff
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/SIP/ILS/Transaction/Checkin.pm | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
>diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm
>index 10cd87b5ad..ee5144a96d 100644
>--- a/C4/SIP/ILS/Transaction/Checkin.pm
>+++ b/C4/SIP/ILS/Transaction/Checkin.pm
>@@ -16,6 +16,7 @@ use C4::Debug;
> use C4::Items qw( ModItemTransfer );
> use C4::Reserves qw( ModReserveAffect );
> use Koha::DateUtils qw( dt_from_string );
>+use Koha::Items;
> 
> use parent qw(C4::SIP::ILS::Transaction);
> 
>@@ -71,8 +72,21 @@ sub do_checkin {
>         $return_date = dt_from_string($return_date);
>     }
> 
>+    my ( $return, $messages, $issue, $borrower );
>+    my $item = Koha::Items->find( { barcode => $barcode } );
>+    my $human_required = 0;
>+    if (   C4::Context->preference("CircConfirmItemParts")
>+        && defined($item)
>+        && $item->materials )
>+    {
>+        $human_required                   = 1;
>+        $messages->{additional_materials} = 1;
>+    }
>+
>     $debug and warn "do_checkin() calling AddReturn($barcode, $branch)";
>-    my ($return, $messages, $issue, $borrower) = AddReturn($barcode, $branch, undef, $return_date);
>+    ( $return, $messages, $issue, $borrower ) =
>+      AddReturn( $barcode, $branch, undef, $return_date )
>+      unless $human_required;
> 
>     if ( $checked_in_ok ) {
>         delete $messages->{ItemLocationUpdated};
>@@ -84,6 +98,9 @@ sub do_checkin {
>     # biblionumber, biblioitemnumber, itemnumber
>     # borrowernumber, reservedate, branchcode
>     # cancellationdate, found, reservenotes, priority, timestamp
>+    if ($messages->{additional_materials}) {
>+        $self->alert_type('99');
>+    }
>     if( $messages->{DataCorrupted} ) {
>         $self->alert_type('98');
>     }
>-- 
>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