#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use C4::Members::Messaging;
use C4::Members qw();
use C4::Letters;
-use C4::Branch qw( GetBranchDetail );
-use C4::Dates qw( format_date_in_iso );
use Koha::DateUtils;
use Koha::Calendar;
use Koha::Database;
+use Koha::Hold;
+use Koha::Holds;
+use Koha::Libraries;
use List::MoreUtils qw( firstidx any );
+use Carp;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
The following columns contains important values :
- priority >0 : then the reserve is at 1st stage, and not yet affected to any item.
=0 : then the reserve is being dealed
- - found : NULL : means the patron requested the 1st available, and we haven't choosen the item
+ - found : NULL : means the patron requested the 1st available, and we haven't chosen the item
T(ransit) : the reserve is linked to an item but is in transit to the pickup branch
W(aiting) : the reserve is linked to an item, is at the pickup branch, and is waiting on the hold shelf
F(inished) : the reserve has been completed, and is done
if there is no transfer to do, the reserve waiting
patron can pick it up P =0, F=W, I=filled
if there is a transfer to do, write in branchtransfer P =0, F=T, I=filled
- The pickup library recieve the book, it check in P =0, F=W, I=filled
+ The pickup library receive the book, it check in P =0, F=W, I=filled
The patron borrow the book P =0, F=F, I=filled
==== 2nd use case ====
&GetReservesForBranch
&GetReservesToBranch
&GetReserveCount
- &GetReserveFee
&GetReserveInfo
&GetReserveStatus
&CheckReserves
&CanBookBeReserved
- &CanItemBeReserved
+ &CanItemBeReserved
&CanReserveBeCanceledFromOpac
&CancelReserve
&CancelExpiredReserves
=head2 AddReserve
- AddReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$resdate,$expdate,$notes,$title,$checkitem,$found)
+ AddReserve($branch,$borrowernumber,$biblionumber,$bibitems,$priority,$resdate,$expdate,$notes,$title,$checkitem,$found)
+
+Adds reserve and generates HOLDPLACED message.
+
+The following tables are available witin the HOLDPLACED message:
+
+ branches
+ borrowers
+ biblio
+ biblioitems
+ items
=cut
sub AddReserve {
my (
$branch, $borrowernumber, $biblionumber,
- $constraint, $bibitems, $priority, $resdate, $expdate, $notes,
+ $bibitems, $priority, $resdate, $expdate, $notes,
$title, $checkitem, $found
) = @_;
- my $fee =
- GetReserveFee($borrowernumber, $biblionumber, $constraint,
- $bibitems );
- my $dbh = C4::Context->dbh;
- my $const = lc substr( $constraint, 0, 1 );
- $resdate = format_date_in_iso( $resdate ) if ( $resdate );
- $resdate = C4::Dates->today( 'iso' ) unless ( $resdate );
- if ($expdate) {
- $expdate = format_date_in_iso( $expdate );
- } else {
- undef $expdate; # make reserves.expirationdate default to null rather than '0000-00-00'
+
+ if ( Koha::Holds->search( { borrowernumber => $borrowernumber, biblionumber => $biblionumber } )->count() > 0 ) {
+ carp("AddReserve: borrower $borrowernumber already has a hold for biblionumber $biblionumber");
+ return;
}
- if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
- # Make room in reserves for this before those of a later reserve date
- $priority = _ShiftPriorityByDateAndPriority( $biblionumber, $resdate, $priority );
+
+ my $dbh = C4::Context->dbh;
+
+ $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
+ or output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
+
+ $expdate = output_pref({ str => $expdate, dateonly => 1, dateformat => 'iso' });
+
+ if ( C4::Context->preference('AllowHoldDateInFuture') ) {
+
+ # Make room in reserves for this before those of a later reserve date
+ $priority = _ShiftPriorityByDateAndPriority( $biblionumber, $resdate, $priority );
}
+
my $waitingdate;
# If the reserv had the waiting status, we had the value of the resdate
$waitingdate = $resdate;
}
- #eval {
# updates take place here
- if ( $fee > 0 ) {
- my $nextacctno = &getnextacctno( $borrowernumber );
- my $query = qq{
- INSERT INTO accountlines
- (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
- VALUES
- (?,?,now(),?,?,'Res',?)
- };
- my $usth = $dbh->prepare($query);
- $usth->execute( $borrowernumber, $nextacctno, $fee,
- "Reserve Charge - $title", $fee );
- }
+ my $hold = Koha::Hold->new(
+ {
+ borrowernumber => $borrowernumber,
+ biblionumber => $biblionumber,
+ reservedate => $resdate,
+ branchcode => $branch,
+ priority => $priority,
+ reservenotes => $notes,
+ itemnumber => $checkitem,
+ found => $found,
+ waitingdate => $waitingdate,
+ expirationdate => $expdate
+ }
+ )->store();
+ my $reserve_id = $hold->id();
- #if ($const eq 'a'){
- my $query = qq{
- INSERT INTO reserves
- (borrowernumber,biblionumber,reservedate,branchcode,constrainttype,
- priority,reservenotes,itemnumber,found,waitingdate,expirationdate)
- VALUES
- (?,?,?,?,?,
- ?,?,?,?,?,?)
- };
- my $sth = $dbh->prepare($query);
- $sth->execute(
- $borrowernumber, $biblionumber, $resdate, $branch,
- $const, $priority, $notes, $checkitem,
- $found, $waitingdate, $expdate
- );
- my $reserve_id = $sth->{mysql_insertid};
+ # add a reserve fee if needed
+ my $fee = GetReserveFee( $borrowernumber, $biblionumber );
+ ChargeReserveFee( $borrowernumber, $fee, $title );
+
+ _FixPriority({ biblionumber => $biblionumber});
# Send e-mail to librarian if syspref is active
if(C4::Context->preference("emailLibrarianWhenHoldIsPlaced")){
my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
- my $branch_details = C4::Branch::GetBranchDetail($borrower->{branchcode});
+ my $library = Koha::Libraries->find($borrower->{branchcode})->unblessed;
if ( my $letter = C4::Letters::GetPreparedLetter (
module => 'reserves',
letter_code => 'HOLDPLACED',
branchcode => $branch,
tables => {
- 'branches' => $branch_details,
- 'borrowers' => $borrower,
- 'biblio' => $biblionumber,
- 'items' => $checkitem,
+ 'branches' => $library,
+ 'borrowers' => $borrower,
+ 'biblio' => $biblionumber,
+ 'biblioitems' => $biblionumber,
+ 'items' => $checkitem,
},
) ) {
- my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
+ my $admin_email_address = $library->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
C4::Letters::EnqueueLetter(
{ letter => $letter,
}
}
- #}
- ($const eq "o" || $const eq "e") or return; # FIXME: why not have a useful return value?
- $query = qq{
- INSERT INTO reserveconstraints
- (borrowernumber,biblionumber,reservedate,biblioitemnumber)
- VALUES
- (?,?,?,?)
- };
- $sth = $dbh->prepare($query); # keep prepare outside the loop!
- foreach (@$bibitems) {
- $sth->execute($borrowernumber, $biblionumber, $resdate, $_);
- }
-
return $reserve_id;
}
my ($reserve_id) = @_;
my $dbh = C4::Context->dbh;
+
my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
my $sth = $dbh->prepare( $query );
$sth->execute( $reserve_id );
biblionumber,
borrowernumber,
reservedate,
- constrainttype,
found,
itemnumber,
reservenotes,
my $sth = $dbh->prepare($query);
$sth->execute( @params );
my @results;
- my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
-
- # FIXME - What is this doing? How do constraints work?
- if ($data->{constrainttype} eq 'o') {
- $query = '
- SELECT biblioitemnumber
- FROM reserveconstraints
- WHERE biblionumber = ?
- AND borrowernumber = ?
- AND reservedate = ?
- ';
- my $csth = $dbh->prepare($query);
- $csth->execute($data->{biblionumber}, $data->{borrowernumber}, $data->{reservedate});
- my @bibitemno;
- while ( my $bibitemnos = $csth->fetchrow_array ) {
- push( @bibitemno, $bibitemnos ); # FIXME: inefficient: use fetchall_arrayref
- }
- my $count = scalar @bibitemno;
-
- # if we have two or more different specific itemtypes
- # reserved by same person on same day
- my $bdata;
- if ( $count > 1 ) {
- $bdata = GetBiblioItemData( $bibitemno[$i] ); # FIXME: This doesn't make sense.
- $i++; # $i can increase each pass, but the next @bibitemno might be smaller?
- }
- else {
- # Look up the book we just found.
- $bdata = GetBiblioItemData( $bibitemno[0] );
- }
- # Add the results of this latest search to the current
- # results.
- # FIXME - An 'each' would probably be more efficient.
- foreach my $key ( keys %$bdata ) {
- $data->{$key} = $bdata->{$key};
- }
- }
push @results, $data;
}
return \@results;
my $data = $sth->fetchall_arrayref({});
return @$data;
}
-#-------------------------------------------------------------------------------------
+
=head2 CanBookBeReserved
$canReserve = &CanBookBeReserved($borrowernumber, $biblionumber)
damaged, if the Item is damaged.
cannotReserveFromOtherBranches, if syspref 'canreservefromotherbranches' is OK.
tooManyReserves, if the borrower has exceeded his maximum reserve amount.
+ notReservable, if holds on this item are not allowed
=cut
return 'ageRestricted' if $daysToAgeRestriction && $daysToAgeRestriction > 0;
my $controlbranch = C4::Context->preference('ReservesControlBranch');
- my $itemtypefield = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
# we retrieve user rights on this itemtype and branchcode
my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed
$querycount .= "AND $branchfield = ?";
- $querycount .= " AND $itemtypefield = ?" if ($ruleitemtype ne "*");
+ # If using item-level itypes, fall back to the record
+ # level itemtype if the hold has no associated item
+ $querycount .=
+ C4::Context->preference('item-level_itypes')
+ ? " AND COALESCE( itype, itemtype ) = ?"
+ : " AND itemtype = ?"
+ if ( $ruleitemtype ne "*" );
+
my $sthcount = $dbh->prepare($querycount);
if($ruleitemtype eq "*"){
return 'tooManyReserves';
}
+ my $circ_control_branch = C4::Circulation::_GetCircControlBranch($item,
+ $borrower);
+ my $branchitemrule = C4::Circulation::GetBranchItemRule($circ_control_branch,
+ $item->{itype});
+
+ if ( $branchitemrule->{holdallowed} == 0 ) {
+ return 'notReservable';
+ }
+
+ if ( $branchitemrule->{holdallowed} == 1
+ && $borrower->{branchcode} ne $item->{homebranch} )
+ {
+ return 'cannotReserveFromOtherBranches';
+ }
+
# If reservecount is ok, we check item branch if IndependentBranches is ON
# and canreservefromotherbranches is OFF
if ( C4::Context->preference('IndependentBranches')
}
-#--------------------------------------------------------------------------------
=head2 GetReserveCount
$number = &GetReserveCount($borrowernumber);
($messages,$nextreservinfo)=$GetOtherReserves(itemnumber);
-Check queued list of this document and check if this document must be transfered
+Check queued list of this document and check if this document must be transferred
=cut
return ( $messages, $nextreservinfo );
}
+=head2 ChargeReserveFee
+
+ $fee = ChargeReserveFee( $borrowernumber, $fee, $title );
+
+ Charge the fee for a reserve (if $fee > 0)
+
+=cut
+
+sub ChargeReserveFee {
+ my ( $borrowernumber, $fee, $title ) = @_;
+ return if !$fee || $fee==0; # the last test is needed to include 0.00
+ my $accquery = qq{
+INSERT INTO accountlines ( borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding ) VALUES (?, ?, NOW(), ?, ?, 'Res', ?)
+ };
+ my $dbh = C4::Context->dbh;
+ my $nextacctno = &getnextacctno( $borrowernumber );
+ $dbh->do( $accquery, undef, ( $borrowernumber, $nextacctno, $fee, "Reserve Charge - $title", $fee ) );
+}
+
=head2 GetReserveFee
- $fee = GetReserveFee($borrowernumber,$biblionumber,$constraint,$biblionumber);
+ $fee = GetReserveFee( $borrowernumber, $biblionumber );
-Calculate the fee for a reserve
+ Calculate the fee for a reserve (if applicable).
=cut
sub GetReserveFee {
- my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_;
-
- #check for issues;
- my $dbh = C4::Context->dbh;
- my $const = lc substr( $constraint, 0, 1 );
- my $query = qq{
- SELECT * FROM borrowers
- LEFT JOIN categories ON borrowers.categorycode = categories.categorycode
- WHERE borrowernumber = ?
+ my ( $borrowernumber, $biblionumber ) = @_;
+ my $borquery = qq{
+SELECT reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode = categories.categorycode WHERE borrowernumber = ?
+ };
+ my $issue_qry = qq{
+SELECT COUNT(*) FROM items
+LEFT JOIN issues USING (itemnumber)
+WHERE items.biblionumber=? AND issues.issue_id IS NULL
+ };
+ my $holds_qry = qq{
+SELECT COUNT(*) FROM reserves WHERE biblionumber=? AND borrowernumber<>?
};
- my $sth = $dbh->prepare($query);
- $sth->execute($borrowernumber);
- my $data = $sth->fetchrow_hashref;
- my $fee = $data->{'reservefee'};
- my $cntitems = @- > $bibitems;
-
- if ( $fee > 0 ) {
- # check for items on issue
- # first find biblioitem records
- my @biblioitems;
- my $sth1 = $dbh->prepare(
- "SELECT * FROM biblio LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
- WHERE (biblio.biblionumber = ?)"
- );
- $sth1->execute($biblionumber);
- while ( my $data1 = $sth1->fetchrow_hashref ) {
- if ( $const eq "a" ) {
- push @biblioitems, $data1;
- }
- else {
- my $found = 0;
- my $x = 0;
- while ( $x < $cntitems ) {
- if ( @$bibitems->{'biblioitemnumber'} ==
- $data->{'biblioitemnumber'} )
- {
- $found = 1;
- }
- $x++;
- }
- if ( $const eq 'o' ) {
- if ( $found == 1 ) {
- push @biblioitems, $data1;
- }
- }
- else {
- if ( $found == 0 ) {
- push @biblioitems, $data1;
- }
- }
- }
- }
- my $cntitemsfound = @biblioitems;
- my $issues = 0;
- my $x = 0;
- my $allissued = 1;
- while ( $x < $cntitemsfound ) {
- my $bitdata = $biblioitems[$x];
- my $sth2 = $dbh->prepare(
- "SELECT * FROM items
- WHERE biblioitemnumber = ?"
- );
- $sth2->execute( $bitdata->{'biblioitemnumber'} );
- while ( my $itdata = $sth2->fetchrow_hashref ) {
- my $sth3 = $dbh->prepare(
- "SELECT * FROM issues
- WHERE itemnumber = ?"
- );
- $sth3->execute( $itdata->{'itemnumber'} );
- if ( my $isdata = $sth3->fetchrow_hashref ) {
- }
- else {
- $allissued = 0;
- }
- }
- $x++;
- }
- if ( $allissued == 0 ) {
- my $rsth =
- $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ?");
- $rsth->execute($biblionumber);
- if ( my $rdata = $rsth->fetchrow_hashref ) {
- }
- else {
- $fee = 0;
- }
+ my $dbh = C4::Context->dbh;
+ my ( $fee ) = $dbh->selectrow_array( $borquery, undef, ($borrowernumber) );
+ my $hold_fee_mode = C4::Context->preference('HoldFeeMode') || 'not_always';
+ if( $fee and $fee > 0 and $hold_fee_mode ne 'always' ) {
+ # This is a reconstruction of the old code:
+ # Compare number of items with items issued, and optionally check holds
+ # If not all items are issued and there are no holds: charge no fee
+ # NOTE: Lost, damaged, not-for-loan, etc. are just ignored here
+ my ( $notissued, $reserved );
+ ( $notissued ) = $dbh->selectrow_array( $issue_qry, undef,
+ ( $biblionumber ) );
+ if( $notissued ) {
+ ( $reserved ) = $dbh->selectrow_array( $holds_qry, undef,
+ ( $biblionumber, $borrowernumber ) );
+ $fee = 0 if $reserved == 0;
}
}
return $fee;
# Cancel reserves that have been waiting too long
if ( C4::Context->preference("ExpireReservesMaxPickUpDelay") ) {
my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
- my $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
my $today = dt_from_string();
}
if ( $do_cancel ) {
- if ( $charge ) {
- manualinvoice($res->{'borrowernumber'}, $res->{'itemnumber'}, 'Hold waiting too long', 'F', $charge);
- }
-
- CancelReserve({ reserve_id => $res->{'reserve_id'} });
+ CancelReserve({ reserve_id => $res->{'reserve_id'}, charge_cancel_fee => 1 });
}
}
}
=cut
sub AutoUnsuspendReserves {
+ my $today = dt_from_string();
- my $dbh = C4::Context->dbh;
-
- my $query = "UPDATE reserves SET suspend = 0, suspend_until = NULL WHERE DATE( suspend_until ) < DATE( CURDATE() )";
- my $sth = $dbh->prepare( $query );
- $sth->execute();
+ my @holds = Koha::Holds->search( { suspend_until => { '<' => $today->ymd() } } );
+ map { $_->suspend(0)->suspend_until(undef)->store() } @holds;
}
=head2 CancelReserve
- CancelReserve({ reserve_id => $reserve_id, [ biblionumber => $biblionumber, borrowernumber => $borrrowernumber, itemnumber => $itemnumber ] });
+ CancelReserve({ reserve_id => $reserve_id, [ biblionumber => $biblionumber, borrowernumber => $borrrowernumber, itemnumber => $itemnumber, ] [ charge_cancel_fee => 1 ] });
-Cancels a reserve.
+Cancels a reserve. If C<charge_cancel_fee> is passed and the C<ExpireReservesMaxPickUpDelayCharge> syspref is set, charge that fee to the patron's account.
=cut
my ( $params ) = @_;
my $reserve_id = $params->{'reserve_id'};
- $reserve_id = GetReserveId( $params ) unless ( $reserve_id );
+ # Filter out only the desired keys; this will insert undefined values for elements missing in
+ # \%params, but GetReserveId filters them out anyway.
+ $reserve_id = GetReserveId( { biblionumber => $params->{'biblionumber'}, borrowernumber => $params->{'borrowernumber'}, itemnumber => $params->{'itemnumber'} } ) unless ( $reserve_id );
return unless ( $reserve_id );
# now fix the priority on the others....
_FixPriority({ biblionumber => $reserve->{biblionumber} });
+
+ # and, if desired, charge a cancel fee
+ my $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
+ if ( $charge && $params->{'charge_cancel_fee'} ) {
+ manualinvoice($reserve->{'borrowernumber'}, $reserve->{'itemnumber'}, 'Hold waiting too long', 'F', $charge);
+ }
}
return $reserve;
CancelReserve({ reserve_id => $reserve_id });
}
elsif ($rank =~ /^\d+/ and $rank > 0) {
- my $query = "
- UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, found = NULL, waitingdate = NULL
- WHERE reserve_id = ?
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute( $rank, $branchcode, $itemnumber, $reserve_id );
+ my $hold = Koha::Holds->find($reserve_id);
+
+ $hold->set(
+ {
+ priority => $rank,
+ branchcode => $branchcode,
+ itemnumber => $itemnumber,
+ found => undef,
+ waitingdate => undef
+ }
+ )->store();
if ( defined( $suspend_until ) ) {
if ( $suspend_until ) {
- $suspend_until = C4::Dates->new( $suspend_until )->output("iso");
- $dbh->do("UPDATE reserves SET suspend = 1, suspend_until = ? WHERE reserve_id = ?", undef, ( $suspend_until, $reserve_id ) );
+ $suspend_until = eval { dt_from_string( $suspend_until ) };
+ $hold->suspend_hold( $suspend_until );
} else {
- $dbh->do("UPDATE reserves SET suspend_until = NULL WHERE reserve_id = ?", undef, ( $reserve_id ) );
+ # If the hold is suspended leave the hold suspended, but convert it to an indefinite hold.
+ # If the hold is not suspended, this does nothing.
+ $hold->set( { suspend_until => undef } )->store();
}
}
my $request = GetReserveInfo($reserve_id);
my $already_on_shelf = ($request && $request->{found} eq 'W') ? 1 : 0;
- # If we affect a reserve that has to be transfered, don't set to Waiting
+ # If we affect a reserve that has to be transferred, don't set to Waiting
my $query;
if ($transferToDo) {
$query = "
my $itype;
if (C4::Context->preference('item-level_itypes')) {
- # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+ # We can't trust GetItem to honour the syspref, so safest to do it ourselves
# When GetItem is fixed, we can remove this
$itype = $item->{itype};
}
sub ToggleSuspend {
my ( $reserve_id, $suspend_until ) = @_;
- $suspend_until = output_pref(
- {
- dt => dt_from_string($suspend_until),
- dateformat => 'iso',
- dateonly => 1
- }
- ) if ($suspend_until);
-
- my $do_until = ( $suspend_until ) ? '?' : 'NULL';
-
- my $dbh = C4::Context->dbh;
+ $suspend_until = dt_from_string($suspend_until) if ($suspend_until);
- my $sth = $dbh->prepare(
- "UPDATE reserves SET suspend = NOT suspend,
- suspend_until = CASE WHEN suspend = 0 THEN NULL ELSE $do_until END
- WHERE reserve_id = ?
- ");
+ my $hold = Koha::Holds->find( $reserve_id );
- my @params;
- push( @params, $suspend_until ) if ( $suspend_until );
- push( @params, $reserve_id );
-
- $sth->execute( @params );
+ if ( $hold->is_suspended ) {
+ $hold->resume()
+ } else {
+ $hold->suspend_hold( $suspend_until );
+ }
}
=head2 SuspendAll
my $borrowernumber = $params{'borrowernumber'} || undef;
my $biblionumber = $params{'biblionumber'} || undef;
my $suspend_until = $params{'suspend_until'} || undef;
- my $suspend = defined( $params{'suspend'} ) ? $params{'suspend'} : 1;
+ my $suspend = defined( $params{'suspend'} ) ? $params{'suspend'} : 1;
- $suspend_until = C4::Dates->new( $suspend_until )->output("iso") if ( defined( $suspend_until ) );
+ $suspend_until = eval { dt_from_string($suspend_until) }
+ if ( defined($suspend_until) );
return unless ( $borrowernumber || $biblionumber );
- my ( $query, $sth, $dbh, @query_params );
+ my $params;
+ $params->{found} = undef;
+ $params->{borrowernumber} = $borrowernumber if $borrowernumber;
+ $params->{biblionumber} = $biblionumber if $biblionumber;
- $query = "UPDATE reserves SET suspend = ? ";
- push( @query_params, $suspend );
- if ( !$suspend ) {
- $query .= ", suspend_until = NULL ";
- } elsif ( $suspend_until ) {
- $query .= ", suspend_until = ? ";
- push( @query_params, $suspend_until );
- }
- $query .= " WHERE ";
- if ( $borrowernumber ) {
- $query .= " borrowernumber = ? ";
- push( @query_params, $borrowernumber );
+ my @holds = Koha::Holds->search($params);
+
+ if ($suspend) {
+ map { $_->suspend_hold($suspend_until) } @holds;
}
- $query .= " AND " if ( $borrowernumber && $biblionumber );
- if ( $biblionumber ) {
- $query .= " biblionumber = ? ";
- push( @query_params, $biblionumber );
+ else {
+ map { $_->resume() } @holds;
}
- $query .= " AND found IS NULL ";
-
- $dbh = C4::Context->dbh;
- $sth = $dbh->prepare( $query );
- $sth->execute( @query_params );
}
# get whats left
my $query = "
- SELECT reserve_id, borrowernumber, reservedate, constrainttype
+ SELECT reserve_id, borrowernumber, reservedate
FROM reserves
WHERE biblionumber = ?
AND ((found <> 'W' AND found <> 'T') OR found IS NULL)
@results = &_Findgroupreserve($biblioitemnumber, $biblionumber, $itemnumber, $lookahead, $ignore_borrowers);
-Looks for an item-specific match first, then for a title-level match, returning the
-first match found. If neither, then we look for a 3rd kind of match based on
-reserve constraints.
+Looks for a holds-queue based item-specific match first, then for a holds-queue title-level match, returning the
+first match found. If neither, then we look for non-holds-queue based holds.
Lookahead is the number of days to look in advance.
-TODO: add more explanation about reserve constraints
-
C<&_Findgroupreserve> returns :
C<@results> is an array of references-to-hash whose keys are mostly
fields from the reserves table of the Koha database, plus
my $dbh = C4::Context->dbh;
# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
- # check for exact targetted match
+ # check for exact targeted match
my $item_level_target_query = qq{
SELECT reserves.biblionumber AS biblionumber,
reserves.borrowernumber AS borrowernumber,
}
return @results if @results;
- # check for title-level targetted match
+ # check for title-level targeted match
my $title_level_target_query = qq{
SELECT reserves.biblionumber AS biblionumber,
reserves.borrowernumber AS borrowernumber,
reserves.reservenotes AS reservenotes,
reserves.priority AS priority,
reserves.timestamp AS timestamp,
- reserveconstraints.biblioitemnumber AS biblioitemnumber,
reserves.itemnumber AS itemnumber,
reserves.reserve_id AS reserve_id
FROM reserves
- LEFT JOIN reserveconstraints ON reserves.biblionumber = reserveconstraints.biblionumber
WHERE reserves.biblionumber = ?
- AND ( ( reserveconstraints.biblioitemnumber = ?
- AND reserves.borrowernumber = reserveconstraints.borrowernumber
- AND reserves.reservedate = reserveconstraints.reservedate )
- OR reserves.constrainttype='a' )
AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
AND reserves.reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
AND suspend = 0
ORDER BY priority
};
$sth = $dbh->prepare($query);
- $sth->execute( $biblio, $bibitem, $itemnumber, $lookahead||0);
+ $sth->execute( $biblio, $itemnumber, $lookahead||0);
@results = ();
while ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data )
Sends a notification to the patron that their hold has been filled (through
ModReserveAffect, _not_ ModReserveFill)
+The letter code for this notice may be found using the following query:
+
+ select distinct letter_code
+ from message_transports
+ inner join message_attributes using (message_attribute_id)
+ where message_name = 'Hold_Filled'
+
+This will probably sipmly be 'HOLD', but because it is defined in the database,
+it is subject to addition or change.
+
+The following tables are availalbe witin the notice:
+
+ branches
+ borrowers
+ biblio
+ biblioitems
+ reserves
+ items
+
=cut
sub _koha_notify_reserve {
");
$sth->execute( $borrowernumber, $biblionumber );
my $reserve = $sth->fetchrow_hashref;
- my $branch_details = GetBranchDetail( $reserve->{'branchcode'} );
+ my $library = Koha::Libraries->find( $reserve->{branchcode} )->unblessed;
- my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
+ my $admin_email_address = $library->{branchemail} || C4::Context->preference('KohaAdminEmailAddress');
my %letter_params = (
module => 'reserves',
branchcode => $reserve->{branchcode},
tables => {
- 'branches' => $branch_details,
- 'borrowers' => $borrower,
- 'biblio' => $biblionumber,
- 'reserves' => $reserve,
+ 'branches' => $library,
+ 'borrowers' => $borrower,
+ 'biblio' => $biblionumber,
+ 'biblioitems' => $biblionumber,
+ 'reserves' => $reserve,
'items', $reserve->{'itemnumber'},
},
- substitute => { today => C4::Dates->new()->output() },
+ substitute => { today => output_pref( { dt => dt_from_string, dateonly => 1 } ) },
);
my $notification_sent = 0; #Keeping track if a Hold_filled message is sent. If no message can be sent, then default to a print message.
my $itype;
my $dbh = C4::Context->dbh;
if (C4::Context->preference('item-level_itypes')) {
- # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+ # We can't trust GetItem to honour the syspref, so safest to do it ourselves
# When GetItem is fixed, we can remove this
$itype = $item->{itype};
}
sub MoveReserve {
my ( $itemnumber, $borrowernumber, $cancelreserve ) = @_;
- my ( $restype, $res, $all_reserves ) = CheckReserves( $itemnumber );
+ my $lookahead = C4::Context->preference('ConfirmFutureHolds'); #number of days to look for future holds
+ my ( $restype, $res, $all_reserves ) = CheckReserves( $itemnumber, undef, $lookahead );
return unless $res;
my $biblionumber = $res->{biblionumber};
RevertWaitingStatus({ itemnumber => $itemnumber });
}
elsif ( $cancelreserve eq 'cancel' || $cancelreserve ) { # cancel reserves on this item
- CancelReserve({
- biblionumber => $res->{'biblionumber'},
- itemnumber => $res->{'itemnumber'},
- borrowernumber => $res->{'borrowernumber'}
- });
+ CancelReserve( { reserve_id => $res->{'reserve_id'} } );
}
}
}
);
my $upd_sth = $dbh->prepare(
"UPDATE reserves SET priority = ? WHERE biblionumber = ? AND borrowernumber = ?
- AND reservedate = ? AND constrainttype = ? AND (itemnumber = ? or itemnumber is NULL) "
+ AND reservedate = ? AND (itemnumber = ? or itemnumber is NULL) "
);
$sth->execute( $to_biblio, 'W', 'T' );
my $priority = 1;
$upd_sth->execute(
$priority, $to_biblio,
$reserve->{'borrowernumber'}, $reserve->{'reservedate'},
- $reserve->{'constrainttype'}, $reserve->{'itemnumber'}
+ $reserve->{'itemnumber'}
);
$priority++;
}
ReserveSlip($branchcode, $borrowernumber, $biblionumber)
- Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
+Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
+
+The letter code will be HOLD_SLIP, and the following tables are
+available within the slip:
+
+ reserves
+ branches
+ borrowers
+ biblio
+ biblioitems
+ items
=cut
return C4::Letters::GetPreparedLetter (
module => 'circulation',
- letter_code => 'RESERVESLIP',
+ letter_code => 'HOLD_SLIP',
branchcode => $branch,
tables => {
'reserves' => $reserve,
'branches' => $reserve->{branchcode},
'borrowers' => $reserve->{borrowernumber},
'biblio' => $reserve->{biblionumber},
+ 'biblioitems' => $reserve->{biblionumber},
'items' => $reserve->{itemnumber},
},
);
projects / koha.git / blobdiff