Attachment 157164 Details for Bug 27249 – Bug 27249: Catch NoOpenDays exception while checking out an item

[patch] Bug 27249: Catch NoOpenDays exception while checking out an item

Bug-27249-Catch-NoOpenDays-exception-while-checkin.patch (text/plain), 3.50 KB, created by Katrin Fischer on 2023-10-14 18:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-10-14 18:57:21 UTC

Size: 3.50 KB

patch

obsolete

>From a2fb0858b9ac725ee522bb80f60cbdfd9973d659 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Thu, 24 Aug 2023 09:27:28 +0200
>Subject: [PATCH] Bug 27249: Catch NoOpenDays exception while checking out an
> item
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> circ/circulation.pl                           | 34 +++++++++++++------
> .../prog/en/modules/circ/circulation.tt       |  4 +++
> 2 files changed, 27 insertions(+), 11 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 99cee0c87b..de416ff7a7 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -29,7 +29,8 @@ use CGI qw ( -utf8 );
> use URI::Escape qw( uri_escape_utf8 );
> use DateTime;
> use DateTime::Duration;
>-use Scalar::Util qw( looks_like_number );
>+use Scalar::Util qw( blessed looks_like_number );
>+use Try::Tiny;
> use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
> use C4::Auth qw( get_session get_template_and_user );
> use C4::Koha;
>@@ -298,16 +299,27 @@ if (@$barcodes) {
>     };
> 
>     # always check for blockers on issuing
>-    my ( $error, $question, $alerts, $messages ) = CanBookBeIssued(
>-        $patron,
>-        $barcode, $datedue,
>-        $inprocess,
>-        undef,
>-        {
>-            onsite_checkout     => $onsite_checkout,
>-            override_high_holds => $override_high_holds || $override_high_holds_tmp || 0,
>+    my ( $error, $question, $alerts, $messages );
>+    try {
>+        ( $error, $question, $alerts, $messages ) = CanBookBeIssued(
>+            $patron,
>+            $barcode, $datedue,
>+            $inprocess,
>+            undef,
>+            {
>+                onsite_checkout     => $onsite_checkout,
>+                override_high_holds => $override_high_holds || $override_high_holds_tmp || 0,
>+            }
>+        );
>+    } catch {
>+        die $_ unless blessed $_ && $_->can('rethrow');
>+
>+        if ($_->isa('Koha::Exceptions::Calendar::NoOpenDays')) {
>+            $error = { NO_OPEN_DAYS => 1 };
>+        } else {
>+            $_->rethrow;
>         }
>-    );
>+    };
> 
>     my $blocker = $invalidduedate ? 1 : 0;
> 
>@@ -354,7 +366,7 @@ if (@$barcodes) {
>     # Only some errors will block when performing forced onsite checkout,
>     # for other cases all errors will block
>     my @blocking_error_codes = ($onsite_checkout and C4::Context->preference("OnSiteCheckoutsForce")) ?
>-        qw( UNKNOWN_BARCODE ) : (keys %$error);
>+        qw( UNKNOWN_BARCODE NO_OPEN_DAYS ) : (keys %$error);
> 
>     foreach my $code ( @blocking_error_codes ) {
>         if ($error->{$code}) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 3388e387a5..c472d66ac4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -517,6 +517,10 @@
>                                 [% IF ( RECALLED_INTRANSIT ) %]
>                                     <li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) | html %].</li>
>                                 [% END %]
>+
>+                                [% IF NO_OPEN_DAYS %]
>+                                    <li>No open days found while calculating the due date. Check the library calendar.</li>
>+                                [% END %]
>                                 </ul>
> 
>                                 [% IF (forceallow) %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 27249: 153585 | 153682 | 154728 | 154920 | 154921 | 156786 | 156787 | 156788 | 157163 | 157164 | 157165 | 157166 | 157167