gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 31698: Disallow moving waiting or intransit holds 

Signed-off-by: kristi <kkrueger@cuyahogalibrary.org>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Lucas Gass 2025-05-05 22:16:02 +00:00
parent cae2f9c68c
commit a16f1d4032
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
4 changed files with 109 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Koha/Hold.pm
View File

@ -179,6 +179,77 @@ sub delete {
return $deleted;
}
=head3 move_hold
$hold->move_hold();
=cut
sub move_hold {
my ( $self, $args ) = @_;
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;
my ( $new_biblionumber, $new_itemnumber, $item, $canReserve );
if ( $args->{new_itemnumber} ) {
$item = Koha::Items->find( { itemnumber => $args->{new_itemnumber} } )
or return { success => 0, error => 'Target item not found' };
$new_itemnumber = $item->itemnumber;
$new_biblionumber = $item->biblionumber;
$canReserve = C4::Reserves::CanItemBeReserved( $patron, $item, $self->branchcode, { ignore_hold_counts => 1 } );
} elsif ( $args->{new_biblionumber} ) {
$new_biblionumber = $args->{new_biblionumber};
$canReserve = C4::Reserves::CanBookBeReserved(
$patron->borrowernumber, $new_biblionumber, $self->branchcode,
{ ignore_hold_counts => 1 }
);
} else {
return { success => 0, error => 'Missing itemnumber or biblionumber' };
}
return { success => 0, error => $canReserve->{status} }
unless $canReserve->{status} eq 'OK';
my $max = Koha::Holds->search(
{ biblionumber => $new_biblionumber },
{ order_by => { -desc => 'priority' }, rows => 1 }
)->next;
my $base_priority = $max ? $max->priority : 0;
my $priority = $base_priority + 1;
my $new_priority = C4::Reserves::_ShiftPriority( $new_biblionumber, $priority );
$self->update(
{
itemnumber => $new_itemnumber, # undef for biblio-level is fine
biblionumber => $new_biblionumber,
priority => $new_priority,
}
);
C4::Log::logaction( 'HOLDS', 'MODIFY', $self->reserve_id, $self, undef, $original )
if C4::Context->preference('HoldsLog');
return { success => 1, hold => $self };
}
=head3 set_transfer
=cut

2
koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
View File

@ -46,7 +46,7 @@
[%- END -%]
[% SET tr_class = hold.suspend ? 'suspend' : '' %]
<tr class="[% tr_class | html %]">
<td><input type="checkbox" class="select_hold" data-id="[% hold.reserve_id | html %]" /></td>
<td><input type="checkbox" class="select_hold" data-id="[% hold.reserve_id | html %]" 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 %]"/></td>
<td style="min-width:185px;" data-order="[% priority | html %]">
<div>
<input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />

13
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View File

@ -2019,9 +2019,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(`<tr><td><input type="checkbox" name="move_hold_id" value="${reserve_id}" checked /></td><td>${reserve_id}</td><td>Biblionumber: <a target="_blank" href="/cgi-bin/koha/reserve/request.pl?biblionumber=${reserve_biblionumber}">${reserve_biblionumber}</a> Itemnumber: <a target="_blank" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=${reserve_biblionumber}#item${reserve_itemnumber}">${reserve_itemnumber}</a></td><td>${error_message}</td></tr>`)
} else {
$('#move_hold_item_selection table').append(`<tr><td><input type="checkbox" name="move_hold_id" value="${reserve_id}" disabled /></td><td>${reserve_id}</td><td>Biblionumber: <a target="_blank" href="/cgi-bin/koha/reserve/request.pl?biblionumber=${reserve_biblionumber}">${reserve_biblionumber}</a> Itemnumber: <a target="_blank" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=${reserve_biblionumber}#item${reserve_itemnumber}">${reserve_itemnumber}</a></td><td>${error_message}</td></tr>`)
@ -2042,9 +2044,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(`<tr><td><input type="checkbox" name="move_hold_id" value="${reserve_id}" checked /><td>${reserve_id}</td><td>Biblionumber: <a target="_blank" href="/cgi-bin/koha/reserve/request.pl?biblionumber=${reserve_biblionumber}">${reserve_biblionumber}</a></td><td>${error_message}</td></tr>`)
} else {
$('#move_hold_biblio_selection table').append(`<tr><td><input type="checkbox" name="move_hold_id" value="${reserve_id}" disabled /><td>${reserve_id}</td><td>Biblionumber: <a target="_blank" href="/cgi-bin/koha/reserve/request.pl?biblionumber=${reserve_biblionumber}">${reserve_biblionumber}</a></td><td>${error_message}</td></tr>`)

30
t/db_dependent/Koha/Hold.t
View File

@ -1674,7 +1674,7 @@ subtest 'revert_found() tests' => sub {
};
};
subtest 'move_hold() tests' => sub {
plan tests => 11;
plan tests => 13;
$schema->storage->txn_begin;
my $patron = Koha::Patron->new(
@ -1817,7 +1817,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;
};