87b985528e
When different patrons have item level holds on the same item, Holds to pull shows wrong first patron. Test plan: 1) Place a record-level hold on a biblio with an available item 2) Check the Holds to pull page (circ/pendingreserves.pl) --> The biblio should appear in the list and the patron should appear in the 'First patron' column 3) Place a second record-level hold on the same biblio 4) Go back to the Holds to pull page --> The biblio is still there, but the patron in the 'First patron' column is the second patron 5) Place a third record-level hold on the same biblio 6) Go back to the Holds to pull page --> The biblio is still there, but the patron in the 'First patron' column is the third patron 7) Apply the patch 8) Go back to the Holds to pull page --> The biblio is still there and the patron in the 'First patron' column is the first patron Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
314 lines
11 KiB
Perl
Executable file
314 lines
11 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use constant PULL_INTERVAL => 2;
|
|
use List::MoreUtils qw( uniq );
|
|
use YAML::XS;
|
|
use Encode;
|
|
|
|
use C4::Context;
|
|
use C4::Output qw( output_html_with_http_headers );
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Items;
|
|
use C4::Reserves qw( ModReserveCancelAll );
|
|
use Koha::Biblios;
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
use Koha::Holds;
|
|
use DateTime::Duration;
|
|
|
|
my $input = CGI->new;
|
|
my $startdate = $input->param('from');
|
|
my $enddate = $input->param('to');
|
|
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
|
|
my $op = $input->param('op') || '';
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
my $reserve_id = $input->param('reserve_id');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "circ/pendingreserves.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
flagsrequired => { circulate => "circulate_remaining_permissions" },
|
|
}
|
|
);
|
|
|
|
my @messages;
|
|
if ( $op eq 'cancel_reserve' and $reserve_id ) {
|
|
my $hold = Koha::Holds->find( $reserve_id );
|
|
if ( $hold ) {
|
|
my $cancellation_reason = $input->param('cancellation-reason');
|
|
$hold->cancel({ cancellation_reason => $cancellation_reason });
|
|
push @messages, { type => 'message', code => 'hold_cancelled' };
|
|
}
|
|
} elsif ( $op =~ m|^mark_as_lost| ) {
|
|
my $hold = Koha::Holds->find( $reserve_id );
|
|
die "wrong reserve_id" unless $hold; # This is a bit rude, but we are not supposed to get a wrong reserve_id
|
|
my $item = $hold->item;
|
|
if ( $item and C4::Context->preference('CanMarkHoldsToPullAsLost') =~ m|^allow| ) {
|
|
my $patron = $hold->borrower;
|
|
C4::Circulation::LostItem( $item->itemnumber, "pendingreserves" );
|
|
if ( $op eq 'mark_as_lost_and_notify' and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' ) {
|
|
my $library = $hold->branch;
|
|
my $letter = C4::Letters::GetPreparedLetter(
|
|
module => 'reserves',
|
|
letter_code => 'CANCEL_HOLD_ON_LOST',
|
|
branchcode => $patron->branchcode,
|
|
lang => $patron->lang,
|
|
tables => {
|
|
branches => $library->branchcode,
|
|
borrowers => $patron->borrowernumber,
|
|
items => $item->itemnumber,
|
|
biblio => $hold->biblionumber,
|
|
biblioitems => $hold->biblionumber,
|
|
reserves => $hold->unblessed,
|
|
},
|
|
);
|
|
if ( $letter ) {
|
|
my $from_address = $library->from_email_address;
|
|
|
|
C4::Letters::EnqueueLetter(
|
|
{ letter => $letter,
|
|
borrowernumber => $patron->borrowernumber,
|
|
message_transport_type => 'email',
|
|
from_address => $from_address,
|
|
}
|
|
);
|
|
unless ( $patron->notice_email_address ) {
|
|
push @messages, {type => 'alert', code => 'no_email_address', };
|
|
}
|
|
push @messages, { type => 'message', code => 'letter_enqueued' };
|
|
} else {
|
|
push @messages, { type => 'error', code => 'no_template_notice' };
|
|
}
|
|
}
|
|
$hold->cancel;
|
|
if ( $item->homebranch ne $item->holdingbranch ) {
|
|
C4::Items::ModItemTransfer( $item->itemnumber, $item->holdingbranch, $item->homebranch, 'LostReserve' );
|
|
}
|
|
|
|
if ( my $yaml = C4::Context->preference('UpdateItemWhenLostFromHoldList') ) {
|
|
$yaml = "$yaml\n\n"; # YAML is anal on ending \n. Surplus does not hurt
|
|
my $assignments;
|
|
eval { $assignments = YAML::XS::Load(Encode::encode_utf8($yaml)); };
|
|
if ($@) {
|
|
warn "Unable to parse UpdateItemWhenLostFromHoldList syspref : $@" if $@;
|
|
}
|
|
else {
|
|
eval {
|
|
while ( my ( $f, $v ) = each( %$assignments ) ) {
|
|
$item->$f($v);
|
|
}
|
|
$item->store;
|
|
};
|
|
warn "Unable to modify item itemnumber=" . $item->itemnumber . ": $@" if $@;
|
|
}
|
|
}
|
|
|
|
} elsif ( not $item ) {
|
|
push @messages, { type => 'alert', code => 'hold_placed_at_biblio_level'};
|
|
} # else the url parameters have been modified and the user is not allowed to continue
|
|
}
|
|
|
|
|
|
my $today = dt_from_string;
|
|
|
|
if ( $startdate ) {
|
|
$startdate =~ s/^\s+//;
|
|
$startdate =~ s/\s+$//;
|
|
$startdate = eval{dt_from_string( $startdate )};
|
|
}
|
|
unless ( $startdate ){
|
|
# changed from delivered range of 10 years-yesterday to 2 days ago-today
|
|
# Find two days ago for the default shelf pull start date, unless HoldsToPullStartDate sys pref is set.
|
|
$startdate = $today - DateTime::Duration->new( days => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL );
|
|
}
|
|
|
|
if ( $enddate ) {
|
|
$enddate =~ s/^\s+//;
|
|
$enddate =~ s/\s+$//;
|
|
$enddate = eval{dt_from_string( $enddate )};
|
|
}
|
|
unless ( $enddate ) {
|
|
#similarly: calculate end date with ConfirmFutureHolds (days)
|
|
$enddate = $today + DateTime::Duration->new( days => C4::Context->preference('ConfirmFutureHolds') || 0 );
|
|
}
|
|
|
|
# building query parameters
|
|
my %where = (
|
|
'me.found' => undef,
|
|
'me.priority' => { '!=' => 0 },
|
|
'me.suspend' => 0,
|
|
'itembib.itemlost' => 0,
|
|
'itembib.withdrawn' => 0,
|
|
'itembib.notforloan' => 0,
|
|
'itembib.itemnumber' => { -not_in => \'SELECT itemnumber FROM branchtransfers WHERE datearrived IS NULL AND datecancelled IS NULL' }
|
|
);
|
|
|
|
# date boundaries
|
|
my $dtf = Koha::Database->new->schema->storage->datetime_parser;
|
|
my $startdate_iso = $dtf->format_date($startdate);
|
|
my $enddate_iso = $dtf->format_date($enddate);
|
|
if ( $startdate_iso && $enddate_iso ){
|
|
$where{'me.reservedate'} = [ -and => { '>=', $startdate_iso }, { '<=', $enddate_iso } ];
|
|
} elsif ( $startdate_iso ){
|
|
$where{'me.reservedate'} = { '>=', $startdate_iso };
|
|
} elsif ( $enddate_iso ){
|
|
$where{'me.reservedate'} = { '<=', $enddate_iso };
|
|
}
|
|
|
|
# Bug 21320
|
|
if ( !C4::Context->preference('AllowHoldsOnDamagedItems') ){
|
|
$where{'itembib.damaged'} = 0;
|
|
}
|
|
|
|
if ( C4::Context->preference('IndependentBranches') ){
|
|
$where{'itembib.holdingbranch'} = C4::Context->userenv->{'branch'};
|
|
}
|
|
|
|
# get all distinct unfulfilled reserves
|
|
my $holds = Koha::Holds->search(
|
|
{ %where },
|
|
{ join => 'itembib', distinct => 1, columns => qw[me.biblionumber] }
|
|
);
|
|
|
|
my @biblionumbers = $holds->get_column('biblionumber');
|
|
|
|
my $all_items;
|
|
if ( $holds->count ) {
|
|
foreach my $item ( $holds->get_items_that_can_fill->as_list ) {
|
|
push @{ $all_items->{ $item->biblionumber } }, $item;
|
|
}
|
|
}
|
|
|
|
# patrons count per biblio
|
|
my $patrons_count = {
|
|
map { $_->{biblionumber} => $_->{patrons_count} } @{ Koha::Holds->search(
|
|
{ 'suspend' => 0 },
|
|
{
|
|
select => [ 'biblionumber', { count => { distinct => 'borrowernumber' } } ],
|
|
as => [qw( biblionumber patrons_count )],
|
|
group_by => [qw( biblionumber )]
|
|
},
|
|
)->unblessed
|
|
}
|
|
};
|
|
|
|
my $holds_biblios_map = {
|
|
map { $_->{biblionumber} => $_->{reserve_id} } @{ Koha::Holds->search(
|
|
{%where},
|
|
{
|
|
join => ['itembib', 'biblio'],
|
|
select => ['me.biblionumber', 'me.reserve_id'],
|
|
order_by => { -desc => 'priority' }
|
|
}
|
|
)->unblessed
|
|
}
|
|
};
|
|
|
|
my $all_holds = {
|
|
map { $_->biblionumber => $_ } @{ Koha::Holds->search(
|
|
{ reserve_id => [ values %$holds_biblios_map ]},
|
|
{
|
|
prefetch => [ 'borrowernumber', 'itembib', 'biblio' ],
|
|
}
|
|
)->as_list
|
|
}
|
|
};
|
|
|
|
# make final holds_info array and fill with info
|
|
my @holds_info;
|
|
my $seen = {};
|
|
foreach my $bibnum ( @biblionumbers ){
|
|
# Skip this record if it's already been handled
|
|
next if $seen->{$bibnum};
|
|
$seen->{$bibnum} = 1;
|
|
|
|
my $hold_info;
|
|
my $items = $all_items->{$bibnum};
|
|
my $items_count = defined $items ? scalar @$items : 0;
|
|
my $pull_count = $items_count <= $patrons_count->{$bibnum} ? $items_count : $patrons_count->{$bibnum};
|
|
if ( $pull_count == 0 ) {
|
|
next;
|
|
}
|
|
|
|
# get available item types for each biblio
|
|
my @res_itemtypes;
|
|
if ( C4::Context->preference('item-level_itypes') ){
|
|
@res_itemtypes = uniq map { defined $_->itype ? $_->itype : () } @$items;
|
|
} else {
|
|
@res_itemtypes = Koha::Biblioitems->search(
|
|
{ biblionumber => $bibnum, itemtype => { '!=', undef } },
|
|
{ columns => 'itemtype',
|
|
distinct => 1,
|
|
}
|
|
)->get_column('itemtype');
|
|
}
|
|
$hold_info->{itemtypes} = \@res_itemtypes;
|
|
|
|
# get available values for each biblio
|
|
my $fields = {
|
|
locations => 'location',
|
|
callnumbers => 'itemcallnumber',
|
|
enumchrons => 'enumchron',
|
|
copynumbers => 'copynumber',
|
|
barcodes => 'barcode',
|
|
holdingbranches => 'holdingbranch'
|
|
};
|
|
|
|
while (
|
|
my ( $key, $field ) = each %$fields )
|
|
{
|
|
$hold_info->{$key} =
|
|
[ uniq map { defined $_->$field ? $_->$field : () } @$items ];
|
|
}
|
|
|
|
# items available
|
|
$hold_info->{items_count} = $items_count;
|
|
|
|
# patrons with holds
|
|
$hold_info->{patrons_count} = $patrons_count->{$bibnum};
|
|
|
|
# number of items to pull
|
|
$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;
|
|
|
|
push @holds_info, $hold_info;
|
|
}
|
|
|
|
$template->param(
|
|
todaysdate => $today,
|
|
from => $startdate,
|
|
to => $enddate,
|
|
holds_info => \@holds_info,
|
|
HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
|
|
HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds') || 0,
|
|
messages => \@messages,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|