use C4::Members::Messaging;
use C4::Members qw();
use C4::Letters;
-use C4::Branch qw( GetBranchDetail );
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;
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 {
# 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,
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 );
my $dbh = C4::Context->dbh;
my ( $fee ) = $dbh->selectrow_array( $borquery, undef, ($borrowernumber) );
- if( $fee && $fee > 0 ) {
+ 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
=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 });
}
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 = eval { output_pref( { dt => dt_from_string( $suspend_until ), dateonly => 1 }); };
- $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();
}
}
sub ToggleSuspend {
my ( $reserve_id, $suspend_until ) = @_;
- $suspend_until = output_pref(
- {
- dt => dt_from_string($suspend_until),
- dateformat => 'iso',
- dateonly => 1
- }
- ) if ($suspend_until);
+ $suspend_until = dt_from_string($suspend_until) if ($suspend_until);
- my $do_until = ( $suspend_until ) ? '?' : 'NULL';
+ my $hold = Koha::Holds->find( $reserve_id );
- my $dbh = C4::Context->dbh;
-
- 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 @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 = eval { output_pref( { dt => dt_from_string( $suspend_until), dateonly => 1, dateformat => '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 );
}
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 => output_pref( { dt => dt_from_string, dateonly => 1 } ) },
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