From c22f29731ce0b95115039e2195bffe04046b0a08 Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Tue, 3 Sep 2019 11:08:49 +0200 Subject: [PATCH] Bug 23531: fix ILSDI non-implemented but documented parameters test plan : 1/ Submit a hold through ILSDI with start_date and expiry_date parameters 2/ Verify in Koha those parameters are not applied to the newly created reserve. Delete reserve. 3/ Apply patch and repeat 1. 4/ Verify the reserve created by same request as 1 now has both dates applied and visible in Koha. Signed-off-by: Christophe Croullebois --- C4/ILSDI/Services.pm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index 64caa4a6fa..a84419dff1 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -673,9 +673,9 @@ Parameters: IP address where the end user request is being placed - pickup_location (Optional) a branch code indicating the location to which to deliver the item for pickup - - needed_before_date (Optional) - date after which hold request is no longer needed - - pickup_expiry_date (Optional) + - start_date (Optional) + date after which hold request is no longer needed if the document has not been made available + - expiry_date (Optional) date after which item returned to shelf if item is not picked up =cut @@ -728,12 +728,22 @@ sub HoldTitle { return { code => 'libraryNotPickupLocation' } unless $destination->pickup_location; return { code => 'cannotBeTransferred' } unless $biblio->can_be_transferred({ to => $destination }); + my $resdate; + if ( $cgi->param('start_date') ) { + $resdate = $cgi->param('start_date'); + } + + my $expdate; + if ( $cgi->param('expiry_date') ) { + $expdate = $cgi->param('expiry_date'); + } + # Add the reserve # $branch, $borrowernumber, $biblionumber, # $constraint, $bibitems, $priority, $resdate, $expdate, $notes, # $title, $checkitem, $found my $priority= C4::Reserves::CalculatePriority( $biblionumber ); - AddReserve( $branch, $borrowernumber, $biblionumber, undef, $priority, undef, undef, undef, $title, undef, undef ); + AddReserve( $branch, $borrowernumber, $biblionumber, undef, $priority, $resdate, $expdate, undef, $title, undef, undef ); # Hashref building my $out; @@ -761,9 +771,9 @@ Parameters: an itemnumber - pickup_location (Optional) a branch code indicating the location to which to deliver the item for pickup - - needed_before_date (Optional) - date after which hold request is no longer needed - - pickup_expiry_date (Optional) + - start_date (Optional) + date after which hold request is no longer needed if the item has not been made available + - expiry_date (Optional) date after which item returned to shelf if item is not picked up =cut @@ -807,12 +817,22 @@ sub HoldItem { my $canitembereserved = C4::Reserves::CanItemBeReserved( $borrowernumber, $itemnumber, $branch )->{status}; return { code => $canitembereserved } unless $canitembereserved eq 'OK'; + my $resdate; + if ( $cgi->param('start_date') ) { + $resdate = $cgi->param('start_date'); + } + + my $expdate; + if ( $cgi->param('expiry_date') ) { + $expdate = $cgi->param('expiry_date'); + } + # Add the reserve # $branch, $borrowernumber, $biblionumber, # $constraint, $bibitems, $priority, $resdate, $expdate, $notes, # $title, $checkitem, $found my $priority= C4::Reserves::CalculatePriority( $biblionumber ); - AddReserve( $branch, $borrowernumber, $biblionumber, undef, $priority, undef, undef, undef, $title, $itemnumber, undef ); + AddReserve( $branch, $borrowernumber, $biblionumber, undef, $priority, $resdate, $expdate, undef, $title, $itemnumber, undef ); # Hashref building my $out; -- 2.11.0