Kyle M Hall
f446b3d03d
Adds the ability to suspend reserves. The new system preference AutoResumeSuspendedHolds enables the ability to set a date for a suspended hold to automatically be resumed. When a hold is suspended, it will continue to increase in priority as the holds above it are fulfilled. If the first holds in line to be filled are suspended, the first non-suspened hold in line will be used when an item can fulfill a hold that has been placed. http://bugs.koha-community.org/show_bug.cgi?id=7641 Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Tested with the preference on and off: 1. placed several holds in the staff client 2. suspended some with a date 3. suspended some without a date 4. triggered hold message by checking in for hold with suspensions 5. the suspended hold was skipped as it should be 6. tested suspending holds in the OPAC w and w/out dates 7. ran the cron to clear suspensions with dates All the above tests worked as expected. Signing off.
368 lines
12 KiB
Perl
Executable file
368 lines
12 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
# parts copyright 2010 BibLibre
|
|
#
|
|
# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
|
|
# Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
|
|
use CGI;
|
|
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Circulation;
|
|
use C4::Reserves;
|
|
use C4::Members;
|
|
use C4::Members::AttributeTypes;
|
|
use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
|
|
use C4::Output;
|
|
use C4::Overdues qw/CheckBorrowerDebarred/;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use C4::Letters;
|
|
use C4::Branch; # GetBranches
|
|
use Koha::DateUtils;
|
|
|
|
use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
|
|
|
|
use Date::Calc qw(
|
|
Today
|
|
Add_Delta_Days
|
|
Date_to_Days
|
|
);
|
|
|
|
my $query = new CGI;
|
|
|
|
BEGIN {
|
|
if (C4::Context->preference('BakerTaylorEnabled')) {
|
|
require C4::External::BakerTaylor;
|
|
import C4::External::BakerTaylor qw(&image_url &link_url);
|
|
}
|
|
}
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-user.tmpl",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrow => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
|
|
my $patronupdate = $query->param('patronupdate');
|
|
my $canrenew = 1;
|
|
|
|
# get borrower information ....
|
|
my ( $borr ) = GetMemberDetails( $borrowernumber );
|
|
|
|
my ( $today_year, $today_month, $today_day) = Today();
|
|
my ($warning_year, $warning_month, $warning_day) = split /-/, $borr->{'dateexpiry'};
|
|
|
|
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
|
|
|
|
my $debar = CheckBorrowerDebarred($borrowernumber);
|
|
my $userdebarred;
|
|
|
|
if ($debar) {
|
|
$userdebarred = 1;
|
|
$template->param( 'userdebarred' => $userdebarred );
|
|
if ( $debar ne "9999-12-31" ) {
|
|
$borr->{'userdebarreddate'} = $debar;
|
|
}
|
|
}
|
|
|
|
if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
|
|
$borr->{'flagged'} = 1;
|
|
$canrenew = 0;
|
|
}
|
|
|
|
if ( $borr->{'amountoutstanding'} > 5 ) {
|
|
$borr->{'amountoverfive'} = 1;
|
|
}
|
|
if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
|
|
$borr->{'amountoverzero'} = 1;
|
|
}
|
|
my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' );
|
|
$no_renewal_amt ||= 0;
|
|
|
|
if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
|
|
$borr->{'flagged'} = 1;
|
|
$canrenew = 0;
|
|
$template->param(
|
|
renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
|
|
);
|
|
}
|
|
|
|
if ( $borr->{'amountoutstanding'} < 0 ) {
|
|
$borr->{'amountlessthanzero'} = 1;
|
|
$borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
|
|
}
|
|
|
|
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
|
|
|
|
my @bordat;
|
|
$bordat[0] = $borr;
|
|
|
|
# Warningdate is the date that the warning starts appearing
|
|
if ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
|
|
Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
|
|
Date_to_Days( $today_year, $today_month, $today_day ) )
|
|
{
|
|
# borrower card soon to expire, warn the borrower
|
|
$borr->{'warndeparture'} = $borr->{dateexpiry};
|
|
if (C4::Context->preference('ReturnBeforeExpiry')){
|
|
$borr->{'returnbeforeexpiry'} = 1;
|
|
}
|
|
}
|
|
|
|
$template->param( BORROWER_INFO => \@bordat,
|
|
borrowernumber => $borrowernumber,
|
|
patron_flagged => $borr->{flagged},
|
|
OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
|
|
surname => $borr->{surname},
|
|
showname => $borr->{showname},
|
|
|
|
);
|
|
|
|
#get issued items ....
|
|
|
|
my $count = 0;
|
|
my $overdues_count = 0;
|
|
my @overdues;
|
|
my @issuedat;
|
|
my $itemtypes = GetItemTypes();
|
|
my $issues = GetPendingIssues($borrowernumber);
|
|
if ($issues){
|
|
foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
|
|
# check for reserves
|
|
my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} );
|
|
if ( $restype ) {
|
|
$issue->{'reserved'} = 1;
|
|
}
|
|
|
|
my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
|
|
my $charges = 0;
|
|
foreach my $ac (@$accts) {
|
|
if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
|
|
$charges += $ac->{'amountoutstanding'}
|
|
if $ac->{'accounttype'} eq 'F';
|
|
$charges += $ac->{'amountoutstanding'}
|
|
if $ac->{'accounttype'} eq 'L';
|
|
}
|
|
}
|
|
$issue->{'charges'} = $charges;
|
|
|
|
# get publictype for icon
|
|
|
|
my $publictype = $issue->{'publictype'};
|
|
$issue->{$publictype} = 1;
|
|
|
|
# check if item is renewable
|
|
my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
|
|
($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
|
|
if($status && C4::Context->preference("OpacRenewalAllowed")){
|
|
$issue->{'status'} = $status;
|
|
}
|
|
$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
|
|
$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
|
|
|
|
if ( $issue->{'overdue'} ) {
|
|
push @overdues, $issue;
|
|
$overdues_count++;
|
|
$issue->{'overdue'} = 1;
|
|
}
|
|
else {
|
|
$issue->{'issued'} = 1;
|
|
}
|
|
# imageurl:
|
|
my $itemtype = $issue->{'itemtype'};
|
|
if ( $itemtype ) {
|
|
$issue->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} );
|
|
$issue->{'description'} = $itemtypes->{$itemtype}->{'description'};
|
|
}
|
|
push @issuedat, $issue;
|
|
$count++;
|
|
|
|
my $isbn = GetNormalizedISBN($issue->{'isbn'});
|
|
$issue->{normalized_isbn} = $isbn;
|
|
|
|
# My Summary HTML
|
|
if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){
|
|
$issue->{author} ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g : $my_summary_html =~ s/{AUTHOR}//g;
|
|
$issue->{title} =~ s/\/+$//; # remove trailing slash
|
|
$issue->{title} =~ s/\s+$//; # remove trailing space
|
|
$issue->{title} ? $my_summary_html =~ s/{TITLE}/$issue->{title}/g : $my_summary_html =~ s/{TITLE}//g;
|
|
$issue->{isbn} ? $my_summary_html =~ s/{ISBN}/$isbn/g : $my_summary_html =~ s/{ISBN}//g;
|
|
$issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g;
|
|
$issue->{MySummaryHTML} = $my_summary_html;
|
|
}
|
|
}
|
|
}
|
|
$template->param( ISSUES => \@issuedat );
|
|
$template->param( issues_count => $count );
|
|
$template->param( canrenew => $canrenew );
|
|
$template->param( OVERDUES => \@overdues );
|
|
$template->param( overdues_count => $overdues_count );
|
|
|
|
my $show_barcode = C4::Members::AttributeTypes::AttributeTypeExists( ATTRIBUTE_SHOW_BARCODE );
|
|
if ($show_barcode) {
|
|
my $patron_show_barcode = GetBorrowerAttributeValue($borrowernumber, ATTRIBUTE_SHOW_BARCODE);
|
|
undef $show_barcode if defined($patron_show_barcode) && !$patron_show_barcode;
|
|
}
|
|
$template->param( show_barcode => 1 ) if $show_barcode;
|
|
|
|
# load the branches
|
|
my $branches = GetBranches();
|
|
my @branch_loop;
|
|
for my $branch_hash ( sort keys %{$branches} ) {
|
|
my $selected;
|
|
if ( C4::Context->preference('SearchMyLibraryFirst') ) {
|
|
$selected =
|
|
( C4::Context->userenv
|
|
&& ( $branch_hash eq C4::Context->userenv->{branch} ) );
|
|
}
|
|
push @branch_loop,
|
|
{ value => "branch: $branch_hash",
|
|
branchname => $branches->{$branch_hash}->{'branchname'},
|
|
selected => $selected,
|
|
};
|
|
}
|
|
$template->param( branchloop => \@branch_loop );
|
|
|
|
# now the reserved items....
|
|
my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
|
|
foreach my $res (@reserves) {
|
|
|
|
if ( $res->{'expirationdate'} eq '0000-00-00' ) {
|
|
$res->{'expirationdate'} = '';
|
|
}
|
|
|
|
my $publictype = $res->{'publictype'};
|
|
$res->{$publictype} = 1;
|
|
$res->{'waiting'} = 1 if $res->{'found'} eq 'W';
|
|
$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
|
|
my $biblioData = GetBiblioData($res->{'biblionumber'});
|
|
$res->{'reserves_title'} = $biblioData->{'title'};
|
|
if ($OPACDisplayRequestPriority) {
|
|
$res->{'priority'} = '' if $res->{'priority'} eq '0';
|
|
}
|
|
$res->{'suspend_until'} = C4::Dates->new( $res->{'suspend_until'}, "iso")->output("syspref") if ( $res->{'suspend_until'} );
|
|
}
|
|
|
|
# use Data::Dumper;
|
|
# warn Dumper(@reserves);
|
|
|
|
$template->param( RESERVES => \@reserves );
|
|
$template->param( reserves_count => $#reserves+1 );
|
|
$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
|
|
|
|
my @waiting;
|
|
my $wcount = 0;
|
|
foreach my $res (@reserves) {
|
|
if ( $res->{'itemnumber'} ) {
|
|
my $item = GetItem( $res->{'itemnumber'});
|
|
$res->{'holdingbranch'} =
|
|
$branches->{ $item->{'holdingbranch'} }->{'branchname'};
|
|
$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
|
|
# get document reserve status
|
|
my $biblioData = GetBiblioData($res->{'biblionumber'});
|
|
$res->{'waiting_title'} = $biblioData->{'title'};
|
|
if ( ( $res->{'found'} eq 'W' ) ) {
|
|
my $item = $res->{'itemnumber'};
|
|
$item = GetBiblioFromItemNumber($item,undef);
|
|
$res->{'wait'}= 1;
|
|
$res->{'holdingbranch'}=$item->{'holdingbranch'};
|
|
$res->{'biblionumber'}=$item->{'biblionumber'};
|
|
$res->{'barcode'} = $item->{'barcode'};
|
|
$res->{'wbrcode'} = $res->{'branchcode'};
|
|
$res->{'itemnumber'} = $res->{'itemnumber'};
|
|
$res->{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
|
|
if($res->{'holdingbranch'} eq $res->{'wbrcode'}){
|
|
$res->{'atdestination'} = 1;
|
|
}
|
|
# set found to 1 if reserve is waiting for patron pickup
|
|
$res->{'found'} = 1 if $res->{'found'} eq 'W';
|
|
} else {
|
|
my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} );
|
|
if ($transfertwhen) {
|
|
$res->{intransit} = 1;
|
|
$res->{datesent} = $transfertwhen;
|
|
$res->{frombranch} = GetBranchName($transfertfrom);
|
|
}
|
|
}
|
|
push @waiting, $res;
|
|
$wcount++;
|
|
}
|
|
# can be cancelled
|
|
#$res->{'cancelable'} = 1 if ($res->{'wait'} && $res->{'atdestination'} && $res->{'found'} ne "1");
|
|
$res->{'cancelable'} = 1 if ($res->{wait} and not $res->{found}) or (not $res->{wait} and not $res->{intransit});
|
|
|
|
}
|
|
|
|
$template->param( WAITING => \@waiting );
|
|
|
|
# current alert subscriptions
|
|
my $alerts = getalert($borrowernumber);
|
|
foreach ( @$alerts ) {
|
|
$_->{ $_->{type} } = 1;
|
|
$_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
|
|
}
|
|
|
|
if (C4::Context->preference('BakerTaylorEnabled')) {
|
|
$template->param(
|
|
BakerTaylorEnabled => 1,
|
|
BakerTaylorImageURL => &image_url(),
|
|
BakerTaylorLinkURL => &link_url(),
|
|
BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
|
|
);
|
|
}
|
|
|
|
if (C4::Context->preference("OPACAmazonCoverImages") or
|
|
C4::Context->preference("GoogleJackets") or
|
|
C4::Context->preference("BakerTaylorEnabled") or
|
|
C4::Context->preference("SyndeticsCoverImages")) {
|
|
$template->param(JacketImages=>1);
|
|
}
|
|
|
|
if ( GetMessagesCount( $borrowernumber, 'B' ) ) {
|
|
$template->param( bor_messages => 1 );
|
|
}
|
|
|
|
if ( $borr->{'opacnote'} ) {
|
|
$template->param(
|
|
bor_messages => 1,
|
|
opacnote => $borr->{'opacnote'},
|
|
);
|
|
}
|
|
|
|
$template->param(
|
|
bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
|
|
waiting_count => $wcount,
|
|
patronupdate => $patronupdate,
|
|
OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
|
|
userview => 1,
|
|
dateformat => C4::Context->preference("dateformat"),
|
|
);
|
|
|
|
$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
|
|
$template->param( AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') );
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
|