From 5f192057b31b055322b0e4d215907fb2773c00d2 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 7 Dec 2021 04:08:18 +0000 Subject: [PATCH] Bug 24194: (follow-up) Throw an error if expiration date used --- C4/ILSDI/Services.pm | 8 ++++++-- C4/Reserves.pm | 6 +++++- Koha/Club/Hold.pm | 6 +++++- Koha/Exceptions/Hold.pm | 4 ++++ Koha/REST/V1/Clubs/Holds.pm | 9 ++++++++- Koha/REST/V1/Holds.pm | 9 ++++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index 0439bcb079..ba3836b200 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -778,8 +778,12 @@ sub HoldTitle { my $resdate = $cgi->param('start_date'); my $expdate; - if ( C4::Context->preference('ReserveExpiration') and $cgi->param('expiry_date') ) { - $expdate = $cgi->param('expiry_date'); + if ( C4::Context->preference('ReserveExpiration') ) { + if ( $cgi->param('expiry_date') ) { + $expdate = $cgi->param('expiry_date'); + } + } else { + return { code => 'expirationDateDisabled' }; } # Add the reserve diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 04bf23e3d2..5cd8424e12 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -185,7 +185,7 @@ sub AddReserve { my $biblionumber = $params->{biblionumber}; my $priority = $params->{priority}; my $resdate = $params->{reservation_date}; - my $patron_expiration_date = C4::Context->preference('ReserveExpiration') ? $params->{expiration_date} : undef; + my $patron_expiration_date = $params->{expiration_date}; my $notes = $params->{notes}; my $title = $params->{title}; my $checkitem = $params->{itemnumber}; @@ -193,6 +193,10 @@ sub AddReserve { my $itemtype = $params->{itemtype}; my $non_priority = $params->{non_priority}; + if ( !C4::Context->preference('ReserveExpiration') and $params->{expiration_date} ) { + Koha::Exceptions::Hold::ExpirationDateDisabled->throw; + } + $resdate ||= dt_from_string; # if we have an item selectionned, and the pickup branch is the same as the holdingbranch diff --git a/Koha/Club/Hold.pm b/Koha/Club/Hold.pm index dbfd500de1..a26b319212 100644 --- a/Koha/Club/Hold.pm +++ b/Koha/Club/Hold.pm @@ -70,6 +70,10 @@ sub add { Koha::Exceptions::ClubHold::NoPatrons->throw() unless scalar @enrollments; + if ( !C4::Context->preference('ReserveExpiration') and $params->{expiration_date} ) { + Koha::Exceptions::Hold::ExpirationDateDisabled->throw; + } + my $biblio = Koha::Biblios->find($params->{biblio_id}); my $club_params = { @@ -125,7 +129,7 @@ sub add { borrowernumber => $patron_id, biblionumber => $params->{biblio_id}, priority => $priority, - expiration_date => C4::Context->preference('ReserveExpiration') ? $params->{expiration_date} : undef, + expiration_date => $params->{expiration_date}, notes => $params->{notes}, title => $biblio->title, itemnumber => $params->{item_id}, diff --git a/Koha/Exceptions/Hold.pm b/Koha/Exceptions/Hold.pm index b09dcd65b5..1ad7bea236 100644 --- a/Koha/Exceptions/Hold.pm +++ b/Koha/Exceptions/Hold.pm @@ -35,6 +35,10 @@ use Exception::Class ( 'Koha::Exceptions::Hold::MissingPickupLocation' => { isa => 'Koha::Exceptions::Hold', description => 'You must supply a pickup location when placing a hold' + }, + 'Koha::Exceptions::Hold::ExpirationDateDisabled' => { + isa => 'Koha::Exceptions::Hold', + description => 'Expiration date not allowed' } ); diff --git a/Koha/REST/V1/Clubs/Holds.pm b/Koha/REST/V1/Clubs/Holds.pm index 386ac71b0f..4d0859275d 100644 --- a/Koha/REST/V1/Clubs/Holds.pm +++ b/Koha/REST/V1/Clubs/Holds.pm @@ -53,7 +53,7 @@ sub add { my $pickup_library_id = $body->{pickup_library_id}; my $item_id = $body->{item_id}; my $item_type = $body->{item_type}; - my $expiration_date = C4::Context->preference('ReserveExpiration') ? $body->{expiration_date} : undef; + my $expiration_date = $body->{expiration_date}; my $notes = $body->{notes}; my $default_patron_home = $body->{default_patron_home}; @@ -102,6 +102,13 @@ sub add { ); } + if ( !C4::Context->preference('ReserveExpiration') and $expiration_date ) { + return $c->render( + status => 400, + openapi => { error => "Expiration date not allowed" } + ); + } + my $club_hold = Koha::Club::Hold::add( { club_id => $club_id, diff --git a/Koha/REST/V1/Holds.pm b/Koha/REST/V1/Holds.pm index b720b59c28..3e961fcdb3 100644 --- a/Koha/REST/V1/Holds.pm +++ b/Koha/REST/V1/Holds.pm @@ -74,7 +74,7 @@ sub add { my $item_id = $body->{item_id}; my $patron_id = $body->{patron_id}; my $item_type = $body->{item_type}; - my $expiration_date = C4::Context->preference('ReserveExpiration') ? $body->{expiration_date} : undef; + my $expiration_date = $body->{expiration_date}; my $notes = $body->{notes}; my $hold_date = $body->{hold_date}; my $non_priority = $body->{non_priority}; @@ -89,6 +89,13 @@ sub add { ); } + if ( !C4::Context->preference('ReserveExpiration') and $expiration_date ) { + return $c->render( + status => 400, + openapi => { error => "Expiration date not allowed" } + ); + } + if ( $item_id and $biblio_id ) { # check they are consistent -- 2.11.0