From 0152012be1300386b65a25771c450cd1e8bde5bf Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 5 May 2025 22:16:02 +0000 Subject: [PATCH] Bug 31698: Disallow moving waiting or intransit holds Signed-off-by: kristi --- Koha/Hold.pm | 10 +++++++ .../prog/en/includes/holds_table.inc | 2 ++ .../prog/en/modules/reserve/request.tt | 13 +++++--- t/db_dependent/Koha/Hold.t | 30 +++++++++++++++++-- 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Koha/Hold.pm b/Koha/Hold.pm index 0d7c5a4041..62571eee28 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -190,6 +190,16 @@ sub move_hold { my $original = $self; my $original_biblionumber = $self->biblionumber; + my $found = $original->found // ''; + + if ( $found eq 'W' ) { + return { success => 0, error => 'Cannot move a waiting hold' }; + } + + if ( $found eq 'T' ) { + return { success => 0, error => 'Cannot move a hold in transit' }; + } + my $patron = Koha::Patrons->find( { borrowernumber => $self->borrowernumber } ); return { success => 0, error => 'Missing patron or target' } unless $patron; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index bb88e686d7..1515ea767c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -54,6 +54,8 @@ data-item_level_hold="[% hold.item_level_hold | html %]" data-itemnumber="[% hold.itemnumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" + data-waiting="[% hold.atdestination | html %]" + data-intransit="[% hold.intransit | html %]" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 6791b490b6..64afd7e131 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -2116,9 +2116,11 @@ let reserve_biblionumber = $(this).data('biblionumber'); let reserve_itemnumber = $(this).data('itemnumber'); let item_level_hold = $(this).data('item_level_hold'); - let error_message = $(this).data('item_level_hold') ? "" : _("Cannot move a waiting or record level hold"); + let item_waiting = $(this).data('waiting'); + let item_intransit = $(this).data('intransit'); + let error_message = $(this).data('item_level_hold') ? "" : _("Cannot move a waiting, in transit, or record level hold"); let found_status = $(this).data('found'); - if ( item_level_hold ) { + if ( item_level_hold && ( !item_waiting || !item_intransit ) ) { $('#move_hold_item_selection table').append(`${reserve_id}Biblionumber: ${reserve_biblionumber} Itemnumber: ${reserve_itemnumber}${error_message}`) } else { $('#move_hold_item_selection table').append(`${reserve_id}Biblionumber: ${reserve_biblionumber} Itemnumber: ${reserve_itemnumber}${error_message}`) @@ -2139,9 +2141,12 @@ let reserve_biblionumber = $(this).data('biblionumber'); let reserve_itemnumber = $(this).data('itemnumber'); let item_level_hold = $(this).data('item_level_hold'); - let error_message = $(this).data('item_level_hold') ? _("Cannot move a waiting or item level hold") : ""; + let item_status = $(this).data('status'); + let item_waiting = $(this).data('waiting'); + let item_intransit = $(this).data('intransit'); + let error_message = $(this).data('item_level_hold') ? _("Cannot move a waiting, in transit, or item level hold") : ""; let found_status = $(this).data('found'); - if ( !item_level_hold ) { + if ( !item_level_hold && ( !item_waiting || !item_intransit ) ) { $('#move_hold_biblio_selection table').append(`${reserve_id}Biblionumber: ${reserve_biblionumber}${error_message}`) } else { $('#move_hold_biblio_selection table').append(`${reserve_id}Biblionumber: ${reserve_biblionumber}${error_message}`) diff --git a/t/db_dependent/Koha/Hold.t b/t/db_dependent/Koha/Hold.t index 610691e692..51934fbcc1 100755 --- a/t/db_dependent/Koha/Hold.t +++ b/t/db_dependent/Koha/Hold.t @@ -1163,7 +1163,7 @@ subtest 'change_type() tests' => sub { }; subtest 'move_hold() tests' => sub { - plan tests => 11; + plan tests => 13; $schema->storage->txn_begin; my $patron = Koha::Patron->new( @@ -1306,7 +1306,33 @@ subtest 'move_hold() tests' => sub { is( $logs_2->count, 1, 'Hold modification was logged' ); #disable HoldsLog - t::lib::Mocks::mock_preference( 'HoldsLog', 1 ); + t::lib::Mocks::mock_preference( 'HoldsLog', 0 ); + + my $hold_6 = Koha::Hold->new( + { + borrowernumber => $patron_4->borrowernumber, + biblionumber => $biblio4->biblionumber, + itemnumber => $item_4->itemnumber, + branchcode => 'CPL', + found => 'W', + } + )->store; + + my $result_4 = $hold_6->move_hold( { new_biblionumber => $biblio1->biblionumber } ); + is( $result_4->{error}, 'Cannot move a waiting hold', 'Correct error for waiting hold' ); + + my $hold_7 = Koha::Hold->new( + { + borrowernumber => $patron_4->borrowernumber, + biblionumber => $biblio4->biblionumber, + itemnumber => $item_4->itemnumber, + branchcode => 'CPL', + found => 'T', + } + )->store; + + my $result_5 = $hold_7->move_hold( { new_biblionumber => $biblio1->biblionumber } ); + is( $result_5->{error}, 'Cannot move a hold in transit', 'Correct error for hold instransit' ); $schema->storage->txn_rollback; }; -- 2.39.5