&ReserveSlip
&ToggleSuspend
&SuspendAll
+
+ &GetReservesControlBranch
);
@EXPORT_OK = qw( MergeHolds );
}
'branches' => $branch_details,
'borrowers' => $borrower,
'biblio' => $biblionumber,
+ 'items' => $checkitem,
},
) ) {
$res = GetReserve( $reserve_id );
+ Return the current reserve.
+
=cut
sub GetReserve {
my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
my $sth = $dbh->prepare( $query );
$sth->execute( $reserve_id );
- my $res = $sth->fetchrow_hashref();
- return $res;
+ return $sth->fetchrow_hashref();
}
=head2 GetReservesFromBiblionumber
- ($count, $title_reserves) = GetReservesFromBiblionumber($biblionumber);
+ my $reserves = GetReservesFromBiblionumber({
+ biblionumber => $biblionumber,
+ [ itemnumber => $itemnumber, ]
+ [ all_dates => 1|0 ]
+ });
+
+This function gets the list of reservations for one C<$biblionumber>,
+returning an arrayref pointing to the reserves for C<$biblionumber>.
+
+By default, only reserves whose start date falls before the current
+time are returned. To return all reserves, including future ones,
+the C<all_dates> parameter can be included and set to a true value.
-This function gets the list of reservations for one C<$biblionumber>, returning a count
-of the reserves and an arrayref pointing to the reserves for C<$biblionumber>.
+If the C<itemnumber> parameter is supplied, reserves must be targeted
+to that item or not targeted to any item at all; otherwise, they
+are excluded from the list.
=cut
sub GetReservesFromBiblionumber {
- my ($biblionumber) = shift or return (0, []);
- my ($all_dates) = shift;
+ my ( $params ) = @_;
+ my $biblionumber = $params->{biblionumber} or return [];
+ my $itemnumber = $params->{itemnumber};
+ my $all_dates = $params->{all_dates} // 0;
my $dbh = C4::Context->dbh;
# Find the desired items in the reserves
+ my @params;
my $query = "
SELECT reserve_id,
branchcode,
suspend_until
FROM reserves
WHERE biblionumber = ? ";
+ push( @params, $biblionumber );
unless ( $all_dates ) {
- $query .= "AND reservedate <= CURRENT_DATE()";
+ $query .= " AND reservedate <= CAST(NOW() AS DATE) ";
+ }
+ if ( $itemnumber ) {
+ $query .= " AND ( itemnumber IS NULL OR itemnumber = ? )";
+ push( @params, $itemnumber );
}
$query .= "ORDER BY priority";
my $sth = $dbh->prepare($query);
- $sth->execute($biblionumber);
+ $sth->execute( @params );
my @results;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
}
push @results, $data;
}
- return ( $#results + 1, \@results );
+ return \@results;
}
=head2 GetReservesFromItemnumber
- ( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = GetReservesFromItemnumber($itemnumber);
+ ( $reservedate, $borrowernumber, $branchcode, $reserve_id, $waitingdate ) = GetReservesFromItemnumber($itemnumber);
-TODO :: Description here
+Get the first reserve for a specific item number (based on priority). Returns the abovementioned values for that reserve.
+
+The routine does not look at future reserves (read: item level holds), but DOES include future waits (a confirmed future hold).
=cut
sub GetReservesFromItemnumber {
- my ( $itemnumber, $all_dates ) = @_;
+ my ( $itemnumber ) = @_;
my $dbh = C4::Context->dbh;
my $query = "
- SELECT reservedate,borrowernumber,branchcode,reserve_id
+ SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate
FROM reserves
- WHERE itemnumber=?
+ WHERE itemnumber=? AND ( reservedate <= CAST(now() AS date) OR
+ waitingdate IS NOT NULL )
+ ORDER BY priority
";
- unless ( $all_dates ) {
- $query .= " AND reservedate <= CURRENT_DATE()";
- }
my $sth_res = $dbh->prepare($query);
$sth_res->execute($itemnumber);
- my ( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = $sth_res->fetchrow_array;
- return ( $reservedate, $borrowernumber, $branchcode, $reserve_id );
+ my ( $reservedate, $borrowernumber,$branchcode, $reserve_id, $wait ) = $sth_res->fetchrow_array;
+ return ( $reservedate, $borrowernumber, $branchcode, $reserve_id, $wait );
}
=head2 GetReservesFromBorrowernumber
my ($borrowernumber, $itemnumber) = @_;
my $dbh = C4::Context->dbh;
+ my $ruleitemtype; # itemtype of the matching issuing rule
my $allowedreserves = 0;
- my $controlbranch = C4::Context->preference('ReservesControlBranch');
- my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
-
# we retrieve borrowers and items informations #
- my $item = GetItem($itemnumber);
+ # item->{itype} will come for biblioitems if necessery
+ my $item = GetItem($itemnumber);
+
+ # If an item is damaged and we don't allow holds on damaged items, we can stop right here
+ return 0 if ( $item->{damaged} && !C4::Context->preference('AllowHoldsOnDamagedItems') );
+
my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
+ 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
FROM issuingrules
";
- my $itemtype = $item->{$itype};
- my $categorycode = $borrower->{categorycode};
my $branchcode = "";
my $branchfield = "reserves.branchcode";
}
# we retrieve rights
- $sth->execute($categorycode, $itemtype, $branchcode);
+ $sth->execute($borrower->{'categorycode'}, $item->{'itype'}, $branchcode);
if(my $rights = $sth->fetchrow_hashref()){
- $itemtype = $rights->{itemtype};
+ $ruleitemtype = $rights->{itemtype};
$allowedreserves = $rights->{reservesallowed};
}else{
- $itemtype = '*';
+ $ruleitemtype = '*';
}
# we retrieve count
$querycount .= "AND $branchfield = ?";
- $querycount .= " AND $itype = ?" if ($itemtype ne "*");
+ $querycount .= " AND $itemtypefield = ?" if ($ruleitemtype ne "*");
my $sthcount = $dbh->prepare($querycount);
- if($itemtype eq "*"){
+ if($ruleitemtype eq "*"){
$sthcount->execute($borrowernumber, $branchcode);
}else{
- $sthcount->execute($borrowernumber, $branchcode, $itemtype);
+ $sthcount->execute($borrowernumber, $branchcode, $ruleitemtype);
}
my $reservecount = "0";
}
# we check if it's ok or not
- if( $reservecount < $allowedreserves ){
- return 1;
- }else{
+ if( $reservecount >= $allowedreserves ){
return 0;
}
+
+ # If reservecount is ok, we check item branch if IndependentBranches is ON
+ # and canreservefromotherbranches is OFF
+ if ( C4::Context->preference('IndependentBranches')
+ and !C4::Context->preference('canreservefromotherbranches') )
+ {
+ my $itembranch = $item->{homebranch};
+ if ($itembranch ne $borrower->{branchcode}) {
+ return 0;
+ }
+ }
+
+ return 1;
}
#--------------------------------------------------------------------------------
=head2 GetReserveCount
my $sth = $dbh->prepare($query);
$sth->execute($borrowernumber);
my $data = $sth->fetchrow_hashref;
- $sth->finish();
my $fee = $data->{'reservefee'};
my $cntitems = @- > $bibitems;
}
}
}
- $sth1->finish;
my $cntitemsfound = @biblioitems;
my $issues = 0;
my $x = 0;
if(defined $found) {
return 'Waiting' if $found eq 'W' and $priority == 0;
return 'Finished' if $found eq 'F';
- return 'Reserved' if $priority > 0;
}
- return '';
- #empty string here will remove need for checking undef, or less log lines
+
+ return 'Reserved' if $priority > 0;
+
+ return ''; # empty string here will remove need for checking undef, or less log lines
}
=head2 CheckReserves
($status, $reserve, $all_reserves) = &CheckReserves($itemnumber);
($status, $reserve, $all_reserves) = &CheckReserves(undef, $barcode);
+ ($status, $reserve, $all_reserves) = &CheckReserves($itemnumber,undef,$lookahead);
Find a book in the reserves.
C<$itemnumber> is the book's item number.
+C<$lookahead> is the number of days to look in advance for future reserves.
As I understand it, C<&CheckReserves> looks for the given item in the
reserves. If it is found, that's a match, and C<$status> is set to
=cut
sub CheckReserves {
- my ( $item, $barcode ) = @_;
+ my ( $item, $barcode, $lookahead_days) = @_;
my $dbh = C4::Context->dbh;
my $sth;
my $select;
items.biblioitemnumber,
itemtypes.notforloan,
items.notforloan AS itemnotforloan,
- items.itemnumber
+ items.itemnumber,
+ items.damaged
FROM items
LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
LEFT JOIN itemtypes ON items.itype = itemtypes.itemtype
items.biblioitemnumber,
itemtypes.notforloan,
items.notforloan AS itemnotforloan,
- items.itemnumber
+ items.itemnumber,
+ items.damaged
FROM items
LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
LEFT JOIN itemtypes ON biblioitems.itemtype = itemtypes.itemtype
$sth->execute($barcode);
}
# note: we get the itemnumber because we might have started w/ just the barcode. Now we know for sure we have it.
- my ( $biblio, $bibitem, $notforloan_per_itemtype, $notforloan_per_item, $itemnumber ) = $sth->fetchrow_array;
+ my ( $biblio, $bibitem, $notforloan_per_itemtype, $notforloan_per_item, $itemnumber, $damaged ) = $sth->fetchrow_array;
+
+ return if ( $damaged && !C4::Context->preference('AllowHoldsOnDamagedItems') );
- return ( '' ) unless $itemnumber; # bail if we got nothing.
+ return unless $itemnumber; # bail if we got nothing.
# if item is not for loan it cannot be reserved either.....
# execpt where items.notforloan < 0 : This indicates the item is holdable.
- return ( '' ) if ( $notforloan_per_item > 0 ) or $notforloan_per_itemtype;
+ return if ( $notforloan_per_item > 0 ) or $notforloan_per_itemtype;
# Find this item in the reserves
- my @reserves = _Findgroupreserve( $bibitem, $biblio, $itemnumber );
+ my @reserves = _Findgroupreserve( $bibitem, $biblio, $itemnumber, $lookahead_days);
# $priority and $highest are used to find the most important item
# in the list returned by &_Findgroupreserve. (The lower $priority,
if ( $res->{'priority'} && $res->{'priority'} < $priority ) {
my $borrowerinfo=C4::Members::GetMember(borrowernumber => $res->{'borrowernumber'});
my $iteminfo=C4::Items::GetItem($itemnumber);
- my $branch=C4::Circulation::_GetCircControlBranch($iteminfo,$borrowerinfo);
+ my $branch = GetReservesControlBranch( $iteminfo, $borrowerinfo );
my $branchitemrule = C4::Circulation::GetBranchItemRule($branch,$iteminfo->{'itype'});
next if ($branchitemrule->{'holdallowed'} == 0);
next if (($branchitemrule->{'holdallowed'} == 1) && ($branch ne $borrowerinfo->{'branchcode'}));
my $dbh = C4::Context->dbh;
+ my $reserve = GetReserve( $reserve_id );
+
my $query = "
UPDATE reserves
SET cancellationdate = now(),
";
my $sth = $dbh->prepare($query);
$sth->execute( $reserve_id );
- $sth->finish;
$query = "
INSERT INTO old_reserves
$sth->execute( $reserve_id );
# now fix the priority on the others....
- _FixPriority( $reserve_id );
+ _FixPriority({ biblionumber => $reserve->{biblionumber} });
}
=head2 ModReserve
my $dbh = C4::Context->dbh;
if ( $rank eq "del" ) {
- my $query = "
- UPDATE reserves
- SET cancellationdate=now()
- WHERE reserve_id = ?
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute( $reserve_id );
- $sth->finish;
- $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 );
-
+ CancelReserve({ reserve_id => $reserve_id });
}
elsif ($rank =~ /^\d+/ and $rank > 0) {
my $query = "
";
my $sth = $dbh->prepare($query);
$sth->execute( $rank, $branchcode, $itemnumber, $reserve_id );
- $sth->finish;
if ( defined( $suspend_until ) ) {
if ( $suspend_until ) {
}
}
- _FixPriority( $reserve_id, $rank );
+ _FixPriority({ reserve_id => $reserve_id, rank =>$rank });
}
}
my $sth = $dbh->prepare($query);
$sth->execute( $biblionumber, $borrowernumber, $resdate );
($priority) = $sth->fetchrow_array;
- $sth->finish;
# update the database...
$query = "UPDATE reserves
";
$sth = $dbh->prepare($query);
$sth->execute( $biblionumber, $resdate, $borrowernumber );
- $sth->finish;
# move to old_reserves
$query = "INSERT INTO old_reserves
# now fix the priority on the others (if the priority wasn't
# already sorted!)....
unless ( $priority == 0 ) {
- _FixPriority( $reserve_id );
+ _FixPriority({ reserve_id => $reserve_id });
}
}
# get request - need to find out if item is already
# waiting in order to not send duplicate hold filled notifications
- my $request = GetReserveInfo($borrowernumber, $biblionumber);
+ my $reserve_id = GetReserveId({
+ borrowernumber => $borrowernumber,
+ biblionumber => $biblionumber,
+ });
+ return unless defined $reserve_id;
+ 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
$sth = $dbh->prepare($query);
$sth->execute( $itemnumber, $borrowernumber,$biblionumber);
_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );
-
+ _FixPriority( { biblionumber => $biblionumber } );
if ( C4::Context->preference("ReturnToShelvingCart") ) {
CartToShelf( $itemnumber );
}
";
my $sth_upd = $dbh->prepare($query);
$sth_upd->execute( $itemnumber, $reserve_id );
- # second step update all others reservs
- _FixPriority( $reserve_id, '0');
+ # second step update all others reserves
+ _FixPriority({ reserve_id => $reserve_id, rank => '0' });
}
=head2 GetReserveInfo
$available_per_item = 0 if $item->{itemlost} or
( $item->{notforloan} > 0 ) or
($item->{damaged} and not C4::Context->preference('AllowHoldsOnDamagedItems')) or
- $item->{wthdrawn} or
+ $item->{withdrawn} or
$notforloan_per_itemtype;
my $priority = $reserve->{'priority'};
$priority = $where eq 'up' ? $priority - 1 : $priority + 1;
- _FixPriority( $reserve_id, $priority )
+ _FixPriority({ reserve_id => $reserve_id, rank => $priority })
} elsif ( $where eq 'top' ) {
- _FixPriority( $reserve_id, '1' )
+ _FixPriority({ reserve_id => $reserve_id, rank => '1' })
} elsif ( $where eq 'bottom' ) {
- _FixPriority( $reserve_id, '999999' )
+ _FixPriority({ reserve_id => $reserve_id, rank => '999999' });
}
}
my $sth = $dbh->prepare( "UPDATE reserves SET lowestPriority = NOT lowestPriority WHERE reserve_id = ?");
$sth->execute( $reserve_id );
- $sth->finish;
- _FixPriority( $reserve_id, '999999' );
+ _FixPriority({ reserve_id => $reserve_id, rank => '999999' });
}
=head2 ToggleSuspend
sub ToggleSuspend {
my ( $reserve_id, $suspend_until ) = @_;
- $suspend_until = output_pref( dt_from_string( $suspend_until ), 'iso' ) if ( $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';
push( @params, $reserve_id );
$sth->execute( @params );
- $sth->finish;
}
=head2 SuspendAll
$dbh = C4::Context->dbh;
$sth = $dbh->prepare( $query );
$sth->execute( @query_params );
- $sth->finish;
}
=head2 _FixPriority
- &_FixPriority( $reserve_id, $rank, $ignoreSetLowestRank);
+ _FixPriority({
+ reserve_id => $reserve_id,
+ [rank => $rank,]
+ [ignoreSetLowestRank => $ignoreSetLowestRank]
+ });
+
+ or
+
+ _FixPriority({ biblionumber => $biblionumber});
+
+This routine adjusts the priority of a hold request and holds
+on the same bib.
-Only used internally (so don't export it)
-Changed how this functions works #
-Now just gets an array of reserves in the rank order and updates them with
-the array index (+1 as array starts from 0)
-and if $rank is supplied will splice item from the array and splice it back in again
-in new priority rank
+In the first form, where a reserve_id is passed, the priority of the
+hold is set to supplied rank, and other holds for that bib are adjusted
+accordingly. If the rank is "del", the hold is cancelled. If no rank
+is supplied, all of the holds on that bib have their priority adjusted
+as if the second form had been used.
-=cut
+In the second form, where a biblionumber is passed, the holds on that
+bib (that are not captured) are sorted in order of increasing priority,
+then have reserves.priority set so that the first non-captured hold
+has its priority set to 1, the second non-captured hold has its priority
+set to 2, and so forth.
+
+In both cases, holds that have the lowestPriority flag on are have their
+priority adjusted to ensure that they remain at the end of the line.
+
+Note that the ignoreSetLowestRank parameter is meant to be used only
+when _FixPriority calls itself.
+
+=cut
sub _FixPriority {
- my ( $reserve_id, $rank, $ignoreSetLowestRank ) = @_;
+ my ( $params ) = @_;
+ my $reserve_id = $params->{reserve_id};
+ my $rank = $params->{rank} // '';
+ my $ignoreSetLowestRank = $params->{ignoreSetLowestRank};
+ my $biblionumber = $params->{biblionumber};
+
my $dbh = C4::Context->dbh;
- my $res = GetReserve( $reserve_id );
+ unless ( $biblionumber ) {
+ my $res = GetReserve( $reserve_id );
+ $biblionumber = $res->{biblionumber};
+ }
if ( $rank eq "del" ) {
CancelReserve({ reserve_id => $reserve_id });
ORDER BY priority ASC
";
my $sth = $dbh->prepare($query);
- $sth->execute( $res->{'biblionumber'} );
+ $sth->execute( $biblionumber );
while ( my $line = $sth->fetchrow_hashref ) {
push( @priority, $line );
}
$j + 1,
$priority[$j]->{'reserve_id'}
);
- $sth->finish;
}
$sth = $dbh->prepare( "SELECT reserve_id FROM reserves WHERE lowestPriority = 1 ORDER BY priority" );
unless ( $ignoreSetLowestRank ) {
while ( my $res = $sth->fetchrow_hashref() ) {
- _FixPriority( $res->{'reserve_id'}, '999999', 1 );
+ _FixPriority({
+ reserve_id => $res->{'reserve_id'},
+ rank => '999999',
+ ignoreSetLowestRank => 1
+ });
}
}
}
=head2 _Findgroupreserve
- @results = &_Findgroupreserve($biblioitemnumber, $biblionumber, $itemnumber);
+ @results = &_Findgroupreserve($biblioitemnumber, $biblionumber, $itemnumber, $lookahead);
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.
+Lookahead is the number of days to look in advance.
TODO: add more explanation about reserve constraints
=cut
sub _Findgroupreserve {
- my ( $bibitem, $biblio, $itemnumber ) = @_;
+ my ( $bibitem, $biblio, $itemnumber, $lookahead) = @_;
my $dbh = C4::Context->dbh;
# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
AND priority > 0
AND item_level_request = 1
AND itemnumber = ?
- AND reservedate <= CURRENT_DATE()
+ AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
AND suspend = 0
/;
my $sth = $dbh->prepare($item_level_target_query);
- $sth->execute($itemnumber);
+ $sth->execute($itemnumber, $lookahead||0);
my @results;
if ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data );
reserves.priority AS priority,
reserves.timestamp AS timestamp,
biblioitems.biblioitemnumber AS biblioitemnumber,
- reserves.itemnumber AS itemnumber
+ reserves.itemnumber AS itemnumber,
+ reserves.reserve_id AS reserve_id
FROM reserves
JOIN biblioitems USING (biblionumber)
JOIN hold_fill_targets USING (biblionumber, borrowernumber)
AND priority > 0
AND item_level_request = 0
AND hold_fill_targets.itemnumber = ?
- AND reservedate <= CURRENT_DATE()
+ AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
AND suspend = 0
/;
$sth = $dbh->prepare($title_level_target_query);
- $sth->execute($itemnumber);
+ $sth->execute($itemnumber, $lookahead||0);
@results = ();
if ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data );
reserves.priority AS priority,
reserves.timestamp AS timestamp,
reserveconstraints.biblioitemnumber AS biblioitemnumber,
- reserves.itemnumber AS itemnumber
+ reserves.itemnumber AS itemnumber,
+ reserves.reserve_id AS reserve_id
FROM reserves
LEFT JOIN reserveconstraints ON reserves.biblionumber = reserveconstraints.biblionumber
WHERE reserves.biblionumber = ?
AND reserves.reservedate = reserveconstraints.reservedate )
OR reserves.constrainttype='a' )
AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
- AND reserves.reservedate <= CURRENT_DATE()
+ AND reserves.reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
AND suspend = 0
/;
$sth = $dbh->prepare($query);
- $sth->execute( $biblio, $bibitem, $itemnumber );
+ $sth->execute( $biblio, $bibitem, $itemnumber, $lookahead||0);
@results = ();
while ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data );
# Try to get the borrower's email address
my $to_address = C4::Members::GetNoticeEmailAddress($borrowernumber);
-
- my $letter_code;
- my $print_mode = 0;
- my $messagingprefs;
- if ( $to_address || $borrower->{'smsalertnumber'} ) {
- $messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold_Filled' } );
- } else {
- $print_mode = 1;
- }
+
+ my $messagingprefs = C4::Members::Messaging::GetMessagingPreferences( {
+ borrowernumber => $borrowernumber,
+ message_name => 'Hold_Filled'
+ } );
my $sth = $dbh->prepare("
SELECT *
substitute => { today => C4::Dates->new()->output() },
);
-
- if ( $print_mode ) {
- $letter_params{ 'letter_code' } = 'HOLD_PRINT';
- my $letter = C4::Letters::GetPreparedLetter ( %letter_params ) or die "Could not find a letter called '$letter_params{'letter_code'}' in the 'reserves' module";
+ 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 $send_notification = sub {
+ my ( $mtt, $letter_code ) = (@_);
+ return unless defined $letter_code;
+ $letter_params{letter_code} = $letter_code;
+ $letter_params{message_transport_type} = $mtt;
+ my $letter = C4::Letters::GetPreparedLetter ( %letter_params );
+ unless ($letter) {
+ warn "Could not find a letter called '$letter_params{'letter_code'}' for $mtt in the 'reserves' module";
+ return;
+ }
C4::Letters::EnqueueLetter( {
letter => $letter,
borrowernumber => $borrowernumber,
- message_transport_type => 'print',
+ from_address => $admin_email_address,
+ message_transport_type => $mtt,
} );
-
- return;
- }
+ };
- if ( $to_address && defined $messagingprefs->{transports}->{'email'} ) {
- $letter_params{ 'letter_code' } = $messagingprefs->{transports}->{'email'};
- my $letter = C4::Letters::GetPreparedLetter ( %letter_params ) or die "Could not find a letter called '$letter_params{'letter_code'}' in the 'reserves' module";
-
- C4::Letters::EnqueueLetter(
- { letter => $letter,
- borrowernumber => $borrowernumber,
- message_transport_type => 'email',
- from_address => $admin_email_address,
- }
- );
+ while ( my ( $mtt, $letter_code ) = each %{ $messagingprefs->{transports} } ) {
+ if ( ($mtt eq 'email' and not $to_address) or ($mtt eq 'sms' and not $borrower->{smsalertnumber}) ) {
+ # email or sms is requested but not exist
+ next;
+ }
+ &$send_notification($mtt, $letter_code);
+ $notification_sent++;
}
-
- if ( $borrower->{'smsalertnumber'} && defined $messagingprefs->{transports}->{'sms'} ) {
- $letter_params{ 'letter_code' } = $messagingprefs->{transports}->{'sms'};
- my $letter = C4::Letters::GetPreparedLetter ( %letter_params ) or die "Could not find a letter called '$letter_params{'letter_code'}' in the 'reserves' module";
-
- C4::Letters::EnqueueLetter(
- { letter => $letter,
- borrowernumber => $borrowernumber,
- message_transport_type => 'sms',
- }
- );
+ #Making sure that a print notification is sent if no other transport types can be utilized.
+ if (! $notification_sent) {
+ &$send_notification('print', 'HOLD');
}
+
}
=head2 _ShiftPriorityByDateAndPriority
=head2 RevertWaitingStatus
- $success = RevertWaitingStatus({ itemnumber => $itemnumber });
+ RevertWaitingStatus({ itemnumber => $itemnumber });
Reverts a 'waiting' hold back to a regular hold with a priority of 1.
reserve_id = ?
";
$sth = $dbh->prepare( $query );
- return $sth->execute( $reserve->{'reserve_id'} );
+ $sth->execute( $reserve->{'reserve_id'} );
+ _FixPriority( { biblionumber => $reserve->{biblionumber} } );
}
=head2 GetReserveId
# return unless ( C4::Context->boolean_preference('printreserveslips') );
- my $reserve = GetReserveInfo($borrowernumber,$biblionumber )
- or return;
+ my $reserve_id = GetReserveId({
+ biblionumber => $biblionumber,
+ borrowernumber => $borrowernumber
+ }) or return;
+ my $reserve = GetReserveInfo($reserve_id) or return;
return C4::Letters::GetPreparedLetter (
module => 'circulation',
);
}
+=head2 GetReservesControlBranch
+
+ my $reserves_control_branch = GetReservesControlBranch($item, $borrower);
+
+ Return the branchcode to be used to determine which reserves
+ policy applies to a transaction.
+
+ C<$item> is a hashref for an item. Only 'homebranch' is used.
+
+ C<$borrower> is a hashref to borrower. Only 'branchcode' is used.
+
+=cut
+
+sub GetReservesControlBranch {
+ my ( $item, $borrower ) = @_;
+
+ my $reserves_control = C4::Context->preference('ReservesControlBranch');
+
+ my $branchcode =
+ ( $reserves_control eq 'ItemHomeLibrary' ) ? $item->{'homebranch'}
+ : ( $reserves_control eq 'PatronLibrary' ) ? $borrower->{'branchcode'}
+ : undef;
+
+ return $branchcode;
+}
+
+=head2 CalculatePriority
+
+ my $p = CalculatePriority($biblionumber, $resdate);
+
+Calculate priority for a new reserve on biblionumber, placing it at
+the end of the line of all holds whose start date falls before
+the current system time and that are neither on the hold shelf
+or in transit.
+
+The reserve date parameter is optional; if it is supplied, the
+priority is based on the set of holds whose start date falls before
+the parameter value.
+
+After calculation of this priority, it is recommended to call
+_ShiftPriorityByDateAndPriority. Note that this is currently done in
+AddReserves.
+
+=cut
+
+sub CalculatePriority {
+ my ( $biblionumber, $resdate ) = @_;
+
+ my $sql = q{
+ SELECT COUNT(*) FROM reserves
+ WHERE biblionumber = ?
+ AND priority > 0
+ AND (found IS NULL OR found = '')
+ };
+ #skip found==W or found==T (waiting or transit holds)
+ if( $resdate ) {
+ $sql.= ' AND ( reservedate <= ? )';
+ }
+ else {
+ $sql.= ' AND ( reservedate < NOW() )';
+ }
+ my $dbh = C4::Context->dbh();
+ my @row = $dbh->selectrow_array(
+ $sql,
+ undef,
+ $resdate ? ($biblionumber, $resdate) : ($biblionumber)
+ );
+
+ return @row ? $row[0]+1 : 1;
+}
+
=head1 AUTHOR
Koha Development Team <http://koha-community.org/>
projects / koha_fer / blobdiff