Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 24860: (QA follow-up) Show group holds on Holds to pull

Browse source 
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Kyle Hall 2022-10-21 12:02:08 -04:00 committed by Tomas Cohen Arazi
parent 2685f7992d
commit 6be604c4a6
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
circ/pendingreserves.pl
View file

@ -229,7 +229,7 @@ my $all_holds = {
map { $_->biblionumber => $_ } @{ Koha::Holds->search(
{ reserve_id => [ values %$holds_biblios_map ]},
{
prefetch => [ 'borrowernumber', 'itembib', 'biblio' ],
prefetch => [ 'borrowernumber', 'itembib', 'biblio', 'item_group' ],
}
)->as_list
}
@ -265,6 +265,8 @@ foreach my $bibnum ( @biblionumbers ){
}
$hold_info->{itemtypes} = \@res_itemtypes;
my $res_info = $all_holds->{$bibnum};
# get available values for each biblio
my $fields = {
locations => 'location',
@ -282,6 +284,10 @@ foreach my $bibnum ( @biblionumbers ){
[ uniq map { defined $_->$field ? $_->$field : () } @$items ];
}
if ( $res_info->item_group ) {
$hold_info->{barcodes} = [ uniq map { defined $_->barcode && $_->item_group->id == $res_info->item_group_id ? $_->barcode : () } @$items ];
}
# items available
$hold_info->{items_count} = $items_count;
@ -292,11 +298,11 @@ foreach my $bibnum ( @biblionumbers ){
$hold_info->{pull_count} = $pull_count;
# get other relevant information
my $res_info = $all_holds->{$bibnum};
$hold_info->{patron} = $res_info->patron;
$hold_info->{item} = $res_info->item;
$hold_info->{biblio} = $res_info->biblio;
$hold_info->{hold} = $res_info;
$hold_info->{item_group} = $res_info->item_group;
push @holds_info, $hold_info;
}

12
koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
View file

@ -129,7 +129,17 @@
<td>
[% IF ( hold_info.barcodes.size ) %]
[% SET barcode = hold_info.barcodes.first %]
[% IF ( hold_info.item ) %]<span>Only [% barcode | html %]</span>[% ELSE %]<span>[% barcode | html %] or any available.</span>[% END %]
[% IF ( hold_info.item ) %]
<span>Only [% barcode | html %]</span>
[% ELSE %]
<span>[% barcode | html %] or
[% IF hold_info.item_group %]
any available from item group <em>[% hold_info.item_group.description | html %]</em>.
[% ELSE %]
any available.
[% END %]
</span>
[% END %]
[% END %]
</td>
<td>