use C4::Message;
use C4::Debug;
use C4::Log; # logaction
-use C4::Koha qw(
- GetAuthorisedValueByCode
- GetAuthValCode
- GetKohaAuthorisedValueLib
-);
use C4::Overdues qw(CalcFine UpdateFine get_chargeable_units);
use C4::RotatingCollections qw(GetCollectionItemBranches);
use Algorithm::CheckDigits;
use Data::Dumper;
use Koha::Account;
+use Koha::AuthorisedValues;
+use Koha::Biblioitems;
use Koha::DateUtils;
use Koha::Calendar;
+use Koha::Checkouts;
+use Koha::IssuingRules;
use Koha::Items;
use Koha::Patrons;
use Koha::Patron::Debarments;
&AddRenewal
&GetRenewCount
&GetSoonestRenewDate
- &GetItemIssue
- &GetItemIssues
+ &GetLatestAutoRenewDate
&GetIssuingCharges
- &GetIssuingRule
&GetBranchBorrowerCircRule
&GetBranchItemRule
&GetBiblioIssues
&GetOpenIssue
- &AnonymiseIssueHistory
&CheckIfIssuedToPatron
&IsItemIssued
GetTopIssues
my ( $tbr, $barcode, $ignoreRs ) = @_;
my $messages;
my $dotransfer = 1;
- my $itemnumber = GetItemnumberFromBarcode( $barcode );
- my $issue = GetItemIssue($itemnumber);
- my $biblio = GetBiblioFromItemNumber($itemnumber);
+ my $item = Koha::Items->find( { barcode => $barcode } );
# bad barcode..
- if ( not $itemnumber ) {
+ unless ( $item ) {
$messages->{'BadBarcode'} = $barcode;
$dotransfer = 0;
}
+ my $itemnumber = $item->itemnumber;
+ my $issue = GetOpenIssue($itemnumber);
# get branches of book...
- my $hbr = $biblio->{'homebranch'};
- my $fbr = $biblio->{'holdingbranch'};
+ my $hbr = $item->homebranch;
+ my $fbr = $item->holdingbranch;
# if using Branch Transfer Limits
if ( C4::Context->preference("UseBranchTransferLimits") == 1 ) {
+ my $code = C4::Context->preference("BranchTransferLimitsType") eq 'ccode' ? $item->ccode : $item->biblio->biblioitem->itemtype; # BranchTransferLimitsType is 'ccode' or 'itemtype'
if ( C4::Context->preference("item-level_itypes") && C4::Context->preference("BranchTransferLimitsType") eq 'itemtype' ) {
- if ( ! IsBranchTransferAllowed( $tbr, $fbr, $biblio->{'itype'} ) ) {
- $messages->{'NotAllowed'} = $tbr . "::" . $biblio->{'itype'};
+ if ( ! IsBranchTransferAllowed( $tbr, $fbr, $item->itype ) ) {
+ $messages->{'NotAllowed'} = $tbr . "::" . $item->itype;
$dotransfer = 0;
}
- } elsif ( ! IsBranchTransferAllowed( $tbr, $fbr, $biblio->{ C4::Context->preference("BranchTransferLimitsType") } ) ) {
- $messages->{'NotAllowed'} = $tbr . "::" . $biblio->{ C4::Context->preference("BranchTransferLimitsType") };
+ } elsif ( ! IsBranchTransferAllowed( $tbr, $fbr, $code ) ) {
+ $messages->{'NotAllowed'} = $tbr . "::" . $code;
$dotransfer = 0;
- }
+ }
}
# if is permanent...
}
# check if it is still issued to someone, return it...
- if ($issue->{borrowernumber}) {
+ if ( $issue ) {
AddReturn( $barcode, $fbr );
- $messages->{'WasReturned'} = $issue->{borrowernumber};
+ $messages->{'WasReturned'} = $issue->borrowernumber;
}
# find reserves.....
}
ModDateLastSeen( $itemnumber );
- return ( $dotransfer, $messages, $biblio );
+ return ( $dotransfer, $messages );
}
# given branch, patron category, and item type, determine
# applicable issuing rule
- my $issuing_rule = GetIssuingRule($cat_borrower, $type, $branch);
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $cat_borrower,
+ itemtype => $type,
+ branchcode => $branch
+ }
+ );
+
# if a rule is found and has a loan limit set, count
# how many loans the patron already has that meet that
# rule
- if (defined($issuing_rule) and defined($issuing_rule->{'maxissueqty'})) {
+ if (defined($issuing_rule) and defined($issuing_rule->maxissueqty)) {
my @bind_params;
my $count_query = q|
SELECT COUNT(*) AS total, COALESCE(SUM(onsite_checkout), 0) AS onsite_checkouts
JOIN items USING (itemnumber)
|;
- my $rule_itemtype = $issuing_rule->{itemtype};
+ my $rule_itemtype = $issuing_rule->itemtype;
if ($rule_itemtype eq "*") {
# matching rule has the default item type, so count only
# those existing loans that don't fall under a more
AND itemtype <> '*'
) ";
}
- push @bind_params, $issuing_rule->{branchcode};
- push @bind_params, $issuing_rule->{categorycode};
+ push @bind_params, $issuing_rule->branchcode;
+ push @bind_params, $issuing_rule->categorycode;
push @bind_params, $cat_borrower;
} else {
# rule has specific item type, so count loans of that
$count_query .= " AND borrowernumber = ? ";
push @bind_params, $borrower->{'borrowernumber'};
- my $rule_branch = $issuing_rule->{branchcode};
+ my $rule_branch = $issuing_rule->branchcode;
if ($rule_branch ne "*") {
if (C4::Context->preference('CircControl') eq 'PickupLibrary') {
$count_query .= " AND issues.branchcode = ? ";
my ( $checkout_count, $onsite_checkout_count ) = $dbh->selectrow_array( $count_query, {}, @bind_params );
- my $max_checkouts_allowed = $issuing_rule->{maxissueqty};
- my $max_onsite_checkouts_allowed = $issuing_rule->{maxonsiteissueqty};
+ my $max_checkouts_allowed = $issuing_rule->maxissueqty;
+ my $max_onsite_checkouts_allowed = $issuing_rule->maxonsiteissueqty;
if ( $onsite_checkout ) {
if ( $onsite_checkout_count >= $max_onsite_checkouts_allowed ) {
}
}
+ if ( not defined( $issuing_rule ) and not defined($branch_borrower_circ_rule->{maxissueqty}) ) {
+ return { reason => 'NO_RULE_DEFINED', max_allowed => 0 };
+ }
+
# OK, the patron can issue !!!
return;
}
=head2 CanBookBeIssued
- ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $borrower,
+ ( $issuingimpossible, $needsconfirmation, [ $alerts ] ) = CanBookBeIssued( $borrower,
$barcode, $duedate, $inprocess, $ignore_reserves, $params );
Check if a book can be issued.
-C<$issuingimpossible> and C<$needsconfirmation> are some hashref.
+C<$issuingimpossible> and C<$needsconfirmation> are hashrefs.
+
+IMPORTANT: The assumption by users of this routine is that causes blocking
+the issue are keyed by uppercase labels and other returned
+data is keyed in lower case!
=over 4
-=item C<$borrower> hash with borrower informations (from GetMember or GetMemberDetails)
+=item C<$borrower> hash with borrower informations (from Koha::Patron->unblessed)
=item C<$barcode> is the bar code of the book being issued.
my $onsite_checkout = $params->{onsite_checkout} || 0;
my $override_high_holds = $params->{override_high_holds} || 0;
- my $item = GetItem(GetItemnumberFromBarcode( $barcode ));
- my $issue = GetItemIssue($item->{itemnumber});
+ my $item = GetItem(undef, $barcode );
+ my $issue = Koha::Checkouts->find( { itemnumber => $item->{itemnumber} } );
my $biblioitem = GetBiblioItemData($item->{biblioitemnumber});
$item->{'itemtype'}=$item->{'itype'};
my $dbh = C4::Context->dbh;
#
# BORROWER STATUS
#
- if ( $borrower->{'category_type'} eq 'X' && ( $item->{barcode} )) {
+ my $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
+ if ( $patron->category->category_type eq 'X' && ( $item->{barcode} )) {
# stats only borrower -- add entry to statistics table, and return issuingimpossible{STATS} = 1 .
&UpdateStats({
branch => C4::Context->userenv->{'branch'},
type => 'localuse',
itemnumber => $item->{'itemnumber'},
- itemtype => $item->{'itemtype'},
+ itemtype => $item->{'itype'},
borrowernumber => $borrower->{'borrowernumber'},
ccode => $item->{'ccode'}}
);
ModDateLastSeen( $item->{'itemnumber'} );
return( { STATS => 1 }, {});
}
- if ( ref $borrower->{flags} ) {
- if ( $borrower->{flags}->{GNA} ) {
+
+ my $flags = C4::Members::patronflags( $borrower );
+ if ( ref $flags ) {
+ if ( $flags->{GNA} ) {
$issuingimpossible{GNA} = 1;
}
- if ( $borrower->{flags}->{'LOST'} ) {
+ if ( $flags->{'LOST'} ) {
$issuingimpossible{CARD_LOST} = 1;
}
- if ( $borrower->{flags}->{'DBARRED'} ) {
+ if ( $flags->{'DBARRED'} ) {
$issuingimpossible{DEBARRED} = 1;
}
}
$alerts{OTHER_CHARGES} = sprintf( "%.2f", $other_charges );
}
- my ($blocktype, $count) = C4::Members::IsMemberBlocked($borrower->{'borrowernumber'});
- if ($blocktype == -1) {
- ## patron has outstanding overdue loans
- if ( C4::Context->preference("OverduesBlockCirc") eq 'block'){
- $issuingimpossible{USERBLOCKEDOVERDUE} = $count;
- }
- elsif ( C4::Context->preference("OverduesBlockCirc") eq 'confirmation'){
- $needsconfirmation{USERBLOCKEDOVERDUE} = $count;
- }
- } elsif($blocktype == 1) {
- # patron has accrued fine days or has a restriction. $count is a date
- if ($count eq '9999-12-31') {
- $issuingimpossible{USERBLOCKEDNOENDDATE} = $count;
+ $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
+ if ( my $debarred_date = $patron->is_debarred ) {
+ # patron has accrued fine days or has a restriction. $count is a date
+ if ($debarred_date eq '9999-12-31') {
+ $issuingimpossible{USERBLOCKEDNOENDDATE} = $debarred_date;
}
else {
- $issuingimpossible{USERBLOCKEDWITHENDDATE} = $count;
+ $issuingimpossible{USERBLOCKEDWITHENDDATE} = $debarred_date;
+ }
+ } elsif ( my $num_overdues = $patron->has_overdues ) {
+ ## patron has outstanding overdue loans
+ if ( C4::Context->preference("OverduesBlockCirc") eq 'block'){
+ $issuingimpossible{USERBLOCKEDOVERDUE} = $num_overdues;
+ }
+ elsif ( C4::Context->preference("OverduesBlockCirc") eq 'confirmation'){
+ $needsconfirmation{USERBLOCKEDOVERDUE} = $num_overdues;
+ }
+ }
+
+ #
+ # CHECK IF BOOK ALREADY ISSUED TO THIS BORROWER
+ #
+ if ( $issue && $issue->borrowernumber eq $borrower->{'borrowernumber'} ){
+
+ # Already issued to current borrower.
+ # If it is an on-site checkout if it can be switched to a normal checkout
+ # or ask whether the loan should be renewed
+
+ if ( $issue->onsite_checkout
+ and C4::Context->preference('SwitchOnSiteCheckouts') ) {
+ $messages{ONSITE_CHECKOUT_WILL_BE_SWITCHED} = 1;
+ } else {
+ my ($CanBookBeRenewed,$renewerror) = CanBookBeRenewed(
+ $borrower->{'borrowernumber'},
+ $item->{'itemnumber'},
+ );
+ if ( $CanBookBeRenewed == 0 ) { # no more renewals allowed
+ if ( $renewerror eq 'onsite_checkout' ) {
+ $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1;
+ }
+ else {
+ $issuingimpossible{NO_MORE_RENEWALS} = 1;
+ }
+ }
+ else {
+ $needsconfirmation{RENEW_ISSUE} = 1;
+ }
+ }
+ }
+ elsif ( $issue ) {
+
+ # issued to someone else
+
+ my $patron = Koha::Patrons->find( $issue->borrowernumber );
+
+ my ( $can_be_returned, $message ) = CanBookBeReturned( $item, C4::Context->userenv->{branch} );
+
+ unless ( $can_be_returned ) {
+ $issuingimpossible{RETURN_IMPOSSIBLE} = 1;
+ $issuingimpossible{branch_to_return} = $message;
+ } else {
+ $needsconfirmation{ISSUED_TO_ANOTHER} = 1;
+ $needsconfirmation{issued_firstname} = $patron->firstname;
+ $needsconfirmation{issued_surname} = $patron->surname;
+ $needsconfirmation{issued_cardnumber} = $patron->cardnumber;
+ $needsconfirmation{issued_borrowernumber} = $patron->borrowernumber;
}
}
-#
# JB34 CHECKS IF BORROWERS DON'T HAVE ISSUE TOO MANY BOOKS
#
- my $switch_onsite_checkout =
+ my $switch_onsite_checkout = (
C4::Context->preference('SwitchOnSiteCheckouts')
- and $issue->{onsite_checkout}
and $issue
- and $issue->{borrowernumber} == $borrower->{'borrowernumber'} ? 1 : 0;
+ and $issue->onsite_checkout
+ and $issue->borrowernumber == $borrower->{'borrowernumber'} ? 1 : 0 );
my $toomany = TooMany( $borrower, $item->{biblionumber}, $item, { onsite_checkout => $onsite_checkout, switch_onsite_checkout => $switch_onsite_checkout, } );
# if TooMany max_allowed returns 0 the user doesn't have permission to check out this book
- if ( $toomany ) {
+ if ( $toomany && not exists $needsconfirmation{RENEW_ISSUE} ) {
if ( $toomany->{max_allowed} == 0 ) {
$needsconfirmation{PATRON_CANT} = 1;
}
#
# CHECKPREVCHECKOUT: CHECK IF ITEM HAS EVER BEEN LENT TO PATRON
#
- my $patron = Koha::Patrons->find($borrower->{borrowernumber});
+ $patron = Koha::Patrons->find($borrower->{borrowernumber});
my $wants_check = $patron->wants_check_for_previous_checkout;
$needsconfirmation{PREVISSUE} = 1
if ($wants_check and $patron->do_check_for_previous_checkout($item));
$issuingimpossible{RESTRICTED} = 1;
}
if ( $item->{'itemlost'} && C4::Context->preference("IssueLostItem") ne 'nothing' ) {
- my $code = GetAuthorisedValueByCode( 'LOST', $item->{'itemlost'} );
+ my $av = Koha::AuthorisedValues->search({ category => 'LOST', authorised_value => $item->{itemlost} });
+ my $code = $av->count ? $av->next->lib : '';
$needsconfirmation{ITEM_LOST} = $code if ( C4::Context->preference("IssueLostItem") eq 'confirm' );
$alerts{ITEM_LOST} = $code if ( C4::Context->preference("IssueLostItem") eq 'alert' );
}
if ( $rentalConfirmation ){
my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} );
if ( $rentalCharge > 0 ){
- $rentalCharge = sprintf("%.02f", $rentalCharge);
$needsconfirmation{RENTALCHARGE} = $rentalCharge;
}
}
- #
- # CHECK IF BOOK ALREADY ISSUED TO THIS BORROWER
- #
- if ( $issue->{borrowernumber} && $issue->{borrowernumber} eq $borrower->{'borrowernumber'} ){
-
- # Already issued to current borrower.
- # If it is an on-site checkout if it can be switched to a normal checkout
- # or ask whether the loan should be renewed
-
- if ( $issue->{onsite_checkout}
- and C4::Context->preference('SwitchOnSiteCheckouts') ) {
- $messages{ONSITE_CHECKOUT_WILL_BE_SWITCHED} = 1;
- } else {
- my ($CanBookBeRenewed,$renewerror) = CanBookBeRenewed(
- $borrower->{'borrowernumber'},
- $item->{'itemnumber'},
- );
- if ( $CanBookBeRenewed == 0 ) { # no more renewals allowed
- if ( $renewerror eq 'onsite_checkout' ) {
- $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1;
- }
- else {
- $issuingimpossible{NO_MORE_RENEWALS} = 1;
- }
- }
- else {
- $needsconfirmation{RENEW_ISSUE} = 1;
- }
- }
- }
- elsif ($issue->{borrowernumber}) {
-
- # issued to someone else
- my $currborinfo = C4::Members::GetMember( borrowernumber => $issue->{borrowernumber} );
-
-
- my ( $can_be_returned, $message ) = CanBookBeReturned( $item, C4::Context->userenv->{branch} );
-
- unless ( $can_be_returned ) {
- $issuingimpossible{RETURN_IMPOSSIBLE} = 1;
- $issuingimpossible{branch_to_return} = $message;
- } else {
- $needsconfirmation{ISSUED_TO_ANOTHER} = 1;
- $needsconfirmation{issued_firstname} = $currborinfo->{'firstname'};
- $needsconfirmation{issued_surname} = $currborinfo->{'surname'};
- $needsconfirmation{issued_cardnumber} = $currborinfo->{'cardnumber'};
- $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'};
- }
- }
-
unless ( $ignore_reserves ) {
# See if the item is on reserve.
my ( $restype, $res ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} );
if ($restype) {
my $resbor = $res->{'borrowernumber'};
if ( $resbor ne $borrower->{'borrowernumber'} ) {
- my ( $resborrower ) = C4::Members::GetMember( borrowernumber => $resbor );
+ my $patron = Koha::Patrons->find( $resbor );
if ( $restype eq "Waiting" )
{
# The item is on reserve and waiting, but has been
# reserved by some other patron.
$needsconfirmation{RESERVE_WAITING} = 1;
- $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
- $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
- $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
- $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+ $needsconfirmation{'resfirstname'} = $patron->firstname;
+ $needsconfirmation{'ressurname'} = $patron->surname;
+ $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
+ $needsconfirmation{'resborrowernumber'} = $patron->borrowernumber;
$needsconfirmation{'resbranchcode'} = $res->{branchcode};
$needsconfirmation{'reswaitingdate'} = $res->{'waitingdate'};
}
elsif ( $restype eq "Reserved" ) {
# The item is on reserve for someone else.
$needsconfirmation{RESERVED} = 1;
- $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
- $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
- $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
- $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
- $needsconfirmation{'resbranchcode'} = $res->{branchcode};
- $needsconfirmation{'resreservedate'} = $res->{'reservedate'};
+ $needsconfirmation{'resfirstname'} = $patron->firstname;
+ $needsconfirmation{'ressurname'} = $patron->surname;
+ $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
+ $needsconfirmation{'resborrowernumber'} = $patron->borrowernumber;
+ $needsconfirmation{'resbranchcode'} = $patron->branchcode;
+ $needsconfirmation{'resreservedate'} = $res->{reservedate};
}
}
}
require C4::Serials;
my $is_a_subscription = C4::Serials::CountSubscriptionFromBiblionumber($biblionumber);
unless ($is_a_subscription) {
- my $issues = GetIssues( {
- borrowernumber => $borrower->{borrowernumber},
- biblionumber => $biblionumber,
- } );
- my @issues = $issues ? @$issues : ();
+ my $checkouts = Koha::Checkouts->search(
+ {
+ borrowernumber => $borrower->{borrowernumber},
+ biblionumber => $biblionumber,
+ },
+ {
+ join => 'item',
+ }
+ );
# if we get here, we don't already have a loan on this item,
# so if there are any loans on this bib, ask for confirmation
- if (scalar @issues > 0) {
+ if ( $checkouts->count ) {
$needsconfirmation{BIBLIO_ALREADY_ISSUED} = 1;
}
}
sub checkHighHolds {
my ( $item, $borrower ) = @_;
- my $biblio = GetBiblioFromItemNumber( $item->{itemnumber} );
my $branch = _GetCircControlBranch( $item, $borrower );
+ my $item_object = Koha::Items->find( $item->{itemnumber} );
my $return_data = {
exceeded => 0,
my $calendar = Koha::Calendar->new( branchcode => $branch );
- my $itype =
- ( C4::Context->preference('item-level_itypes') )
- ? $biblio->{'itype'}
- : $biblio->{'itemtype'};
-
+ my $itype = $item_object->effective_itemtype;
my $orig_due = C4::Circulation::CalcDateDue( $issuedate, $itype, $branch, $borrower );
my $decreaseLoanHighHoldsDuration = C4::Context->preference('decreaseLoanHighHoldsDuration');
my $reduced_datedue = $calendar->addDate( $issuedate, $decreaseLoanHighHoldsDuration );
+ $reduced_datedue->set_hour($orig_due->hour);
+ $reduced_datedue->set_minute($orig_due->minute);
+ $reduced_datedue->truncate( to => 'minute' );
if ( DateTime->compare( $reduced_datedue, $orig_due ) == -1 ) {
$return_data->{exceeded} = 1;
=over 4
-=item C<$borrower> is a hash with borrower informations (from GetMember or GetMemberDetails).
+=item C<$borrower> is a hash with borrower informations (from Koha::Patron->unblessed).
=item C<$barcode> is the barcode of the item being issued.
# find which item we issue
my $item = GetItem( '', $barcode )
or return; # if we don't get an Item, abort.
+ my $item_object = Koha::Items->find( { barcode => $barcode } );
my $branch = _GetCircControlBranch( $item, $borrower );
# get actual issuing if there is one
- my $actualissue = GetItemIssue( $item->{itemnumber} );
-
- # get biblioinformation for this item
- my $biblio = GetBiblioFromItemNumber( $item->{itemnumber} );
+ my $actualissue = Koha::Checkouts->find( { itemnumber => $item->{itemnumber} } );
# check if we just renew the issue.
- if ( $actualissue->{borrowernumber} eq $borrower->{'borrowernumber'}
+ if ( $actualissue and $actualissue->borrowernumber eq $borrower->{'borrowernumber'}
and not $switch_onsite_checkout ) {
$datedue = AddRenewal(
$borrower->{'borrowernumber'},
}
else {
# it's NOT a renewal
- if ( $actualissue->{borrowernumber}
- and not $switch_onsite_checkout ) {
+ if ( $actualissue and not $switch_onsite_checkout ) {
# This book is currently on loan, but not to the person
# who wants to borrow it now. mark it returned before issuing to the new borrower
my ( $allowed, $message ) = CanBookBeReturned( $item, C4::Context->userenv->{branch} );
# If automatic renewal wasn't selected while issuing, set the value according to the issuing rule.
unless ($auto_renew) {
- my $issuingrule = GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branch );
- $auto_renew = $issuingrule->{auto_renew};
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $borrower->{categorycode},
+ itemtype => $item->{itype},
+ branchcode => $branch
+ }
+ );
+
+ $auto_renew = $issuing_rule->auto_renew if $issuing_rule;
}
# Record in the database the fact that the book was issued.
unless ($datedue) {
- my $itype =
- ( C4::Context->preference('item-level_itypes') )
- ? $biblio->{'itype'}
- : $biblio->{'itemtype'};
+ my $itype = $item_object->effective_itemtype;
$datedue = CalcDateDue( $issuedate, $itype, $branch, $borrower );
}
}
);
}
+ logaction(
+ "CIRCULATION", "ISSUE",
+ $borrower->{'borrowernumber'},
+ $item->{'itemnumber'}
+ ) if C4::Context->preference("IssueLog");
}
-
- logaction(
- "CIRCULATION", "ISSUE",
- $borrower->{'borrowernumber'},
- $biblio->{'itemnumber'}
- ) if C4::Context->preference("IssueLog");
}
return $issue;
}
sub GetHardDueDate {
my ( $borrowertype, $itemtype, $branchcode ) = @_;
- my $rule = GetIssuingRule( $borrowertype, $itemtype, $branchcode );
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $borrowertype,
+ itemtype => $itemtype,
+ branchcode => $branchcode
+ }
+ );
+
- if ( defined( $rule ) ) {
- if ( $rule->{hardduedate} ) {
- return (dt_from_string($rule->{hardduedate}, 'iso'),$rule->{hardduedatecompare});
+ if ( defined( $issuing_rule ) ) {
+ if ( $issuing_rule->hardduedate ) {
+ return (dt_from_string($issuing_rule->hardduedate, 'iso'),$issuing_rule->hardduedatecompare);
} else {
return (undef, undef);
}
}
}
-=head2 GetIssuingRule
-
- my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)
-
-FIXME - This is a copy-paste of GetLoanLength
-as a stop-gap. Do not wish to change API for GetLoanLength
-this close to release.
-
-Get the issuing rule for an itemtype, a borrower type and a branch
-Returns a hashref from the issuingrules table.
-
-=cut
-
-sub GetIssuingRule {
- my ( $borrowertype, $itemtype, $branchcode ) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=?" );
- my $irule;
-
- $sth->execute( $borrowertype, $itemtype, $branchcode );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( $borrowertype, "*", $branchcode );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( "*", $itemtype, $branchcode );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( "*", "*", $branchcode );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( $borrowertype, $itemtype, "*" );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( $borrowertype, "*", "*" );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( "*", $itemtype, "*" );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- $sth->execute( "*", "*", "*" );
- $irule = $sth->fetchrow_hashref;
- return $irule if defined($irule) ;
-
- # if no rule matches,
- return;
-}
-
=head2 GetBranchBorrowerCircRule
my $branch_cat_rule = GetBranchBorrowerCircRule($branchcode, $categorycode);
}
$branch = C4::Context->userenv->{'branch'} unless $branch; # we trust userenv to be a safe fallback/default
my $messages;
- my $borrower;
- my $biblio;
+ my $patron;
my $doreturn = 1;
my $validTransfert = 0;
my $stat_type = 'return';
# get information on item
- my $itemnumber = GetItemnumberFromBarcode( $barcode );
- unless ($itemnumber) {
- return (0, { BadBarcode => $barcode }); # no barcode means no item or borrower. bail out.
+ my $item = GetItem( undef, $barcode );
+ unless ($item) {
+ return ( 0, { BadBarcode => $barcode } ); # no barcode means no item or borrower. bail out.
}
- my $issue = GetItemIssue($itemnumber);
- if ($issue and $issue->{borrowernumber}) {
- $borrower = C4::Members::GetMemberDetails($issue->{borrowernumber})
- or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '$issue->{borrowernumber}'\n"
- . Dumper($issue) . "\n";
+
+ my $itemnumber = $item->{ itemnumber };
+ my $itemtype = $item->{itype}; # GetItem called effective_itemtype
+
+ my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } );
+ if ( $issue ) {
+ $patron = Koha::Patrons->find( $issue->borrowernumber )
+ or die "Data inconsistency: barcode $barcode (itemnumber:$itemnumber) claims to be issued to non-existent borrowernumber '" . $issue->borrowernumber . "'\n"
+ . Dumper($issue->unblessed) . "\n";
} else {
$messages->{'NotIssued'} = $barcode;
# even though item is not on loan, it may still be transferred; therefore, get current branch info
}
}
- my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
-
if ( $item->{'location'} eq 'PROC' ) {
if ( C4::Context->preference("InProcessingToShelvingCart") ) {
$item->{'location'} = 'CART';
}
# full item data, but no borrowernumber or checkout info (no issue)
- # we know GetItem should work because GetItemnumberFromBarcode worked
my $hbr = GetBranchItemRule($item->{'homebranch'}, $item->{'itype'})->{'returnbranch'} || "homebranch";
# get the proper branch to which to return the item
my $returnbranch = $item->{$hbr} || $branch ;
# if $hbr was "noreturn" or any other non-item table value, then it should 'float' (i.e. stay at this branch)
- my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not
+ my $borrowernumber = $patron ? $patron->borrowernumber : undef; # we don't know if we had a borrower or not
+ my $patron_unblessed = $patron ? $patron->unblessed : {};
my $yaml = C4::Context->preference('UpdateNotForLoanStatusOnCheckin');
if ($yaml) {
Rightbranch => $message
};
$doreturn = 0;
- return ( $doreturn, $messages, $issue, $borrower );
+ return ( $doreturn, $messages, $issue, $patron_unblessed);
}
if ( $item->{'withdrawn'} ) { # book has been cancelled
my $today = DateTime->now( time_zone => C4::Context->tz() );
if ($doreturn) {
- my $datedue = $issue->{date_due};
- $borrower or warn "AddReturn without current borrower";
+ my $is_overdue;
+ die "The item is not issed and cannot be returned" unless $issue; # Just in case...
+ $patron or warn "AddReturn without current borrower";
my $circControlBranch;
if ($dropbox) {
# define circControlBranch only if dropbox mode is set
# don't allow dropbox mode to create an invalid entry in issues (issuedate > today)
# FIXME: check issuedate > returndate, factoring in holidays
- $circControlBranch = _GetCircControlBranch($item,$borrower);
- $issue->{'overdue'} = DateTime->compare($issue->{'date_due'}, $dropboxdate ) == -1 ? 1 : 0;
+ $circControlBranch = _GetCircControlBranch($item,$patron_unblessed);
+ $is_overdue = $issue->is_overdue( $dropboxdate );
+ } else {
+ $is_overdue = $issue->is_overdue;
}
- if ($borrowernumber) {
- if ( ( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'} ) || $return_date ) {
- _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $borrower, return_date => $return_date } );
- }
-
+ if ($patron) {
eval {
MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
- $circControlBranch, $return_date, $borrower->{'privacy'} );
+ $circControlBranch, $return_date, $patron->privacy );
};
- if ( $@ ) {
- $messages->{'Wrongbranch'} = {
- Wrongbranch => $branch,
- Rightbranch => $message
- };
- carp $@;
- return ( 0, { WasReturned => 0 }, $issue, $borrower );
+ unless ( $@ ) {
+ if ( ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) || $return_date ) {
+ _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $patron_unblessed, return_date => $return_date } );
+ }
+ } else {
+ carp "The checkin for the following issue failed, Please go to the about page, section 'data corrupted' to know how to fix this problem ($@)" . Dumper( $issue->unblessed );
+
+ return ( 0, { WasReturned => 0, DataCorrupted => 1 }, $issue, $patron_unblessed );
}
# FIXME is the "= 1" right? This could be the borrower hash.
}
- ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'});
+ ModItem({ onloan => undef }, $item->{biblionumber}, $item->{'itemnumber'});
}
# the holdingbranch is updated if the document is returned to another location.
if ($borrowernumber) {
my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->{itemnumber}...) failed!"; # zero is OK, check defined
-
- if ( $issue->{overdue} && $issue->{date_due} ) {
+
+ if ( $issue and $issue->is_overdue ) {
# fix fine days
$today = $dropboxdate if $dropbox;
- my ($debardate,$reminder) = _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today );
+ my ($debardate,$reminder) = _debar_user_on_return( $patron_unblessed, $item, dt_from_string($issue->date_due), $today );
if ($reminder){
$messages->{'PrevDebarred'} = $debardate;
} else {
$messages->{'Debarred'} = $debardate if $debardate;
}
# there's no overdue on the item but borrower had been previously debarred
- } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
- if ( $borrower->{debarred} eq "9999-12-31") {
- $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
+ } elsif ( $issue->date_due and $patron->debarred ) {
+ if ( $patron->debarred eq "9999-12-31") {
+ $messages->{'ForeverDebarred'} = $patron->debarred;
} else {
- my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
+ my $borrower_debar_dt = dt_from_string( $patron->debarred );
$borrower_debar_dt->truncate(to => 'day');
my $today_dt = $today->clone()->truncate(to => 'day');
if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
- $messages->{'PrevDebarred'} = $borrower->{'debarred'};
+ $messages->{'PrevDebarred'} = $patron->debarred;
}
}
}
}
# Record the fact that this book was returned.
- # FIXME itemtype should record item level type, not bibliolevel type
UpdateStats({
- branch => $branch,
- type => $stat_type,
- itemnumber => $item->{'itemnumber'},
- itemtype => $biblio->{'itemtype'},
- borrowernumber => $borrowernumber,
- ccode => $item->{'ccode'}}
- );
+ branch => $branch,
+ type => $stat_type,
+ itemnumber => $itemnumber,
+ itemtype => $itemtype,
+ borrowernumber => $borrowernumber,
+ ccode => $item->{ ccode }
+ });
+
+ # Send a check-in slip. # NOTE: borrower may be undef. Do not try to send messages then.
+ if ( $patron ) {
+ my $circulation_alert = 'C4::ItemCirculationAlertPreference';
+ my %conditions = (
+ branchcode => $branch,
+ categorycode => $patron->categorycode,
+ item_type => $item->{itype},
+ notification => 'CHECKIN',
+ );
+ if ($doreturn && $circulation_alert->is_enabled_for(\%conditions)) {
+ SendCirculationAlert({
+ type => 'CHECKIN',
+ item => $item,
+ borrower => $patron->unblessed,
+ branch => $branch,
+ });
+ }
+
+ logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'itemnumber'})
+ if C4::Context->preference("ReturnLog");
+ }
- # Send a check-in slip. # NOTE: borrower may be undef. probably shouldn't try to send messages then.
- my $circulation_alert = 'C4::ItemCirculationAlertPreference';
- my %conditions = (
- branchcode => $branch,
- categorycode => $borrower->{categorycode},
- item_type => $item->{itype},
- notification => 'CHECKIN',
- );
- if ($doreturn && $circulation_alert->is_enabled_for(\%conditions)) {
- SendCirculationAlert({
- type => 'CHECKIN',
- item => $item,
- borrower => $borrower,
- branch => $branch,
- });
- }
-
- logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'itemnumber'})
- if C4::Context->preference("ReturnLog");
-
# Remove any OVERDUES related debarment if the borrower has no overdues
if ( $borrowernumber
- && $borrower->{'debarred'}
+ && $patron->debarred
&& C4::Context->preference('AutoRemoveOverduesRestrictions')
&& !Koha::Patrons->find( $borrowernumber )->has_overdues
&& @{ GetDebarments({ borrowernumber => $borrowernumber, type => 'OVERDUES' }) }
}
}
- return ( $doreturn, $messages, $issue, $borrower );
+ return ( $doreturn, $messages, $issue, ( $patron ? $patron->unblessed : {} ));
}
=head2 MarkIssueReturned
# Note that a warning should appear on the about page (System information tab).
$anonymouspatron = C4::Context->preference('AnonymousPatron');
die "Fatal error: the patron ($borrowernumber) has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or not set correctly."
- unless C4::Members::GetMember( borrowernumber => $anonymouspatron );
+ unless Koha::Patrons->find( $anonymouspatron );
}
+ my $database = Koha::Database->new();
+ my $schema = $database->schema;
my $dbh = C4::Context->dbh;
+
+ my $issue_id = $dbh->selectrow_array(
+ q|SELECT issue_id FROM issues WHERE itemnumber = ?|,
+ undef, $itemnumber
+ );
+
my $query = 'UPDATE issues SET returndate=';
my @bind;
if ($dropbox_branch) {
} else {
$query .= ' now() ';
}
- $query .= ' WHERE borrowernumber = ? AND itemnumber = ?';
- push @bind, $borrowernumber, $itemnumber;
- # FIXME transaction
- my $sth_upd = $dbh->prepare($query);
- $sth_upd->execute(@bind);
- my $sth_copy = $dbh->prepare('INSERT INTO old_issues SELECT * FROM issues
- WHERE borrowernumber = ?
- AND itemnumber = ?');
- $sth_copy->execute($borrowernumber, $itemnumber);
- # anonymise patron checkout immediately if $privacy set to 2 and AnonymousPatron is set to a valid borrowernumber
- if ( $privacy == 2) {
- my $sth_ano = $dbh->prepare("UPDATE old_issues SET borrowernumber=?
- WHERE borrowernumber = ?
- AND itemnumber = ?");
- $sth_ano->execute($anonymouspatron, $borrowernumber, $itemnumber);
- }
- my $sth_del = $dbh->prepare("DELETE FROM issues
- WHERE borrowernumber = ?
- AND itemnumber = ?");
- $sth_del->execute($borrowernumber, $itemnumber);
+ $query .= ' WHERE issue_id = ?';
+ push @bind, $issue_id;
- ModItem( { 'onloan' => undef }, undef, $itemnumber );
+ # FIXME Improve the return value and handle it from callers
+ $schema->txn_do(sub {
- if ( C4::Context->preference('StoreLastBorrower') ) {
- my $item = Koha::Items->find( $itemnumber );
- my $patron = Koha::Patrons->find( $borrowernumber );
- $item->last_returned_by( $patron );
- }
+ # Update the returndate
+ $dbh->do( $query, undef, @bind );
+
+ # Retrieve the issue
+ my $issue = Koha::Checkouts->find( $issue_id ); # FIXME should be fetched earlier
+
+ # Create the old_issues entry
+ my $old_checkout = Koha::Old::Checkout->new($issue->unblessed)->store;
+
+ # anonymise patron checkout immediately if $privacy set to 2 and AnonymousPatron is set to a valid borrowernumber
+ if ( $privacy == 2) {
+ $dbh->do(q|UPDATE old_issues SET borrowernumber=? WHERE issue_id = ?|, undef, $anonymouspatron, $old_checkout->issue_id);
+ }
+
+ # And finally delete the issue
+ $issue->delete;
+
+ ModItem( { 'onloan' => undef }, undef, $itemnumber );
+
+ if ( C4::Context->preference('StoreLastBorrower') ) {
+ my $item = Koha::Items->find( $itemnumber );
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ $item->last_returned_by( $patron );
+ }
+ });
+
+ return $issue_id;
}
=head2 _debar_user_on_return
C<$datedue> date due DateTime object
-C<$today> DateTime object representing the return time
+C<$return_date> DateTime object representing the return time
Internal function, called only by AddReturn that calculates and updates
- the user fine days, and debars him if necessary.
+ the user fine days, and debars them if necessary.
Should only be called for overdue returns
=cut
sub _debar_user_on_return {
- my ( $borrower, $item, $dt_due, $dt_today ) = @_;
+ my ( $borrower, $item, $dt_due, $return_date ) = @_;
my $branchcode = _GetCircControlBranch( $item, $borrower );
my $circcontrol = C4::Context->preference('CircControl');
- my $issuingrule =
- GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
- my $finedays = $issuingrule->{finedays};
- my $unit = $issuingrule->{lengthunit};
- my $chargeable_units = C4::Overdues::get_chargeable_units($unit, $dt_due, $dt_today, $branchcode);
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $borrower->{categorycode},
+ itemtype => $item->{itype},
+ branchcode => $branchcode
+ }
+ );
+ my $finedays = $issuing_rule ? $issuing_rule->finedays : undef;
+ my $unit = $issuing_rule ? $issuing_rule->lengthunit : undef;
+ my $chargeable_units = C4::Overdues::get_chargeable_units($unit, $dt_due, $return_date, $branchcode);
if ($finedays) {
# grace period is measured in the same units as the loan
my $grace =
- DateTime::Duration->new( $unit => $issuingrule->{firstremind} );
+ DateTime::Duration->new( $unit => $issuing_rule->firstremind );
my $deltadays = DateTime::Duration->new(
days => $chargeable_units
# If the max suspension days is < than the suspension days
# the suspension days is limited to this maximum period.
- my $max_sd = $issuingrule->{maxsuspensiondays};
+ my $max_sd = $issuing_rule->maxsuspensiondays;
if ( defined $max_sd ) {
$max_sd = DateTime::Duration->new( days => $max_sd );
$suspension_days = $max_sd
if DateTime::Duration->compare( $max_sd, $suspension_days ) < 0;
}
+ my ( $has_been_extended, $is_a_reminder );
+ if ( C4::Context->preference('CumulativeRestrictionPeriods') and $borrower->{debarred} ) {
+ my $debarment = @{ GetDebarments( { borrowernumber => $borrower->{borrowernumber}, type => 'SUSPENSION' } ) }[0];
+ if ( $debarment ) {
+ $return_date = dt_from_string( $debarment->{expiration}, 'sql' );
+ $has_been_extended = 1;
+ }
+ }
+
my $new_debar_dt =
- $dt_today->clone()->add_duration( $suspension_days );
+ $return_date->clone()->add_duration( $suspension_days );
Koha::Patron::Debarments::AddUniqueDebarment({
borrowernumber => $borrower->{borrowernumber},
});
# if borrower was already debarred but does not get an extra debarment
my $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
+ my $new_debarment_str;
if ( $borrower->{debarred} eq $patron->is_debarred ) {
- return ($borrower->{debarred},1);
+ $is_a_reminder = 1;
+ $new_debarment_str = $borrower->{debarred};
+ } else {
+ $new_debarment_str = $new_debar_dt->ymd();
}
- return $new_debar_dt->ymd();
+ # FIXME Should return a DateTime object
+ return $new_debarment_str, $is_a_reminder;
}
}
return;
return $branch;
}
-
-
-
-
-
-=head2 GetItemIssue
-
- $issue = &GetItemIssue($itemnumber);
-
-Returns patron currently having a book, or undef if not checked out.
-
-C<$itemnumber> is the itemnumber.
-
-C<$issue> is a hashref of the row from the issues table.
-
-=cut
-
-sub GetItemIssue {
- my ($itemnumber) = @_;
- return unless $itemnumber;
- my $sth = C4::Context->dbh->prepare(
- "SELECT items.*, issues.*
- FROM issues
- LEFT JOIN items ON issues.itemnumber=items.itemnumber
- WHERE issues.itemnumber=?");
- $sth->execute($itemnumber);
- my $data = $sth->fetchrow_hashref;
- return unless $data;
- $data->{issuedate_sql} = $data->{issuedate};
- $data->{date_due_sql} = $data->{date_due};
- $data->{issuedate} = dt_from_string($data->{issuedate}, 'sql');
- $data->{issuedate}->truncate(to => 'minute');
- $data->{date_due} = dt_from_string($data->{date_due}, 'sql');
- $data->{date_due}->truncate(to => 'minute');
- my $dt = DateTime->now( time_zone => C4::Context->tz)->truncate( to => 'minute');
- $data->{'overdue'} = DateTime->compare($data->{'date_due'}, $dt ) == -1 ? 1 : 0;
- return $data;
-}
-
=head2 GetOpenIssue
$issue = GetOpenIssue( $itemnumber );
}
-=head2 GetIssues
-
- $issues = GetIssues({}); # return all issues!
- $issues = GetIssues({ borrowernumber => $borrowernumber, biblionumber => $biblionumber });
-
-Returns all pending issues that match given criteria.
-Returns a arrayref or undef if an error occurs.
-
-Allowed criteria are:
-
-=over 2
-
-=item * borrowernumber
-
-=item * biblionumber
-
-=item * itemnumber
-
-=back
-
-=cut
-
-sub GetIssues {
- my ($criteria) = @_;
-
- # Build filters
- my @filters;
- my @allowed = qw(borrowernumber biblionumber itemnumber);
- foreach (@allowed) {
- if (defined $criteria->{$_}) {
- push @filters, {
- field => $_,
- value => $criteria->{$_},
- };
- }
- }
-
- # Do we need to join other tables ?
- my %join;
- if (defined $criteria->{biblionumber}) {
- $join{items} = 1;
- }
-
- # Build SQL query
- my $where = '';
- if (@filters) {
- $where = "WHERE " . join(' AND ', map { "$_->{field} = ?" } @filters);
- }
- my $query = q{
- SELECT issues.*
- FROM issues
- };
- if (defined $join{items}) {
- $query .= q{
- LEFT JOIN items ON (issues.itemnumber = items.itemnumber)
- };
- }
- $query .= $where;
-
- # Execute SQL query
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare($query);
- my $rv = $sth->execute(map { $_->{value} } @filters);
-
- return $rv ? $sth->fetchall_arrayref({}) : undef;
-}
-
-=head2 GetItemIssues
-
- $issues = &GetItemIssues($itemnumber, $history);
-
-Returns patrons that have issued a book
-
-C<$itemnumber> is the itemnumber
-C<$history> is false if you just want the current "issuer" (if any)
-and true if you want issues history from old_issues also.
-
-Returns reference to an array of hashes
-
-=cut
-
-sub GetItemIssues {
- my ( $itemnumber, $history ) = @_;
-
- my $today = DateTime->now( time_zome => C4::Context->tz); # get today date
- $today->truncate( to => 'minute' );
- my $sql = "SELECT * FROM issues
- JOIN borrowers USING (borrowernumber)
- JOIN items USING (itemnumber)
- WHERE issues.itemnumber = ? ";
- if ($history) {
- $sql .= "UNION ALL
- SELECT * FROM old_issues
- LEFT JOIN borrowers USING (borrowernumber)
- JOIN items USING (itemnumber)
- WHERE old_issues.itemnumber = ? ";
- }
- $sql .= "ORDER BY date_due DESC";
- my $sth = C4::Context->dbh->prepare($sql);
- if ($history) {
- $sth->execute($itemnumber, $itemnumber);
- } else {
- $sth->execute($itemnumber);
- }
- my $results = $sth->fetchall_arrayref({});
- foreach (@$results) {
- my $date_due = dt_from_string($_->{date_due},'sql');
- $date_due->truncate( to => 'minute' );
-
- $_->{overdue} = (DateTime->compare($date_due, $today) == -1) ? 1 : 0;
- }
- return $results;
-}
-
=head2 GetBiblioIssues
$issues = GetBiblioIssues($biblionumber);
my $renews = 1;
my $item = GetItem($itemnumber) or return ( 0, 'no_item' );
- my $itemissue = GetItemIssue($itemnumber) or return ( 0, 'no_checkout' );
- return ( 0, 'onsite_checkout' ) if $itemissue->{onsite_checkout};
+ my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return ( 0, 'no_checkout' );
+ return ( 0, 'onsite_checkout' ) if $issue->onsite_checkout;
- $borrowernumber ||= $itemissue->{borrowernumber};
- my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber )
+ $borrowernumber ||= $issue->borrowernumber;
+ my $patron = Koha::Patrons->find( $borrowernumber )
or return;
my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
# can be filled with available items. We can get the union of the sets simply
# by pushing all the elements onto an array and removing the duplicates.
my @reservable;
- foreach my $b (@borrowernumbers) {
- my ($borr) = C4::Members::GetMemberDetails($b);
- foreach my $i (@itemnumbers) {
- my $item = GetItem($i);
- if ( IsAvailableForItemLevelRequest( $item, $borr )
- && CanItemBeReserved( $b, $i )
- && !IsItemOnHoldAndFound($i) )
- {
- push( @reservable, $i );
+ my %borrowers;
+ ITEM: foreach my $i (@itemnumbers) {
+ my $item = GetItem($i);
+ next if IsItemOnHoldAndFound($i);
+ for my $b (@borrowernumbers) {
+ my $borr = $borrowers{$b} //= Koha::Patrons->find( $b )->unblessed;
+ next unless IsAvailableForItemLevelRequest($item, $borr);
+ next unless CanItemBeReserved($b,$i);
+
+ push @reservable, $i;
+ if (@reservable >= @borrowernumbers) {
+ $resfound = 0;
+ last ITEM;
}
+ last;
}
}
-
- @reservable = uniq(@reservable);
-
- if ( @reservable >= @borrowernumbers ) {
- $resfound = 0;
- }
}
}
return ( 0, "on_reserve" ) if $resfound; # '' when no hold was found
return ( 1, undef ) if $override_limit;
- my $branchcode = _GetCircControlBranch( $item, $borrower );
- my $issuingrule =
- GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $patron->categorycode,
+ itemtype => $item->{itype},
+ branchcode => $branchcode
+ }
+ );
return ( 0, "too_many" )
- if $issuingrule->{renewalsallowed} <= $itemissue->{renewals};
+ if not $issuing_rule or $issuing_rule->renewalsallowed <= $issue->renewals;
my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
my $restrictionblockrenewing = C4::Context->preference('RestrictionBlockRenewing');
- my $patron = Koha::Patrons->find($borrowernumber);
+ $patron = Koha::Patrons->find($borrowernumber); # FIXME Is this really useful?
my $restricted = $patron->is_debarred;
my $hasoverdues = $patron->has_overdues;
if ( $restricted and $restrictionblockrenewing ) {
return ( 0, 'restriction');
- } elsif ( ($hasoverdues and $overduesblockrenewing eq 'block') || ($itemissue->{overdue} and $overduesblockrenewing eq 'blockitem') ) {
+ } elsif ( ($hasoverdues and $overduesblockrenewing eq 'block') || ($issue->is_overdue and $overduesblockrenewing eq 'blockitem') ) {
return ( 0, 'overdue');
}
- if ( defined $issuingrule->{norenewalbefore}
- and $issuingrule->{norenewalbefore} ne "" )
+ if ( $issue->auto_renew ) {
+ if ( defined $issuing_rule->no_auto_renewal_after
+ and $issuing_rule->no_auto_renewal_after ne "" ) {
+ # Get issue_date and add no_auto_renewal_after
+ # If this is greater than today, it's too late for renewal.
+ my $maximum_renewal_date = dt_from_string($issue->issuedate, 'sql');
+ $maximum_renewal_date->add(
+ $issuing_rule->lengthunit => $issuing_rule->no_auto_renewal_after
+ );
+ my $now = dt_from_string;
+ if ( $now >= $maximum_renewal_date ) {
+ return ( 0, "auto_too_late" );
+ }
+ }
+ if ( defined $issuing_rule->no_auto_renewal_after_hard_limit
+ and $issuing_rule->no_auto_renewal_after_hard_limit ne "" ) {
+ # If no_auto_renewal_after_hard_limit is >= today, it's also too late for renewal
+ if ( dt_from_string >= dt_from_string( $issuing_rule->no_auto_renewal_after_hard_limit ) ) {
+ return ( 0, "auto_too_late" );
+ }
+ }
+
+ if ( C4::Context->preference('OPACFineNoRenewalsBlockAutoRenew') ) {
+ my $fine_no_renewals = C4::Context->preference("OPACFineNoRenewals");
+ my ( $amountoutstanding ) = C4::Members::GetMemberAccountRecords($patron->borrowernumber);
+ if ( $amountoutstanding and $amountoutstanding > $fine_no_renewals ) {
+ return ( 0, "auto_too_much_oweing" );
+ }
+ }
+ }
+
+ if ( defined $issuing_rule->norenewalbefore
+ and $issuing_rule->norenewalbefore ne "" )
{
# Calculate soonest renewal by subtracting 'No renewal before' from due date
- my $soonestrenewal =
- $itemissue->{date_due}->clone()
- ->subtract(
- $issuingrule->{lengthunit} => $issuingrule->{norenewalbefore} );
+ my $soonestrenewal = dt_from_string( $issue->date_due, 'sql' )->subtract(
+ $issuing_rule->lengthunit => $issuing_rule->norenewalbefore );
# Depending on syspref reset the exact time, only check the date
if ( C4::Context->preference('NoRenewalBeforePrecision') eq 'date'
- and $issuingrule->{lengthunit} eq 'days' )
+ and $issuing_rule->lengthunit eq 'days' )
{
$soonestrenewal->truncate( to => 'day' );
}
if ( $soonestrenewal > DateTime->now( time_zone => C4::Context->tz() ) )
{
- return ( 0, "auto_too_soon" ) if $itemissue->{auto_renew};
+ return ( 0, "auto_too_soon" ) if $issue->auto_renew;
return ( 0, "too_soon" );
}
- elsif ( $itemissue->{auto_renew} ) {
+ elsif ( $issue->auto_renew ) {
return ( 0, "auto_renew" );
}
}
# Fallback for automatic renewals:
# If norenewalbefore is undef, don't renew before due date.
- elsif ( $itemissue->{auto_renew} ) {
+ if ( $issue->auto_renew ) {
my $now = dt_from_string;
return ( 0, "auto_renew" )
- if $now >= $itemissue->{date_due};
+ if $now >= dt_from_string( $issue->date_due, 'sql' );
return ( 0, "auto_too_soon" );
}
my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
my $item = GetItem($itemnumber) or return;
- my $biblio = GetBiblioFromItemNumber($itemnumber) or return;
+ my $item_object = Koha::Items->find( $itemnumber ); # Should replace $item
+ my $biblio = $item_object->biblio;
my $dbh = C4::Context->dbh;
# Find the issues record for this book
- my $issuedata = GetItemIssue($itemnumber);
+ my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } );
- return unless ( $issuedata );
+ return unless $issue;
- $borrowernumber ||= $issuedata->{borrowernumber};
+ $borrowernumber ||= $issue->borrowernumber;
if ( defined $datedue && ref $datedue ne 'DateTime' ) {
carp 'Invalid date passed to AddRenewal.';
return;
}
- my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber ) or return;
+ my $patron = Koha::Patrons->find( $borrowernumber ) or return; # FIXME Should do more than just return
+ my $patron_unblessed = $patron->unblessed;
- if ( C4::Context->preference('CalculateFinesOnReturn') && $issuedata->{overdue} ) {
- _CalculateAndUpdateFine( { issue => $issuedata, item => $item, borrower => $borrower } );
+ if ( C4::Context->preference('CalculateFinesOnReturn') && $issue->is_overdue ) {
+ _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $patron_unblessed } );
}
_FixOverduesOnReturn( $borrowernumber, $itemnumber );
# based on the value of the RenewalPeriodBase syspref.
unless ($datedue) {
- my $itemtype = (C4::Context->preference('item-level_itypes')) ? $biblio->{'itype'} : $biblio->{'itemtype'};
-
+ my $itemtype = $item_object->effective_itemtype;
$datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
- dt_from_string( $issuedata->{date_due} ) :
+ dt_from_string( $issue->date_due, 'sql' ) :
DateTime->now( time_zone => C4::Context->tz());
- $datedue = CalcDateDue($datedue, $itemtype, $issuedata->{'branchcode'}, $borrower, 'is a renewal');
+ $datedue = CalcDateDue($datedue, $itemtype, _GetCircControlBranch($item, $patron_unblessed), $patron_unblessed, 'is a renewal');
}
# Update the issues record to have the new due date, and a new count
# of how many times it has been renewed.
- my $renews = $issuedata->{'renewals'} + 1;
+ my $renews = $issue->renewals + 1;
my $sth = $dbh->prepare("UPDATE issues SET date_due = ?, renewals = ?, lastreneweddate = ?
WHERE borrowernumber=?
AND itemnumber=?"
$sth->execute( $datedue->strftime('%Y-%m-%d %H:%M'), $renews, $lastreneweddate, $borrowernumber, $itemnumber );
# Update the renewal count on the item, and tell zebra to reindex
- $renews = $biblio->{'renewals'} + 1;
- ModItem({ renewals => $renews, onloan => $datedue->strftime('%Y-%m-%d %H:%M')}, $biblio->{'biblionumber'}, $itemnumber);
+ $renews = $item->{renewals} + 1;
+ ModItem({ renewals => $renews, onloan => $datedue->strftime('%Y-%m-%d %H:%M')}, $item->{biblionumber}, $itemnumber);
# Charge a new rental fee, if applicable?
my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber );
if ( $charge > 0 ) {
my $accountno = getnextacctno( $borrowernumber );
- my $item = GetBiblioFromItemNumber($itemnumber);
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
$sth = $dbh->prepare(
VALUES (now(),?,?,?,?,?,?,?,?)"
);
$sth->execute( $borrowernumber, $accountno, $charge, $manager_id,
- "Renewal of Rental Item $item->{'title'} $item->{'barcode'}",
+ "Renewal of Rental Item " . $biblio->title . " $item->{'barcode'}",
'Rent', $charge, $itemnumber );
}
# Send a renewal slip according to checkout alert preferencei
if ( C4::Context->preference('RenewalSendNotice') eq '1' ) {
- $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 );
my $circulation_alert = 'C4::ItemCirculationAlertPreference';
my %conditions = (
branchcode => $branch,
- categorycode => $borrower->{categorycode},
+ categorycode => $patron->categorycode,
item_type => $item->{itype},
notification => 'CHECKOUT',
);
{
type => 'RENEWAL',
item => $item,
- borrower => $borrower,
+ borrower => $patron->unblessed,
branch => $branch,
}
);
}
# Remove any OVERDUES related debarment if the borrower has no overdues
- $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
- if ( $borrowernumber
- && $borrower->{'debarred'}
- && !Koha::Patrons->find( $borrowernumber )->has_overdues
+ if ( $patron
+ && $patron->is_debarred
+ && ! $patron->has_overdues
&& @{ GetDebarments({ borrowernumber => $borrowernumber, type => 'OVERDUES' }) }
) {
DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
}
- # Log the renewal
- UpdateStats({branch => $branch,
- type => 'renew',
- amount => $charge,
- itemnumber => $itemnumber,
- itemtype => $item->{itype},
- borrowernumber => $borrowernumber,
- ccode => $item->{'ccode'}}
- );
- return $datedue;
+ unless ( C4::Context->interface eq 'opac' ) { #if from opac we are obeying OpacRenewalBranch as calculated in opac-renew.pl
+ $branch = C4::Context->userenv ? C4::Context->userenv->{branch} : $branch;
+ }
+
+ # Add the renewal to stats
+ UpdateStats(
+ {
+ branch => $branch,
+ type => 'renew',
+ amount => $charge,
+ itemnumber => $itemnumber,
+ itemtype => $item->{itype},
+ borrowernumber => $borrowernumber,
+ ccode => $item->{'ccode'}
+ }
+ );
+
+ #Log the renewal
+ logaction("CIRCULATION", "RENEWAL", $borrowernumber, $itemnumber) if C4::Context->preference("RenewalLog");
+ return $datedue;
}
sub GetRenewCount {
my $renewsallowed = 0;
my $renewsleft = 0;
- my $borrower = C4::Members::GetMember( borrowernumber => $bornum);
- my $item = GetItem($itemno);
+ my $patron = Koha::Patrons->find( $bornum );
+ my $item = GetItem($itemno);
+
+ return (0, 0, 0) unless $patron or $item; # Wrong call, no renewal allowed
# Look in the issues table for this item, lent to this borrower,
# and not yet returned.
my $data = $sth->fetchrow_hashref;
$renewcount = $data->{'renewals'} if $data->{'renewals'};
# $item and $borrower should be calculated
- my $branchcode = _GetCircControlBranch($item, $borrower);
-
- my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
-
- $renewsallowed = $issuingrule->{'renewalsallowed'};
+ my $branchcode = _GetCircControlBranch($item, $patron->unblessed);
+
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $patron->categorycode,
+ itemtype => $item->{itype},
+ branchcode => $branchcode
+ }
+ );
+
+ $renewsallowed = $issuing_rule ? $issuing_rule->renewalsallowed : 0;
$renewsleft = $renewsallowed - $renewcount;
if($renewsleft < 0){ $renewsleft = 0; }
return ( $renewcount, $renewsallowed, $renewsleft );
my $dbh = C4::Context->dbh;
my $item = GetItem($itemnumber) or return;
- my $itemissue = GetItemIssue($itemnumber) or return;
+ my $itemissue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return;
- $borrowernumber ||= $itemissue->{borrowernumber};
- my $borrower = C4::Members::GetMemberDetails($borrowernumber)
+ $borrowernumber ||= $itemissue->borrowernumber;
+ my $patron = Koha::Patrons->find( $borrowernumber )
or return;
- my $branchcode = _GetCircControlBranch( $item, $borrower );
- my $issuingrule =
- GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $patron->categorycode,
+ itemtype => $item->{itype},
+ branchcode => $branchcode
+ }
+ );
my $now = dt_from_string;
+ return $now unless $issuing_rule;
- if ( defined $issuingrule->{norenewalbefore}
- and $issuingrule->{norenewalbefore} ne "" )
+ if ( defined $issuing_rule->norenewalbefore
+ and $issuing_rule->norenewalbefore ne "" )
{
my $soonestrenewal =
- $itemissue->{date_due}->clone()
- ->subtract(
- $issuingrule->{lengthunit} => $issuingrule->{norenewalbefore} );
+ dt_from_string( $itemissue->date_due )->subtract(
+ $issuing_rule->lengthunit => $issuing_rule->norenewalbefore );
if ( C4::Context->preference('NoRenewalBeforePrecision') eq 'date'
- and $issuingrule->{lengthunit} eq 'days' )
+ and $issuing_rule->lengthunit eq 'days' )
{
$soonestrenewal->truncate( to => 'day' );
}
return $now;
}
+=head2 GetLatestAutoRenewDate
+
+ $NoAutoRenewalAfterThisDate = &GetLatestAutoRenewDate($borrowernumber, $itemnumber);
+
+Find out the latest possible auto renew date of a borrowed item.
+
+C<$borrowernumber> is the borrower number of the patron who currently
+has the item on loan.
+
+C<$itemnumber> is the number of the item to renew.
+
+C<$GetLatestAutoRenewDate> returns the DateTime of the latest possible
+auto renew date, based on the value "No auto renewal after" and the "No auto
+renewal after (hard limit) of the applicable issuing rule.
+Returns undef if there is no date specify in the circ rules or if the patron, loan,
+or item cannot be found.
+
+=cut
+
+sub GetLatestAutoRenewDate {
+ my ( $borrowernumber, $itemnumber ) = @_;
+
+ my $dbh = C4::Context->dbh;
+
+ my $item = GetItem($itemnumber) or return;
+ my $itemissue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return;
+
+ $borrowernumber ||= $itemissue->borrowernumber;
+ my $patron = Koha::Patrons->find( $borrowernumber )
+ or return;
+
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
+ my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
+ { categorycode => $patron->categorycode,
+ itemtype => $item->{itype},
+ branchcode => $branchcode
+ }
+ );
+
+ return unless $issuing_rule;
+ return
+ if ( not $issuing_rule->no_auto_renewal_after
+ or $issuing_rule->no_auto_renewal_after eq '' )
+ and ( not $issuing_rule->no_auto_renewal_after_hard_limit
+ or $issuing_rule->no_auto_renewal_after_hard_limit eq '' );
+
+ my $maximum_renewal_date;
+ if ( $issuing_rule->no_auto_renewal_after ) {
+ $maximum_renewal_date = dt_from_string($itemissue->issuedate);
+ $maximum_renewal_date->add(
+ $issuing_rule->lengthunit => $issuing_rule->no_auto_renewal_after
+ );
+ }
+
+ if ( $issuing_rule->no_auto_renewal_after_hard_limit ) {
+ my $dt = dt_from_string( $issuing_rule->no_auto_renewal_after_hard_limit );
+ $maximum_renewal_date = $dt if not $maximum_renewal_date or $maximum_renewal_date > $dt;
+ }
+ return $maximum_renewal_date;
+}
+
+
=head2 GetIssuingCharges
($charge, $item_type) = &GetIssuingCharges($itemnumber, $borrowernumber);
my $discount = _get_discount_from_rule($discount_rules, $branch, $item_type);
$charge = ( $charge * ( 100 - $discount ) ) / 100;
}
+ if ($charge) {
+ $charge = sprintf '%.2f', $charge; # ensure no fractions of a penny returned
+ }
}
return ( $charge, $item_type );
my $query = '
SELECT datesent,
frombranch,
- tobranch
+ tobranch,
+ branchtransfer_id
FROM branchtransfers
WHERE itemnumber = ?
AND datearrived IS NULL
return unless ( $frombranch && $tobranch );
my $dbh = C4::Context->dbh;
my $query = "
- SELECT itemnumber,datesent,frombranch
+ SELECT branchtransfer_id,itemnumber,datesent,frombranch
FROM branchtransfers
WHERE frombranch=?
AND tobranch=?
return $sth->execute($itemnumber);
}
-=head2 AnonymiseIssueHistory
-
- ($rows,$err_history_not_deleted) = AnonymiseIssueHistory($date,$borrowernumber)
-
-This function write NULL instead of C<$borrowernumber> given on input arg into the table issues.
-if C<$borrowernumber> is not set, it will delete the issue history for all borrower older than C<$date>.
-
-If c<$borrowernumber> is set, it will delete issue history for only that borrower, regardless of their opac privacy
-setting (force delete).
-
-return the number of affected rows and a value that evaluates to true if an error occurred deleting the history.
-
-=cut
-
-sub AnonymiseIssueHistory {
- my $date = shift;
- my $borrowernumber = shift;
- my $dbh = C4::Context->dbh;
- my $query = "
- UPDATE old_issues
- SET borrowernumber = ?
- WHERE returndate < ?
- AND borrowernumber IS NOT NULL
- ";
-
- # The default of 0 does not work due to foreign key constraints
- # The anonymisation should not fail quietly if AnonymousPatron is not a valid entry
- # Set it to undef (NULL)
- my $anonymouspatron = C4::Context->preference('AnonymousPatron') || undef;
- my @bind_params = ($anonymouspatron, $date);
- if (defined $borrowernumber) {
- $query .= " AND borrowernumber = ?";
- push @bind_params, $borrowernumber;
- } else {
- $query .= " AND (SELECT privacy FROM borrowers WHERE borrowers.borrowernumber=old_issues.borrowernumber) <> 0";
- }
- my $sth = $dbh->prepare($query);
- $sth->execute(@bind_params);
- my $anonymisation_err = $dbh->err;
- my $rows_affected = $sth->rows; ### doublecheck row count return function
- return ($rows_affected, $anonymisation_err);
-}
-
=head2 SendCirculationAlert
Send out a C<check-in> or C<checkout> alert using the messaging system.
my %message_name = (
CHECKIN => 'Item_Check_in',
CHECKOUT => 'Item_Checkout',
- RENEWAL => 'Item_Checkout',
+ RENEWAL => 'Item_Checkout',
);
my $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences({
borrowernumber => $borrower->{borrowernumber},
});
my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
+ my $schema = Koha::Database->new->schema;
my @transports = keys %{ $borrower_preferences->{transports} };
- # warn "no transports" unless @transports;
- for (@transports) {
- # warn "transport: $_";
- my $message = C4::Message->find_last_message($borrower, $type, $_);
- if (!$message) {
- #warn "create new message";
- my $letter = C4::Letters::GetPreparedLetter (
- module => 'circulation',
- letter_code => $type,
- branchcode => $branch,
- message_transport_type => $_,
- tables => {
- $issues_table => $item->{itemnumber},
- 'items' => $item->{itemnumber},
- 'biblio' => $item->{biblionumber},
- 'biblioitems' => $item->{biblionumber},
- 'borrowers' => $borrower,
- 'branches' => $branch,
- }
- ) or next;
- C4::Message->enqueue($letter, $borrower, $_);
+
+ # From the MySQL doc:
+ # LOCK TABLES is not transaction-safe and implicitly commits any active transaction before attempting to lock the tables.
+ # If the LOCK/UNLOCK statements are executed from tests, the current transaction will be committed.
+ # To avoid that we need to guess if this code is execute from tests or not (yes it is a bit hacky)
+ my $do_not_lock = ( exists $ENV{_} && $ENV{_} =~ m|prove| ) || $ENV{KOHA_NO_TABLE_LOCKS};
+
+ for my $mtt (@transports) {
+ my $letter = C4::Letters::GetPreparedLetter (
+ module => 'circulation',
+ letter_code => $type,
+ branchcode => $branch,
+ message_transport_type => $mtt,
+ lang => $borrower->{lang},
+ tables => {
+ $issues_table => $item->{itemnumber},
+ 'items' => $item->{itemnumber},
+ 'biblio' => $item->{biblionumber},
+ 'biblioitems' => $item->{biblionumber},
+ 'borrowers' => $borrower,
+ 'branches' => $branch,
+ }
+ ) or next;
+
+ $schema->storage->txn_begin;
+ C4::Context->dbh->do(q|LOCK TABLE message_queue READ|) unless $do_not_lock;
+ C4::Context->dbh->do(q|LOCK TABLE message_queue WRITE|) unless $do_not_lock;
+ my $message = C4::Message->find_last_message($borrower, $type, $mtt);
+ unless ( $message ) {
+ C4::Context->dbh->do(q|UNLOCK TABLES|) unless $do_not_lock;
+ C4::Message->enqueue($letter, $borrower, $mtt);
} else {
- #warn "append to old message";
- my $letter = C4::Letters::GetPreparedLetter (
- module => 'circulation',
- letter_code => $type,
- branchcode => $branch,
- message_transport_type => $_,
- tables => {
- $issues_table => $item->{itemnumber},
- 'items' => $item->{itemnumber},
- 'biblio' => $item->{biblionumber},
- 'biblioitems' => $item->{biblionumber},
- 'borrowers' => $borrower,
- 'branches' => $branch,
- }
- ) or next;
$message->append($letter);
$message->update;
}
+ C4::Context->dbh->do(q|UNLOCK TABLES|) unless $do_not_lock;
+ $schema->storage->txn_commit;
}
return;
$datedue = $expiry_dt->clone->set_time_zone( C4::Context->tz );
}
}
+ if ( C4::Context->preference('useDaysMode') ne 'Days' ) {
+ my $calendar = Koha::Calendar->new( branchcode => $branch );
+ if ( $calendar->is_holiday($datedue) ) {
+ # Don't return on a closed day
+ $datedue = $calendar->prev_open_day( $datedue );
+ }
+ }
}
return $datedue;
my ( $borrowernumber, $itemnum ) = @_;
MarkIssueReturned( $borrowernumber, $itemnum );
- my $borrower = C4::Members::GetMember( 'borrowernumber'=>$borrowernumber );
+ my $patron = Koha::Patrons->find( $borrowernumber );
my $item = C4::Items::GetItem( $itemnum );
my $old_note = ($item->{'paidfor'} && ($item->{'paidfor'} ne q{})) ? $item->{'paidfor'}.' / ' : q{};
my @datearr = localtime(time);
my $date = ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3];
- my $bor = "$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}";
+ my $bor = $patron->firstname . ' ' . $patron->surname . ' ' . $patron->cardnumber;
ModItem({ paidfor => $old_note."Paid for by $bor $date" }, undef, $itemnum);
}
# If a borrower lost the item, add a replacement cost to the their record
if ( my $borrowernumber = $issues->{borrowernumber} ){
- my $borrower = C4::Members::GetMemberDetails( $borrowernumber );
+ my $patron = Koha::Patrons->find( $borrowernumber );
if (C4::Context->preference('WhenLostForgiveFine')){
my $fix = _FixOverduesOnReturn($borrowernumber, $itemnumber, 1, 0); # 1, 0 = exemptfine, no-dropbox
#warn " $issues->{'borrowernumber'} / $itemnumber ";
}
- MarkIssueReturned($borrowernumber,$itemnumber,undef,undef,$borrower->{'privacy'}) if $mark_returned;
+ MarkIssueReturned($borrowernumber,$itemnumber,undef,undef,$patron->privacy) if $mark_returned;
}
}
sub ProcessOfflineReturn {
my $operation = shift;
- my $itemnumber = C4::Items::GetItemnumberFromBarcode( $operation->{barcode} );
+ my $item = Koha::Items->find({barcode => $operation->{barcode}});
- if ( $itemnumber ) {
+ if ( $item ) {
+ my $itemnumber = $item->itemnumber;
my $issue = GetOpenIssue( $itemnumber );
if ( $issue ) {
MarkIssueReturned(
sub ProcessOfflineIssue {
my $operation = shift;
- my $borrower = C4::Members::GetMemberDetails( undef, $operation->{cardnumber} ); # Get borrower from operation cardnumber
+ my $patron = Koha::Patrons->find( { cardnumber => $operation->{cardnumber} } );
- if ( $borrower->{borrowernumber} ) {
- my $itemnumber = C4::Items::GetItemnumberFromBarcode( $operation->{barcode} );
- unless ($itemnumber) {
+ if ( $patron ) {
+ my $item = Koha::Items->find({ barcode => $operation->{barcode} });
+ unless ($item) {
return "Barcode not found.";
}
+ my $itemnumber = $item->itemnumber;
my $issue = GetOpenIssue( $itemnumber );
- if ( $issue and ( $issue->{borrowernumber} ne $borrower->{borrowernumber} ) ) { # Item already issued to another borrower, mark it returned
+ if ( $issue and ( $issue->{borrowernumber} ne $patron->borrowernumber ) ) { # Item already issued to another patron mark it returned
MarkIssueReturned(
$issue->{borrowernumber},
$itemnumber,
);
}
AddIssue(
- $borrower,
+ $patron->unblessed,
$operation->{'barcode'},
undef,
1,
my ($ageRestriction, $daysToAgeRestriction) = GetAgeRestriction($record_restrictions, $borrower);
my ($ageRestriction, $daysToAgeRestriction) = GetAgeRestriction($record_restrictions);
- if($daysToAgeRestriction <= 0) { #Borrower is allowed to access this material, as he is older or as old as the agerestriction }
+ if($daysToAgeRestriction <= 0) { #Borrower is allowed to access this material, as they are older or as old as the agerestriction }
if($daysToAgeRestriction > 0) { #Borrower is this many days from meeting the agerestriction }
@PARAM1 the koha.biblioitems.agerestriction value, like K18, PEGI 13, ...
unless ($item) { carp "No item passed in!" && return; }
unless ($issue) { carp "No issue passed in!" && return; }
- my $datedue = $issue->{date_due};
+ my $datedue = dt_from_string( $issue->date_due );
# we only need to calculate and change the fines if we want to do that on return
# Should be on for hourly loans
my $control_branchcode =
( $control eq 'ItemHomeLibrary' ) ? $item->{homebranch}
: ( $control eq 'PatronLibrary' ) ? $borrower->{branchcode}
- : $issue->{branchcode};
+ : $issue->branchcode;
my $date_returned = $return_date ? dt_from_string($return_date) : dt_from_string();
if ( C4::Context->preference('finesMode') eq 'production' ) {
if ( $amount > 0 ) {
C4::Overdues::UpdateFine({
- issue_id => $issue->{issue_id},
- itemnumber => $issue->{itemnumber},
- borrowernumber => $issue->{borrowernumber},
+ issue_id => $issue->issue_id,
+ itemnumber => $issue->itemnumber,
+ borrowernumber => $issue->borrowernumber,
amount => $amount,
type => $type,
due => output_pref($datedue),
# so in this case, we need to drop those fines to 0
C4::Overdues::UpdateFine({
- issue_id => $issue->{issue_id},
- itemnumber => $issue->{itemnumber},
- borrowernumber => $issue->{borrowernumber},
+ issue_id => $issue->issue_id,
+ itemnumber => $issue->itemnumber,
+ borrowernumber => $issue->borrowernumber,
amount => 0,
type => $type,
due => output_pref($datedue),
projects / koha-ffzg.git / blobdiff