@EXPORT = qw(
&AddReserve
- &GetReserve
- &GetReservesForBranch
- &GetReservesToBranch
- &GetReserveCount
&GetReserveStatus
&GetOtherReserves
&CanBookBeReserved
&CanItemBeReserved
&CanReserveBeCanceledFromOpac
- &CancelReserve
&CancelExpiredReserves
&AutoUnsuspendReserves
&IsAvailableForItemLevelRequest
- &OPACItemHoldsAllowed
-
&AlterPriority
&ToggleLowestPriority
return $reserve_id;
}
-=head2 GetReserve
-
- $res = GetReserve( $reserve_id );
-
- Return the current reserve.
-
-=cut
-
-sub GetReserve {
- 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 );
- return $sth->fetchrow_hashref();
-}
-
=head2 CanBookBeReserved
$canReserve = &CanBookBeReserved($borrowernumber, $biblionumber)
my ($reserve_id, $borrowernumber) = @_;
return unless $reserve_id and $borrowernumber;
- my $reserve = GetReserve($reserve_id);
+ my $reserve = Koha::Holds->find($reserve_id);
- return 0 unless $reserve->{borrowernumber} == $borrowernumber;
- return 0 if ( $reserve->{found} eq 'W' ) or ( $reserve->{found} eq 'T' );
+ return 0 unless $reserve->borrowernumber == $borrowernumber;
+ return 0 if ( $reserve->found eq 'W' ) or ( $reserve->found eq 'T' );
return 1;
}
-=head2 GetReserveCount
-
- $number = &GetReserveCount($borrowernumber);
-
-this function returns the number of reservation for a borrower given on input arg.
-
-=cut
-
-sub GetReserveCount {
- my ($borrowernumber) = @_;
-
- my $dbh = C4::Context->dbh;
-
- my $query = "
- SELECT COUNT(*) AS counter
- FROM reserves
- WHERE borrowernumber = ?
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute($borrowernumber);
- my $row = $sth->fetchrow_hashref;
- return $row->{counter};
-}
-
=head2 GetOtherReserves
($messages,$nextreservinfo)=$GetOtherReserves(itemnumber);
return $fee;
}
-=head2 GetReservesToBranch
-
- @transreserv = GetReservesToBranch( $frombranch );
-
-Get reserve list for a given branch
-
-=cut
-
-sub GetReservesToBranch {
- my ( $frombranch ) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare(
- "SELECT reserve_id,borrowernumber,reservedate,itemnumber,timestamp
- FROM reserves
- WHERE priority='0'
- AND branchcode=?"
- );
- $sth->execute( $frombranch );
- my @transreserv;
- my $i = 0;
- while ( my $data = $sth->fetchrow_hashref ) {
- $transreserv[$i] = $data;
- $i++;
- }
- return (@transreserv);
-}
-
-=head2 GetReservesForBranch
-
- @transreserv = GetReservesForBranch($frombranch);
-
-=cut
-
-sub GetReservesForBranch {
- my ($frombranch) = @_;
- my $dbh = C4::Context->dbh;
-
- my $query = "
- SELECT reserve_id,borrowernumber,reservedate,itemnumber,waitingdate, expirationdate
- FROM reserves
- WHERE priority='0'
- AND found='W'
- ";
- $query .= " AND branchcode=? " if ( $frombranch );
- $query .= "ORDER BY waitingdate" ;
-
- my $sth = $dbh->prepare($query);
- if ($frombranch){
- $sth->execute($frombranch);
- } else {
- $sth->execute();
- }
-
- my @transreserv;
- my $i = 0;
- while ( my $data = $sth->fetchrow_hashref ) {
- $transreserv[$i] = $data;
- $i++;
- }
- return (@transreserv);
-}
-
=head2 GetReserveStatus
$reservestatus = GetReserveStatus($itemnumber);
my $priority = 10000000;
foreach my $res (@reserves) {
if ( $res->{'itemnumber'} == $itemnumber && $res->{'priority'} == 0) {
- return ( "Waiting", $res, \@reserves ); # Found it
+ if ($res->{'found'} eq 'W') {
+ return ( "Waiting", $res, \@reserves ); # Found it, it is waiting
+ } else {
+ return ( "Reserved", $res, \@reserves ); # Found determinated hold, e. g. the tranferred one
+ }
} else {
my $patron;
my $iteminfo;
=cut
sub CancelExpiredReserves {
-
my $today = dt_from_string();
my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
+ my $expireWaiting = C4::Context->preference('ExpireReservesMaxPickUpDelay');
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare( "
- SELECT * FROM reserves WHERE DATE(expirationdate) < DATE( CURDATE() )
- AND expirationdate IS NOT NULL
- " );
- $sth->execute();
+ my $dtf = Koha::Database->new->schema->storage->datetime_parser;
+ my $params = { expirationdate => { '<', $dtf->format_date($today) } };
+ $params->{found} = undef unless $expireWaiting;
+
+ # FIXME To move to Koha::Holds->search_expired (?)
+ my $holds = Koha::Holds->search( $params );
- while ( my $res = $sth->fetchrow_hashref() ) {
- my $calendar = Koha::Calendar->new( branchcode => $res->{'branchcode'} );
- my $cancel_params = { reserve_id => $res->{'reserve_id'} };
+ while ( my $hold = $holds->next ) {
+ my $calendar = Koha::Calendar->new( branchcode => $hold->branchcode );
next if !$cancel_on_holidays && $calendar->is_holiday( $today );
- if ( $res->{found} eq 'W' ) {
+ my $cancel_params = {};
+ if ( $hold->found eq 'W' ) {
$cancel_params->{charge_cancel_fee} = 1;
}
-
- CancelReserve($cancel_params);
+ $hold->cancel( $cancel_params );
}
}
map { $_->suspend(0)->suspend_until(undef)->store() } @holds;
}
-=head2 CancelReserve
-
- CancelReserve({ reserve_id => $reserve_id, [ biblionumber => $biblionumber, borrowernumber => $borrrowernumber, itemnumber => $itemnumber, ] [ charge_cancel_fee => 1 ] });
-
-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
-
-sub CancelReserve {
- my ( $params ) = @_;
-
- my $reserve_id = $params->{'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 );
-
- my $dbh = C4::Context->dbh;
-
- my $reserve = GetReserve( $reserve_id );
- if ($reserve) {
-
- my $hold = Koha::Holds->find( $reserve_id );
- logaction( 'HOLDS', 'CANCEL', $hold->reserve_id, Dumper($hold->unblessed) )
- if C4::Context->preference('HoldsLog');
-
- my $query = "
- UPDATE reserves
- SET cancellationdate = now(),
- priority = 0
- WHERE reserve_id = ?
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute( $reserve_id );
-
- $query = "
- INSERT INTO old_reserves
- SELECT * FROM reserves
- WHERE reserve_id = ?
- ";
- $sth = $dbh->prepare($query);
- $sth->execute( $reserve_id );
-
- $query = "
- DELETE FROM reserves
- WHERE reserve_id = ?
- ";
- $sth = $dbh->prepare($query);
- $sth->execute( $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'}, '', 'HE', $charge);
- }
- }
-
- return $reserve;
-}
-
=head2 ModReserve
ModReserve({ rank => $rank,
return if $rank eq "n";
return unless ( $reserve_id || ( $borrowernumber && ( $biblionumber || $itemnumber ) ) );
- $reserve_id = GetReserveId({ biblionumber => $biblionumber, borrowernumber => $borrowernumber, itemnumber => $itemnumber }) unless ( $reserve_id );
+
+ my $hold;
+ unless ( $reserve_id ) {
+ my $holds = Koha::Holds->search({ biblionumber => $biblionumber, borrowernumber => $borrowernumber, itemnumber => $itemnumber });
+ return unless $holds->count; # FIXME Should raise an exception
+ $hold = $holds->next;
+ $reserve_id = $hold->reserve_id;
+ }
+
+ $hold ||= Koha::Holds->find($reserve_id);
if ( $rank eq "del" ) {
- CancelReserve({ reserve_id => $reserve_id });
+ $hold->cancel;
}
elsif ($rank =~ /^\d+/ and $rank > 0) {
- my $hold = Koha::Holds->find($reserve_id);
logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->unblessed) )
if C4::Context->preference('HoldsLog');
}
);
+ # FIXME Must call Koha::Hold->cancel ? => No, should call ->filled and add the correct log
Koha::Old::Hold->new( $hold->unblessed() )->store();
$hold->delete();
my ( $itemnumber, $borrowernumber ) = @_;
#step 1 : cancel the reservation
- my $CancelReserve = CancelReserve({ itemnumber => $itemnumber, borrowernumber => $borrowernumber });
+ my $holds = Koha::Holds->search({ itemnumber => $itemnumber, borrowernumber => $borrowernumber });
+ return unless $holds->count;
+ $holds->next->cancel;
#step 2 launch the subroutine of the others reserves
( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
my $any_available = 0;
foreach my $i (@items) {
+
+ my $circ_control_branch = C4::Circulation::_GetCircControlBranch( $i->unblessed(), $borrower );
+ my $branchitemrule = C4::Circulation::GetBranchItemRule( $circ_control_branch, $i->itype );
+
$any_available = 1
unless $i->itemlost
|| $i->notforloan > 0
|| IsItemOnHoldAndFound( $i->id )
|| ( $i->damaged
&& !C4::Context->preference('AllowHoldsOnDamagedItems') )
- || Koha::ItemTypes->find( $i->effective_itemtype() )->notforloan;
+ || Koha::ItemTypes->find( $i->effective_itemtype() )->notforloan
+ || $branchitemrule->{holdallowed} == 1 && $borrower->{branchcode} ne $i->homebranch;
}
return $any_available ? 0 : 1;
sub AlterPriority {
my ( $where, $reserve_id ) = @_;
- my $reserve = GetReserve( $reserve_id );
+ my $hold = Koha::Holds->find( $reserve_id );
+ return unless $hold;
- if ( $reserve->{cancellationdate} ) {
- warn "I cannot alter the priority for reserve_id $reserve_id, the reserve has been cancelled (".$reserve->{cancellationdate}.')';
+ if ( $hold->cancellationdate ) {
+ warn "I cannot alter the priority for reserve_id $reserve_id, the reserve has been cancelled (" . $hold->cancellationdate . ')';
return;
}
if ( $where eq 'up' || $where eq 'down' ) {
- my $priority = $reserve->{'priority'};
+ my $priority = $hold->priority;
$priority = $where eq 'up' ? $priority - 1 : $priority + 1;
_FixPriority({ reserve_id => $reserve_id, rank => $priority })
_FixPriority({ reserve_id => $reserve_id, rank => '999999' });
}
+ # FIXME Should return the new priority
}
=head2 ToggleLowestPriority
my $dbh = C4::Context->dbh;
- unless ( $biblionumber ) {
- my $res = GetReserve( $reserve_id );
- $biblionumber = $res->{biblionumber};
+ my $hold;
+ if ( $reserve_id ) {
+ $hold = Koha::Holds->find( $reserve_id );
+ return unless $hold;
}
- if ( $rank eq "del" ) {
- CancelReserve({ reserve_id => $reserve_id });
+ unless ( $biblionumber ) { # FIXME This is a very weird API
+ $biblionumber = $hold->biblionumber;
+ }
+
+ if ( $rank eq "del" ) { # FIXME will crash if called without $hold
+ $hold->cancel;
}
elsif ( $rank eq "W" || $rank eq "0" ) {
my $patron = Koha::Patrons->find( $borrowernumber );
# Try to get the borrower's email address
- my $to_address = C4::Members::GetNoticeEmailAddress($borrowernumber);
+ my $to_address = $patron->notice_email_address;
my $messagingprefs = C4::Members::Messaging::GetMessagingPreferences( {
borrowernumber => $borrowernumber,
return $new_priority; # so the caller knows what priority they wind up receiving
}
-=head2 OPACItemHoldsAllowed
-
- OPACItemHoldsAllowed($item_record,$borrower_record);
-
-Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see
-if specific item holds are allowed, returns true if so.
-
-=cut
-
-sub OPACItemHoldsAllowed {
- my ($item,$borrower) = @_;
-
- my $branchcode = $item->{homebranch} or die "No homebranch";
- my $itype;
- my $dbh = C4::Context->dbh;
- if (C4::Context->preference('item-level_itypes')) {
- # 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};
- }
- else {
- my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
- my $sth = $dbh->prepare($query);
- $sth->execute($item->{biblioitemnumber});
- if (my $data = $sth->fetchrow_hashref()){
- $itype = $data->{itemtype};
- }
- }
-
- my $query = "SELECT opacitemholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
- (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
- AND
- (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
- AND
- (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
- ORDER BY
- issuingrules.categorycode desc,
- issuingrules.itemtype desc,
- issuingrules.branchcode desc
- LIMIT 1";
- my $sth = $dbh->prepare($query);
- $sth->execute($borrower->{categorycode},$itype,$branchcode);
- my $data = $sth->fetchrow_hashref;
- my $opacitemholds = uc substr ($data->{opacitemholds}, 0, 1);
- return '' if $opacitemholds eq 'N';
- return $opacitemholds;
-}
-
=head2 MoveReserve
MoveReserve( $itemnumber, $borrowernumber, $cancelreserve )
RevertWaitingStatus({ itemnumber => $itemnumber });
}
elsif ( $cancelreserve eq 'cancel' || $cancelreserve ) { # cancel reserves on this item
- CancelReserve( { reserve_id => $res->{'reserve_id'} } );
+ my $hold = Koha::Holds->find( $res->{reserve_id} );
+ $hold->cancel;
}
}
}
_FixPriority( { biblionumber => $reserve->{biblionumber} } );
}
-=head2 GetReserveId
-
- $reserve_id = GetReserveId({ biblionumber => $biblionumber, borrowernumber => $borrowernumber [, itemnumber => $itemnumber ] });
-
- Returnes the first reserve id that matches the given criteria
-
-=cut
-
-sub GetReserveId {
- my ( $params ) = @_;
-
- return unless ( ( $params->{'biblionumber'} || $params->{'itemnumber'} ) && $params->{'borrowernumber'} );
-
- foreach my $key ( keys %$params ) {
- delete $params->{$key} unless defined( $params->{$key} );
- }
-
- my $hold = Koha::Holds->search( $params )->next();
-
- return unless $hold;
-
- return $hold->id();
-}
-
=head2 ReserveSlip
ReserveSlip($branchcode, $borrowernumber, $biblionumber)
# return unless ( C4::Context->boolean_preference('printreserveslips') );
my $patron = Koha::Patrons->find( $borrowernumber );
- my $reserve_id = GetReserveId({
- biblionumber => $biblionumber,
- borrowernumber => $borrowernumber
- }) or return;
- my $reserve = Koha::Holds->find($reserve_id) or return;
- $reserve = $reserve->unblessed;
+ my $hold = Koha::Holds->search({biblionumber => $biblionumber, borrowernumber => $borrowernumber })->next;
+ return unless $hold;
+ my $reserve = $hold->unblessed;
return C4::Letters::GetPreparedLetter (
module => 'circulation',