From ccc59d57832b6c0f121863257b1d6dae66b3b23a Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Fri, 3 Jun 2022 06:33:25 -0400 Subject: [PATCH] Bug 24860: Add ability to select an item group when placing a hold Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Rebecca Coert --- C4/Reserves.pm | 1 + Koha/Hold.pm | 14 ++++ Koha/Holds.pm | 3 + .../prog/en/includes/holds_table.inc | 2 + .../prog/en/modules/reserve/request.tt | 80 ++++++++++++++++++- reserve/placerequest.pl | 2 + reserve/request.pl | 4 + t/db_dependent/Koha/Holds.t | 29 ++++++- 8 files changed, 130 insertions(+), 5 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 936d158ea3..4704616ea7 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -163,6 +163,7 @@ BEGIN { itemnumber => $itemnumber, found => $found, itemtype => $itemtype, + item_gorup_id => $item_group_id } ); diff --git a/Koha/Hold.pm b/Koha/Hold.pm index be5970cbd4..fd1fbfc5cc 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -471,6 +471,20 @@ sub item { return $self->{_item}; } +=head3 item_group + +Returns the related Koha::Biblio::ItemGroup object for this Hold + +=cut + +sub item_group { + my ($self) = @_; + + my $item_group_rs = $self->_result->item_group; + return unless $item_group_rs; + return Koha::Biblio::ItemGroup->_new_from_dbic($item_group_rs); +} + =head3 branch Returns the related Koha::Library object for this Hold diff --git a/Koha/Holds.pm b/Koha/Holds.pm index 2a117f5f66..c2be7cb5e2 100644 --- a/Koha/Holds.pm +++ b/Koha/Holds.pm @@ -85,6 +85,9 @@ sub forced_hold_level { my $item_level_count = $self->search( { itemnumber => { '!=' => undef } } )->count(); return 'item' if $item_level_count > 0; + my $item_group_level_count = $self->search( { item_group_id => { '!=' => undef } } )->count(); + return 'item_group' if $item_group_level_count > 0; + my $record_level_count = $self->search( { itemnumber => undef } )->count(); return 'record' if $record_level_count > 0; 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 2c1fd418dd..769011c801 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -171,6 +171,8 @@ [%- ELSE -%] [%- IF hold.itemtype -%] Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item + [%- ELSIF hold.object.item_group -%] + Next available item from group [% hold.object.item_group.description | html %] [%- ELSE -%] Next available [%- END -%] 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 396afc7964..805a11fef3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -533,7 +533,7 @@ [% UNLESS ( multi_hold ) %]
  • - [% IF force_hold_level == 'item' %] + [% IF force_hold_level == 'item' || force_hold_level == 'item_group' %] [% ELSIF force_hold_level == 'record' %] @@ -592,6 +592,52 @@ [% END %] + + [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %] +

    + Hold next available item from an item group + [% IF force_hold_level == 'item_group' %] + (Required) + [% END %] +

    + + [% IF force_hold_level == 'record' # Patron has placed a record level hold previously for this record %] + + + Hold must be record level + + [% ELSIF force_hold_level == 'item' # Patron has placed an item level hold previously for this record %] + + + Hold must be item level + + [% ELSE %] + + + + + + + + + [% FOREACH g IN biblio.object.item_groups.search({}, { order_by => ['display_order'] }) %] + [% IF g.items %] + + + + + [% END %] + [% END %] + +
    HoldItem group
    + + + +
    + [% END %] + [% END %] + +

    Place a hold on a specific item [% IF force_hold_level == 'item' %] @@ -608,6 +654,9 @@ Item type [% END %] Barcode + [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %] + Item group + [% END %] Home library Last location [% IF itemdata_ccode %] @@ -632,6 +681,11 @@ Hold must be record level + [% ELSIF force_hold_level == 'item_group' %] + + + Hold must be item group level + [% ELSIF ( itemloo.available ) %] [% ELSIF ( itemloo.override ) %] @@ -701,6 +755,11 @@ [% itemloo.barcode | html %] + [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %] + + [% itemloo.object.item_group.description | html %] + + [% END %] [% Branches.GetName( itemloo.homebranch ) | html %] @@ -1268,6 +1327,8 @@ }; if($('input[name="checkitem"]:checked').length) data.item_id = $('input[name="checkitem"]:checked').val(); + if($('input[name="item_group_id"]:checked').length) + data.item_group_id = $('input[name="item_group_id"]:checked').val(); if($('input[name="borrowernumber"]').length) data.patron_id = $('input[name="borrowernumber"]').val(); if($('textarea[name="notes"]').length) @@ -1313,8 +1374,8 @@ }); [% UNLESS ( multi_hold ) %] - $("#hold-request-form").on("submit", function(){ - return check($(this)); + $("#hold-request-form").on("submit", function(e){ + return check(e, $(this)); }); [% ELSE %] $("#hold-request-form").on("submit", function(){ @@ -1358,7 +1419,7 @@ }); }); - function check( table ) { + function check( e, table ) { var msg = ""; @@ -1384,6 +1445,7 @@ $('#hold-request-form').preventDoubleFormSubmit(); return(true); } else { + e.preventDefault(); alert(msg); return(false); } @@ -1565,6 +1627,16 @@ stickyClass: "floating" }); + [% IF Koha.Preference('EnableItemGroupHolds') %] + $(':radio[name="item_group_id"]').change(function(){ + $(':radio[name="checkitem"]').prop('checked', false); + }); + + $(':radio[name="checkitem"]').change(function(){ + $(':radio[name="item_group_id"]').prop('checked', false); + }); + [% END %] + if(!localStorage.selectedHolds || document.referrer.replace(/\?.*/, '') !== document.location.origin+document.location.pathname) { localStorage.selectedHolds = []; } diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl index 4f255fdcc5..37341747c3 100755 --- a/reserve/placerequest.pl +++ b/reserve/placerequest.pl @@ -45,6 +45,7 @@ my $startdate = $input->param('reserve_date') || ''; my @rank = $input->multi_param('rank-request'); my $title = $input->param('title'); my $checkitem = $input->param('checkitem'); +my $item_group_id = $input->param('item_group_id'); my $expirationdate = $input->param('expiration_date'); my $itemtype = $input->param('itemtype') || undef; my $non_priority = $input->param('non_priority'); @@ -139,6 +140,7 @@ if ( $patron ) { found => $found, itemtype => $itemtype, non_priority => $non_priority, + item_group_id => $item_group_id, } ); } diff --git a/reserve/request.pl b/reserve/request.pl index b6bdb0baff..95ac2a8098 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -301,12 +301,15 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) my %biblioloopiter = (); my $biblio = Koha::Biblios->find( $biblionumber ); + unless ($biblio) { $biblioloopiter{noitems} = 1; $template->param('nobiblio' => 1); last; } + $biblioloopiter{object} = $biblio; + if ( $patron ) { { # CanBookBeReserved my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber ); @@ -399,6 +402,7 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) for my $item_object ( @items ) { my $do_check; my $item = $item_object->unblessed; + $item->{object} = $item_object; if ( $patron ) { $do_check = $patron->do_check_for_previous_checkout($item) if $wants_check; if ( $do_check && $wants_check ) { diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t index d9f8b666a7..98ac10a2f6 100755 --- a/t/db_dependent/Koha/Holds.t +++ b/t/db_dependent/Koha/Holds.t @@ -19,12 +19,13 @@ use Modern::Perl; -use Test::More tests => 7; +use Test::More tests => 8; use Test::Warn; use C4::Circulation qw( AddIssue ); use C4::Reserves qw( AddReserve ModReserve ModReserveCancelAll ); use Koha::AuthorisedValueCategory; +use Koha::Biblio::ItemGroups; use Koha::Database; use Koha::DateUtils qw( dt_from_string ); use Koha::Holds; @@ -635,6 +636,32 @@ subtest 'set_waiting+patron_expiration_date' => sub { }; }; +subtest 'Test Koha::Hold::item_group' => sub { + plan tests => 1; + my $library = $builder->build_object( { class => 'Koha::Libraries' } ); + my $patron = $builder->build_object({ class => 'Koha::Patrons' }); + my $item = $builder->build_sample_item; + my $item_group = $builder->build_object( + { + class => 'Koha::Biblio::ItemGroups', + value => { biblionumber => $item->biblionumber } + } + ); + my $reserve_id = AddReserve( + { + branchcode => $library->branchcode, + borrowernumber => $patron->borrowernumber, + biblionumber => $item->biblionumber, + itemnumber => $item->itemnumber, + item_group_id => $item_group->id, + } + ); + + my $hold = Koha::Holds->find($reserve_id); + is( $hold->item_group_id, $item_group->id, + 'Koha::Hold::item_group returns the correct item_group' ); +}; + $schema->storage->txn_rollback; -- 2.30.2