use strict;
#use warnings; FIXME - Bug 2505
use DateTime;
+use POSIX qw( floor );
use Koha::DateUtils;
use C4::Context;
use C4::Stats;
use Data::Dumper;
use Koha::Account;
use Koha::AuthorisedValues;
+use Koha::Biblioitems;
use Koha::DateUtils;
use Koha::Calendar;
use Koha::Checkouts;
use Koha::Patron::Debarments;
use Koha::Database;
use Koha::Libraries;
+use Koha::Account::Lines;
use Koha::Holds;
use Koha::RefundLostItemFeeRule;
use Koha::RefundLostItemFeeRules;
+use Koha::Account::Lines;
+use Koha::Account::Offsets;
+use Koha::Config::SysPrefs;
use Carp;
-use List::MoreUtils qw( uniq );
+use List::MoreUtils qw( uniq any );
use Scalar::Util qw( looks_like_number );
use Date::Calc qw(
Today
&GetRenewCount
&GetSoonestRenewDate
&GetLatestAutoRenewDate
- &GetItemIssue
&GetIssuingCharges
&GetBranchBorrowerCircRule
&GetBranchItemRule
There is no item in the catalog with the given barcode. The value is C<$barcode>.
-=item C<IsPermanent>
-
-The item's home branch is permanent. This doesn't prevent the item from being transferred, though. The value is the code of the item's home branch.
-
=item C<DestinationEqualsHolding>
The item is already at the branch to which it is being transferred. The transfer is nonetheless considered to have failed. The value should be ignored.
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...
- # FIXME Is this still used by someone?
- # See other FIXME in AddReturn
- my $library = Koha::Libraries->find($hbr);
- if ( $library and $library->get_categories->search({'me.categorycode' => 'PE'})->count ) {
- $messages->{'IsPermanent'} = $hbr;
- $dotransfer = 0;
+ }
}
# can't transfer book if is already there....
}
# 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 );
}
my $max_checkouts_allowed = $issuing_rule->maxissueqty;
my $max_onsite_checkouts_allowed = $issuing_rule->maxonsiteissueqty;
- if ( $onsite_checkout ) {
+ if ( $onsite_checkout and defined $max_onsite_checkouts_allowed ) {
if ( $onsite_checkout_count >= $max_onsite_checkouts_allowed ) {
return {
reason => 'TOO_MANY_ONSITE_CHECKOUTS',
my $max_checkouts_allowed = $branch_borrower_circ_rule->{maxissueqty};
my $max_onsite_checkouts_allowed = $branch_borrower_circ_rule->{maxonsiteissueqty};
- if ( $onsite_checkout ) {
+ if ( $onsite_checkout and defined $max_onsite_checkouts_allowed ) {
if ( $onsite_checkout_count >= $max_onsite_checkouts_allowed ) {
return {
reason => 'TOO_MANY_ONSITE_CHECKOUTS',
=head2 CanBookBeIssued
- ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $borrower,
+ ( $issuingimpossible, $needsconfirmation, [ $alerts ] ) = CanBookBeIssued( $patron,
$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)
+=item C<$patron> is a Koha::Patron
=item C<$barcode> is the bar code of the book being issued.
=cut
sub CanBookBeIssued {
- my ( $borrower, $barcode, $duedate, $inprocess, $ignore_reserves, $params ) = @_;
+ my ( $patron, $barcode, $duedate, $inprocess, $ignore_reserves, $params ) = @_;
my %needsconfirmation; # filled with problems that needs confirmations
my %issuingimpossible; # filled with problems that causes the issue to be IMPOSSIBLE
my %alerts; # filled with messages that shouldn't stop issuing, but the librarian should be aware of.
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 $biblioitem = GetBiblioItemData($item->{biblioitemnumber});
- $item->{'itemtype'}=$item->{'itype'};
- my $dbh = C4::Context->dbh;
-
+ my $item = GetItem(undef, $barcode );
# MANDATORY CHECKS - unless item exists, nothing else matters
- unless ( $item->{barcode} ) {
+ unless ( $item ) {
$issuingimpossible{UNKNOWN_BARCODE} = 1;
}
- return ( \%issuingimpossible, \%needsconfirmation ) if %issuingimpossible;
+ return ( \%issuingimpossible, \%needsconfirmation ) if %issuingimpossible;
+
+ my $issue = Koha::Checkouts->find( { itemnumber => $item->{itemnumber} } );
+ my $biblio = Koha::Biblios->find( $item->{biblionumber} );
+ my $biblioitem = $biblio->biblioitem;
+ my $effective_itemtype = $item->{itype}; # GetItem deals with that
+ my $dbh = C4::Context->dbh;
+ my $patron_unblessed = $patron->unblessed;
#
# DUE DATE is OK ? -- should already have checked.
unless ( $duedate ) {
my $issuedate = $now->clone();
- my $branch = _GetCircControlBranch($item,$borrower);
- my $itype = ( C4::Context->preference('item-level_itypes') ) ? $item->{'itype'} : $biblioitem->{'itemtype'};
- $duedate = CalcDateDue( $issuedate, $itype, $branch, $borrower );
+ my $branch = _GetCircControlBranch($item, $patron_unblessed);
+ $duedate = CalcDateDue( $issuedate, $effective_itemtype, $branch, $patron_unblessed );
# Offline circ calls AddIssue directly, doesn't run through here
# So issuingimpossible should be ok.
#
# BORROWER STATUS
#
- if ( $borrower->{'category_type'} eq 'X' && ( $item->{barcode} )) {
+ 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->{'itype'},
- borrowernumber => $borrower->{'borrowernumber'},
+ itemtype => $effective_itemtype,
+ borrowernumber => $patron->borrowernumber,
ccode => $item->{'ccode'}}
);
ModDateLastSeen( $item->{'itemnumber'} );
return( { STATS => 1 }, {});
}
- my $flags = C4::Members::patronflags( $borrower );
- if ( ref $flags ) {
- if ( $flags->{GNA} ) {
- $issuingimpossible{GNA} = 1;
- }
- if ( $flags->{'LOST'} ) {
- $issuingimpossible{CARD_LOST} = 1;
- }
- if ( $flags->{'DBARRED'} ) {
- $issuingimpossible{DEBARRED} = 1;
- }
+ if ( $patron->gonenoaddress == 1 ) {
+ $issuingimpossible{GNA} = 1;
+ }
+
+ if ( $patron->lost == 1 ) {
+ $issuingimpossible{CARD_LOST} = 1;
+ }
+ if ( $patron->is_debarred ) {
+ $issuingimpossible{DEBARRED} = 1;
}
- if ( !defined $borrower->{dateexpiry} || $borrower->{'dateexpiry'} eq '0000-00-00') {
+
+ if ( $patron->is_expired ) {
$issuingimpossible{EXPIRED} = 1;
- } else {
- my $expiry_dt = dt_from_string( $borrower->{dateexpiry}, 'sql', 'floating' );
- $expiry_dt->truncate( to => 'day');
- my $today = $now->clone()->truncate(to => 'day');
- $today->set_time_zone( 'floating' );
- if ( DateTime->compare($today, $expiry_dt) == 1 ) {
- $issuingimpossible{EXPIRED} = 1;
- }
}
#
#
# DEBTS
- my ($balance, $non_issue_charges, $other_charges) =
- C4::Members::GetMemberAccountBalance( $borrower->{'borrowernumber'} );
+ my $account = $patron->account;
+ my $balance = $account->balance;
+ my $non_issues_charges = $account->non_issues_charges;
+ my $other_charges = $balance - $non_issues_charges;
my $amountlimit = C4::Context->preference("noissuescharge");
my $allowfineoverride = C4::Context->preference("AllowFineOverride");
my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
if ( defined $no_issues_charge_guarantees ) {
- my $p = Koha::Patrons->find( $borrower->{borrowernumber} );
- my @guarantees = $p->guarantees();
+ my @guarantees = $patron->guarantees();
my $guarantees_non_issues_charges;
foreach my $g ( @guarantees ) {
- my ( $b, $n, $o ) = C4::Members::GetMemberAccountBalance( $g->id );
- $guarantees_non_issues_charges += $n;
+ $guarantees_non_issues_charges += $g->account->non_issues_charges;
}
if ( $guarantees_non_issues_charges > $no_issues_charge_guarantees && !$inprocess && !$allowfineoverride) {
}
if ( C4::Context->preference("IssuingInProcess") ) {
- if ( $non_issue_charges > $amountlimit && !$inprocess && !$allowfineoverride) {
- $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_charges );
- } elsif ( $non_issue_charges > $amountlimit && !$inprocess && $allowfineoverride) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges );
- } elsif ( $allfinesneedoverride && $non_issue_charges > 0 && $non_issue_charges <= $amountlimit && !$inprocess ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges );
+ if ( $non_issues_charges > $amountlimit && !$inprocess && !$allowfineoverride) {
+ $issuingimpossible{DEBT} = $non_issues_charges;
+ } elsif ( $non_issues_charges > $amountlimit && !$inprocess && $allowfineoverride) {
+ $needsconfirmation{DEBT} = $non_issues_charges;
+ } elsif ( $allfinesneedoverride && $non_issues_charges > 0 && $non_issues_charges <= $amountlimit && !$inprocess ) {
+ $needsconfirmation{DEBT} = $non_issues_charges;
}
}
else {
- if ( $non_issue_charges > $amountlimit && $allowfineoverride ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges );
- } elsif ( $non_issue_charges > $amountlimit && !$allowfineoverride) {
- $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issue_charges );
- } elsif ( $non_issue_charges > 0 && $allfinesneedoverride ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issue_charges );
+ if ( $non_issues_charges > $amountlimit && $allowfineoverride ) {
+ $needsconfirmation{DEBT} = $non_issues_charges;
+ } elsif ( $non_issues_charges > $amountlimit && !$allowfineoverride) {
+ $issuingimpossible{DEBT} = $non_issues_charges;
+ } elsif ( $non_issues_charges > 0 && $allfinesneedoverride ) {
+ $needsconfirmation{DEBT} = $non_issues_charges;
}
}
$alerts{OTHER_CHARGES} = sprintf( "%.2f", $other_charges );
}
- my $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
+ $patron = Koha::Patrons->find( $patron->borrowernumber ); # FIXME Refetch just in case, to avoid regressions. But must not be needed
+ $patron_unblessed = $patron->unblessed;
+
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') {
}
}
+ #
+ # CHECK IF BOOK ALREADY ISSUED TO THIS BORROWER
+ #
+ if ( $issue && $issue->borrowernumber eq $patron->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(
+ $patron->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 = (
C4::Context->preference('SwitchOnSiteCheckouts')
- and $issue->{onsite_checkout}
and $issue
- and $issue->{borrowernumber} == $borrower->{'borrowernumber'} ? 1 : 0 );
- my $toomany = TooMany( $borrower, $item->{biblionumber}, $item, { onsite_checkout => $onsite_checkout, switch_onsite_checkout => $switch_onsite_checkout, } );
+ and $issue->onsite_checkout
+ and $issue->borrowernumber == $patron->borrowernumber ? 1 : 0 );
+ my $toomany = TooMany( $patron_unblessed, $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
#
- $patron = Koha::Patrons->find($borrower->{borrowernumber});
+ $patron = Koha::Patrons->find( $patron->borrowernumber ); # FIXME Refetch just in case, to avoid regressions. But must not be needed
my $wants_check = $patron->wants_check_for_previous_checkout;
$needsconfirmation{PREVISSUE} = 1
if ($wants_check and $patron->do_check_for_previous_checkout($item));
if (C4::Context->preference('item-level_itypes')){
# this should probably be a subroutine
my $sth = $dbh->prepare("SELECT notforloan FROM itemtypes WHERE itemtype = ?");
- $sth->execute($item->{'itemtype'});
+ $sth->execute($effective_itemtype);
my $notforloan=$sth->fetchrow_hashref();
if ($notforloan->{'notforloan'}) {
if (!C4::Context->preference("AllowNotForLoanOverride")) {
$issuingimpossible{NOT_FOR_LOAN} = 1;
- $issuingimpossible{itemtype_notforloan} = $item->{'itype'};
+ $issuingimpossible{itemtype_notforloan} = $effective_itemtype;
} else {
$needsconfirmation{NOT_FOR_LOAN_FORCING} = 1;
- $needsconfirmation{itemtype_notforloan} = $item->{'itype'};
+ $needsconfirmation{itemtype_notforloan} = $effective_itemtype;
}
}
}
- elsif ($biblioitem->{'notforloan'} == 1){
- if (!C4::Context->preference("AllowNotForLoanOverride")) {
- $issuingimpossible{NOT_FOR_LOAN} = 1;
- $issuingimpossible{itemtype_notforloan} = $biblioitem->{'itemtype'};
- } else {
- $needsconfirmation{NOT_FOR_LOAN_FORCING} = 1;
- $needsconfirmation{itemtype_notforloan} = $biblioitem->{'itemtype'};
+ else {
+ my $itemtype = Koha::ItemTypes->find($biblioitem->itemtype);
+ if ( $itemtype and $itemtype->notforloan == 1){
+ if (!C4::Context->preference("AllowNotForLoanOverride")) {
+ $issuingimpossible{NOT_FOR_LOAN} = 1;
+ $issuingimpossible{itemtype_notforloan} = $effective_itemtype;
+ } else {
+ $needsconfirmation{NOT_FOR_LOAN_FORCING} = 1;
+ $needsconfirmation{itemtype_notforloan} = $effective_itemtype;
+ }
}
}
}
$issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
$issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
}
- $needsconfirmation{BORRNOTSAMEBRANCH} = $borrower->{'branchcode'}
- if ( $borrower->{'branchcode'} ne $userenv->{branch} );
+ $needsconfirmation{BORRNOTSAMEBRANCH} = $patron->branchcode
+ if ( $patron->branchcode ne $userenv->{branch} );
}
}
#
my $rentalConfirmation = C4::Context->preference("RentalFeesCheckoutConfirmation");
if ( $rentalConfirmation ){
- my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} );
+ my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $patron->borrowernumber );
if ( $rentalCharge > 0 ){
$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 );
+ if ( $resbor ne $patron->borrowernumber ) {
+ 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};
}
}
}
}
## CHECK AGE RESTRICTION
- my $agerestriction = $biblioitem->{'agerestriction'};
- my ($restriction_age, $daysToAgeRestriction) = GetAgeRestriction( $agerestriction, $borrower );
+ my $agerestriction = $biblioitem->agerestriction;
+ my ($restriction_age, $daysToAgeRestriction) = GetAgeRestriction( $agerestriction, $patron->unblessed );
if ( $daysToAgeRestriction && $daysToAgeRestriction > 0 ) {
if ( C4::Context->preference('AgeRestrictionOverride') ) {
$needsconfirmation{AGE_RESTRICTION} = "$agerestriction";
## check for high holds decreasing loan period
if ( C4::Context->preference('decreaseLoanHighHolds') ) {
- my $check = checkHighHolds( $item, $borrower );
+ my $check = checkHighHolds( $item, $patron_unblessed );
if ( $check->{exceeded} ) {
if ($override_high_holds) {
$alerts{HIGHHOLDS} = {
num_holds => $check->{outstanding},
duration => $check->{duration},
- returndate => output_pref( $check->{due_date} ),
+ returndate => output_pref( { dt => dt_from_string($check->{due_date}), dateformat => 'iso', timeformat => '24hr' }),
};
}
else {
$needsconfirmation{HIGHHOLDS} = {
num_holds => $check->{outstanding},
duration => $check->{duration},
- returndate => output_pref( $check->{due_date} ),
+ returndate => output_pref( { dt => dt_from_string($check->{due_date}), dateformat => 'iso', timeformat => '24hr' }),
};
}
}
require C4::Serials;
my $is_a_subscription = C4::Serials::CountSubscriptionFromBiblionumber($biblionumber);
unless ($is_a_subscription) {
+ # FIXME Should be $patron->checkouts($args);
my $checkouts = Koha::Checkouts->search(
{
- borrowernumber => $borrower->{borrowernumber},
+ borrowernumber => $patron->borrowernumber,
biblionumber => $biblionumber,
},
{
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,
}
# Remove any items that are not holdable for this patron
- @items = grep { CanItemBeReserved( $borrower->{borrowernumber}, $_->itemnumber ) eq 'OK' } @items;
+ @items = grep { CanItemBeReserved( $borrower->{borrowernumber}, $_->itemnumber )->{status} eq 'OK' } @items;
my $items_count = scalar @items;
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');
=over 4
-=item C<$borrower> is a hash with borrower informations (from GetMember).
+=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} );
AddReturn( $item->{'barcode'}, C4::Context->userenv->{'branch'} );
}
- MoveReserve( $item->{'itemnumber'}, $borrower->{'borrowernumber'}, $cancelreserve );
+ C4::Reserves::MoveReserve( $item->{'itemnumber'}, $borrower->{'borrowernumber'}, $cancelreserve );
# Starting process for transfer job (checking transfert and validate it if we have one)
my ($datesent) = GetTransfers( $item->{'itemnumber'} );
# 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 );
}
$datedue->truncate( to => 'minute' );
- $issue = Koha::Database->new()->schema()->resultset('Issue')->update_or_create(
- {
- borrowernumber => $borrower->{'borrowernumber'},
- itemnumber => $item->{'itemnumber'},
- issuedate => $issuedate->strftime('%Y-%m-%d %H:%M:%S'),
- date_due => $datedue->strftime('%Y-%m-%d %H:%M:%S'),
- branchcode => C4::Context->userenv->{'branch'},
- onsite_checkout => $onsite_checkout,
- auto_renew => $auto_renew ? 1 : 0
- }
- );
+ my $issue_attributes = {
+ borrowernumber => $borrower->{'borrowernumber'},
+ issuedate => $issuedate->strftime('%Y-%m-%d %H:%M:%S'),
+ date_due => $datedue->strftime('%Y-%m-%d %H:%M:%S'),
+ branchcode => C4::Context->userenv->{'branch'},
+ onsite_checkout => $onsite_checkout,
+ auto_renew => $auto_renew ? 1 : 0,
+ };
+
+ $issue = Koha::Checkouts->find( { itemnumber => $item->{itemnumber} } );
+ if ($issue) {
+ $issue->set($issue_attributes)->store;
+ }
+ else {
+ $issue = Koha::Checkout->new(
+ {
+ itemnumber => $item->{itemnumber},
+ %$issue_attributes,
+ }
+ )->store;
+ }
if ( C4::Context->preference('ReturnToShelvingCart') ) {
# ReturnToShelvingCart is on, anything issued should be taken off the cart.
datelastborrowed => DateTime->now( time_zone => C4::Context->tz() )->ymd(),
},
$item->{'biblionumber'},
- $item->{'itemnumber'}
+ $item->{'itemnumber'},
+ { log_action => 0 }
);
ModDateLastSeen( $item->{'itemnumber'} );
# If it costs to borrow this book, charge it to the patron's account.
my ( $charge, $itemtype ) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} );
if ( $charge > 0 ) {
- AddIssuingCharge( $item->{'itemnumber'}, $borrower->{'borrowernumber'}, $charge );
+ AddIssuingCharge( $issue, $charge );
$item->{'charge'} = $charge;
}
other => ( $sipmode ? "SIP-$sipmode" : '' ),
itemnumber => $item->{'itemnumber'},
itemtype => $item->{'itype'},
+ location => $item->{location},
borrowernumber => $borrower->{'borrowernumber'},
ccode => $item->{'ccode'}
}
}
);
}
+ 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;
}
The book is not currently on loan. The value is C<$barcode>.
-=item C<IsPermanent>
-
-The book's home branch is a permanent collection. If you have borrowed
-this book, you are not allowed to return it. The value is the code for
-the book's home branch.
-
=item C<withdrawn>
This book has been withdrawn/cancelled. The value should be ignored.
}
$branch = C4::Context->userenv->{'branch'} unless $branch; # we trust userenv to be a safe fallback/default
my $messages;
- my $borrower;
+ my $patron;
my $doreturn = 1;
my $validTransfert = 0;
my $stat_type = 'return';
}
my $itemnumber = $item->{ itemnumber };
+ my $itemtype = $item->{itype}; # GetItem called effective_itemtype
- my $item_level_itypes = C4::Context->preference("item-level_itypes");
- my $biblio = $item_level_itypes ? undef : GetBiblioData( $item->{ biblionumber } ); # don't get bib data unless we need it
- my $itemtype = $item_level_itypes ? $item->{itype} : $biblio->{itemtype};
-
- my $issue = GetItemIssue($itemnumber);
- if ($issue and $issue->{borrowernumber}) {
- $borrower = C4::Members::GetMember( borrowernumber => $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 $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;
+ ModItem({ onloan => undef }, $item->{biblionumber}, $item->{itemnumber}) if defined $item->{onloan};
# even though item is not on loan, it may still be transferred; therefore, get current branch info
$doreturn = 0;
# No issue, no borrowernumber. ONLY if $doreturn, *might* you have a $borrower later.
$item->{location} = $item->{permanent_location};
}
- ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
+ ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'}, { log_action => 0 } );
}
# 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) {
foreach my $key ( keys %$rules ) {
if ( $item->{notforloan} eq $key ) {
$messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} };
- ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
+ ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber, { log_action => 0 } );
last;
}
}
}
}
-
- # check if the book is in a permanent collection....
- # FIXME -- This 'PE' attribute is largely undocumented. afaict, there's no user interface that reflects this functionality.
- if ( $returnbranch ) {
- my $library = Koha::Libraries->find($returnbranch);
- if ( $library and $library->get_categories->search({'me.categorycode' => 'PE'})->count ) {
- $messages->{'IsPermanent'} = $returnbranch;
- }
- }
-
# check if the return is allowed at this branch
my ($returnallowed, $message) = CanBookBeReturned($item, $branch);
unless ($returnallowed){
Rightbranch => $message
};
$doreturn = 0;
- return ( $doreturn, $messages, $issue, $borrower );
+ return ( $doreturn, $messages, $issue, $patron_unblessed);
}
if ( $item->{'withdrawn'} ) { # book has been cancelled
$doreturn = 0 if C4::Context->preference("BlockReturnOfWithdrawnItems");
}
+ if ( $item->{itemlost} and C4::Context->preference("BlockReturnOfLostItems") ) {
+ $doreturn = 0;
+ }
+
# case of a return of document (deal with issues and holdingbranch)
my $today = DateTime->now( time_zone => C4::Context->tz() );
if ($doreturn) {
- my $datedue = $issue->{date_due};
- $borrower or warn "AddReturn without current borrower";
- my $circControlBranch;
+ 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";
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;
+ $is_overdue = $issue->is_overdue( $dropboxdate );
+ } else {
+ $is_overdue = $issue->is_overdue;
}
- if ($borrowernumber) {
+ if ($patron) {
eval {
- my $issue_id = MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
- $circControlBranch, $return_date, $borrower->{'privacy'} );
- $issue->{issue_id} = $issue_id;
+ if ( $dropbox ) {
+ MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
+ $dropboxdate, $patron->privacy );
+ }
+ else {
+ MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
+ $return_date, $patron->privacy );
+ }
};
unless ( $@ ) {
- if ( ( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'} ) || $return_date ) {
- _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $borrower, return_date => $return_date } );
+ if ( ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) || $return_date ) {
+ _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $patron_unblessed, return_date => $return_date } );
}
} else {
- $messages->{'Wrongbranch'} = {
- Wrongbranch => $branch,
- Rightbranch => $message
- };
- carp $@;
- return ( 0, { WasReturned => 0 }, $issue, $borrower );
+ 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}, { log_action => 0 } );
}
# the holdingbranch is updated if the document is returned to another location.
UpdateHoldingbranch($branch, $item->{'itemnumber'});
$item->{'holdingbranch'} = $branch; # update item data holdingbranch too
}
- ModDateLastSeen( $item->{'itemnumber'} );
+
+ my $leave_item_lost = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0;
+ ModDateLastSeen( $item->{itemnumber}, $leave_item_lost );
# check if we have a transfer for this document
my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->{'itemnumber'} );
# fix up the accounts.....
if ( $item->{'itemlost'} ) {
$messages->{'WasLost'} = 1;
-
- if ( $item->{'itemlost'} ) {
+ unless ( C4::Context->preference("BlockReturnOfLostItems") ) {
if (
Koha::RefundLostItemFeeRules->should_refund(
{
)
)
{
- _FixAccountForLostAndReturned( $item->{'itemnumber'}, $borrowernumber, $barcode );
+ _FixAccountForLostAndReturned( $item->{'itemnumber'},
+ $borrowernumber, $barcode );
$messages->{'LostItemFeeRefunded'} = 1;
}
}
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 = dt_from_string($return_date) if $return_date;
$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;
}
}
}
ccode => $item->{ ccode }
});
- # 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");
-
+ # 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");
+ }
+
# 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
- MarkIssueReturned($borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy);
+ MarkIssueReturned($borrowernumber, $itemnumber, $returndate, $privacy);
Unconditionally marks an issue as being returned by
moving the C<issues> row to C<old_issues> and
-setting C<returndate> to the current date, or
-the last non-holiday date of the branccode specified in
-C<dropbox_branch> . Assumes you've already checked that
-it's safe to do this, i.e. last non-holiday > issuedate.
+setting C<returndate> to the current date.
if C<$returndate> is specified (in iso format), it is used as the date
-of the return. It is ignored when a dropbox_branch is passed in.
+of the return.
C<$privacy> contains the privacy parameter. If the patron has set privacy to 2,
the old_issue is immediately anonymised
Ideally, this function would be internal to C<C4::Circulation>,
-not exported, but it is currently needed by one
-routine in C<C4::Accounts>.
+not exported, but it is currently used in misc/cronjobs/longoverdue.pl
+and offline_circ/process_koc.pl.
=cut
sub MarkIssueReturned {
- my ( $borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy ) = @_;
+ my ( $borrowernumber, $itemnumber, $returndate, $privacy ) = @_;
+
+ # Retrieve the issue
+ my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ) or return;
+ my $issue_id = $issue->issue_id;
my $anonymouspatron;
if ( $privacy == 2 ) {
# 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) {
- my $calendar = Koha::Calendar->new( branchcode => $dropbox_branch );
- my $dropboxdate = $calendar->addDate( DateTime->now( time_zone => C4::Context->tz), -1 );
- $query .= ' ? ';
- push @bind, $dropboxdate->strftime('%Y-%m-%d %H:%M');
- } elsif ($returndate) {
- $query .= ' ? ';
- push @bind, $returndate;
- } else {
- $query .= ' now() ';
- }
- $query .= ' WHERE issue_id = ?';
- push @bind, $issue_id;
+ my $schema = Koha::Database->schema;
# FIXME Improve the return value and handle it from callers
- my $do_not_lock = ( exists $ENV{_} && $ENV{_} =~ m|prove| ) || $ENV{KOHA_NO_TABLE_LOCKS};
$schema->txn_do(sub {
- $dbh->do( $query, undef, @bind );
-
- C4::Context->dbh->do(q|LOCK TABLE old_issues READ|) unless $do_not_lock;
- C4::Context->dbh->do(q|LOCK TABLE old_issues WRITE|) unless $do_not_lock;
-
- my $issue = Koha::Checkouts->find( $issue_id ); # FIXME should be fetched earlier
-
- # Create the old_issues entry
- my $old_checkout_data = $issue->unblessed;
-
- if ( Koha::Old::Checkouts->find( $issue_id ) ) {
- my $new_issue_id = ( Koha::Old::Checkouts->search(
- {},
- { columns => [ { max_issue_id => { max => 'issue_id' } } ] }
- )->get_column('max_issue_id') )[0];
- $new_issue_id++;
- $issue_id = $new_issue_id;
+ # Update the returndate value
+ if ( $returndate ) {
+ $issue->returndate( $returndate )->store->discard_changes; # update and refetch
+ }
+ else {
+ $issue->returndate( \'NOW()' )->store->discard_changes; # update and refetch
}
- $old_checkout_data->{issue_id} = $issue_id;
- my $old_checkout = Koha::Old::Checkout->new($old_checkout_data)->store;
-
- C4::Context->dbh->do(q|UNLOCK TABLES|) unless $do_not_lock;
- # Update the fines
- $dbh->do(q|UPDATE accountlines SET issue_id = ? WHERE issue_id = ?|, undef, $old_checkout->issue_id, $issue->issue_id);
+ # 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);
+ $old_checkout->borrowernumber($anonymouspatron)->store;
}
- # Delete the issue
+ # And finally delete the issue
$issue->delete;
- ModItem( { 'onloan' => undef }, undef, $itemnumber );
+ ModItem( { 'onloan' => undef }, undef, $itemnumber, { log_action => 0 } );
if ( C4::Context->preference('StoreLastBorrower') ) {
my $item = Koha::Items->find( $itemnumber );
}
}
- my $new_debar_dt =
- $return_date->clone()->add_duration( $suspension_days );
+ if ( $issuing_rule->suspension_chargeperiod > 1 ) {
+ # No need to / 1 and do not consider / 0
+ $suspension_days = DateTime::Duration->new(
+ days => floor( $suspension_days->in_units('days') / $issuing_rule->suspension_chargeperiod )
+ );
+ }
+
+ my $new_debar_dt;
+ # Use the calendar or not to calculate the debarment date
+ if ( C4::Context->preference('finesCalendar') eq 'noFinesWhenClosed' ) {
+ my $calendar = Koha::Calendar->new(
+ branchcode => $branchcode,
+ days_mode => 'Calendar'
+ );
+ $new_debar_dt = $calendar->addDate( $return_date, $suspension_days );
+ }
+ else {
+ $new_debar_dt = $return_date->clone()->add_duration($suspension_days);
+ }
Koha::Patron::Debarments::AddUniqueDebarment({
borrowernumber => $borrower->{borrowernumber},
C<$exemptfine> BOOL -- remove overdue charge associated with this issue.
C<$dropboxmode> BOOL -- remove lastincrement on overdue charge associated with this issue.
-Internal function, called only by AddReturn
+Internal function
=cut
sub _FixOverduesOnReturn {
- my ($borrowernumber, $item);
- unless ($borrowernumber = shift) {
+ my ($borrowernumber, $item, $exemptfine, $dropbox ) = @_;
+ unless( $borrowernumber ) {
warn "_FixOverduesOnReturn() not supplied valid borrowernumber";
return;
}
- unless ($item = shift) {
+ unless( $item ) {
warn "_FixOverduesOnReturn() not supplied valid itemnumber";
return;
}
- my ($exemptfine, $dropbox) = @_;
- my $dbh = C4::Context->dbh;
# check for overdue fine
- my $sth = $dbh->prepare(
-"SELECT * FROM accountlines WHERE (borrowernumber = ?) AND (itemnumber = ?) AND (accounttype='FU' OR accounttype='O')"
- );
- $sth->execute( $borrowernumber, $item );
-
- # alter fine to show that the book has been returned
- my $data = $sth->fetchrow_hashref;
- return 0 unless $data; # no warning, there's just nothing to fix
+ my $accountline = Koha::Account::Lines->search(
+ {
+ borrowernumber => $borrowernumber,
+ itemnumber => $item,
+ -or => [
+ accounttype => 'FU',
+ accounttype => 'O',
+ ],
+ }
+ )->next();
+ return 0 unless $accountline; # no warning, there's just nothing to fix
- my $uquery;
- my @bind = ($data->{'accountlines_id'});
if ($exemptfine) {
- $uquery = "update accountlines set accounttype='FFOR', amountoutstanding=0";
+ my $amountoutstanding = $accountline->amountoutstanding;
+
+ $accountline->accounttype('FFOR');
+ $accountline->amountoutstanding(0);
+
+ Koha::Account::Offset->new(
+ {
+ debit_id => $accountline->id,
+ type => 'Forgiven',
+ amount => $amountoutstanding * -1,
+ }
+ )->store();
+
if (C4::Context->preference("FinesLog")) {
&logaction("FINES", 'MODIFY',$borrowernumber,"Overdue forgiven: item $item");
}
- } elsif ($dropbox && $data->{lastincrement}) {
- my $outstanding = $data->{amountoutstanding} - $data->{lastincrement} ;
- my $amt = $data->{amount} - $data->{lastincrement} ;
- if (C4::Context->preference("FinesLog")) {
- &logaction("FINES", 'MODIFY',$borrowernumber,"Dropbox adjustment $amt, item $item");
+ } elsif ($dropbox && $accountline->lastincrement) {
+ my $outstanding = $accountline->amountoutstanding - $accountline->lastincrement;
+ my $amt = $accountline->amount - $accountline->lastincrement;
+
+ Koha::Account::Offset->new(
+ {
+ debit_id => $accountline->id,
+ type => 'Dropbox',
+ amount => $accountline->lastincrement * -1,
+ }
+ )->store();
+
+ if ( C4::Context->preference("FinesLog") ) {
+ &logaction( "FINES", 'MODIFY', $borrowernumber,
+ "Dropbox adjustment $amt, item $item" );
}
- $uquery = "update accountlines set accounttype='F' ";
- if($outstanding >= 0 && $amt >=0) {
- $uquery .= ", amount = ? , amountoutstanding=? ";
- unshift @bind, ($amt, $outstanding) ;
+
+ $accountline->accounttype('F');
+
+ if ( $outstanding >= 0 && $amt >= 0 ) {
+ $accountline->amount($amt);
+ $accountline->amountoutstanding($outstanding);
}
+
} else {
- $uquery = "update accountlines set accounttype='F' ";
+ $accountline->accounttype('F');
}
- $uquery .= " where (accountlines_id = ?)";
- my $usth = $dbh->prepare($uquery);
- return $usth->execute(@bind);
+
+ return $accountline->store();
}
=head2 _FixAccountForLostAndReturned
Internal function, not exported, called only by AddReturn.
-FIXME: This function reflects how inscrutable fines logic is. Fix both.
-FIXME: Give a positive return value on success. It might be the $borrowernumber who received credit, or the amount forgiven.
-
=cut
sub _FixAccountForLostAndReturned {
my $itemnumber = shift or return;
my $borrowernumber = @_ ? shift : undef;
my $item_id = @_ ? shift : $itemnumber; # Send the barcode if you want that logged in the description
- my $dbh = C4::Context->dbh;
+
+ my $credit;
+
# check for charge made for lost book
- my $sth = $dbh->prepare("SELECT * FROM accountlines WHERE itemnumber = ? AND accounttype IN ('L', 'Rep', 'W') ORDER BY date DESC, accountno DESC");
- $sth->execute($itemnumber);
- my $data = $sth->fetchrow_hashref;
- $data or return; # bail if there is nothing to do
- $data->{accounttype} eq 'W' and return; # Written off
-
- # writeoff this amount
- my $offset;
- my $amount = $data->{'amount'};
- my $acctno = $data->{'accountno'};
- my $amountleft; # Starts off undef/zero.
- if ($data->{'amountoutstanding'} == $amount) {
- $offset = $data->{'amount'};
- $amountleft = 0; # Hey, it's zero here, too.
- } else {
- $offset = $amount - $data->{'amountoutstanding'}; # Um, isn't this the same as ZERO? We just tested those two things are ==
- $amountleft = $data->{'amountoutstanding'} - $amount; # Um, isn't this the same as ZERO? We just tested those two things are ==
+ my $accountlines = Koha::Account::Lines->search(
+ {
+ itemnumber => $itemnumber,
+ accounttype => { -in => [ 'L', 'Rep', 'W' ] },
+ },
+ {
+ order_by => { -desc => [ 'date', 'accountno' ] }
+ }
+ );
+
+ return unless $accountlines->count > 0;
+ my $accountline = $accountlines->next;
+ my $total_to_refund = 0;
+ my $account = Koha::Patrons->find( $accountline->borrowernumber )->account;
+
+ # Use cases
+ if ( $accountline->amount > $accountline->amountoutstanding ) {
+ # some amount has been cancelled. collect the offsets that are not writeoffs
+ # this works because the only way to subtract from this kind of a debt is
+ # using the UI buttons 'Pay' and 'Write off'
+ my $credits_offsets = Koha::Account::Offsets->search({
+ debit_id => $accountline->id,
+ credit_id => { '!=' => undef }, # it is not the debit itself
+ type => { '!=' => 'Writeoff' },
+ amount => { '<' => 0 } # credits are negative on the DB
+ });
+
+ $total_to_refund = ( $credits_offsets->count > 0 )
+ ? $credits_offsets->total * -1 # credits are negative on the DB
+ : 0;
}
- my $usth = $dbh->prepare("UPDATE accountlines SET accounttype = 'LR',amountoutstanding='0'
- WHERE (accountlines_id = ?)");
- $usth->execute($data->{'accountlines_id'}); # We might be adjusting an account for some OTHER borrowernumber now. Not the one we passed in.
- #check if any credit is left if so writeoff other accounts
- my $nextaccntno = getnextacctno($data->{'borrowernumber'});
- $amountleft *= -1 if ($amountleft < 0);
- if ($amountleft > 0) {
- my $msth = $dbh->prepare("SELECT * FROM accountlines WHERE (borrowernumber = ?)
- AND (amountoutstanding >0) ORDER BY date"); # might want to order by amountoustanding ASC (pay smallest first)
- $msth->execute($data->{'borrowernumber'});
- # offset transactions
- my $newamtos;
- my $accdata;
- while (($accdata=$msth->fetchrow_hashref) and ($amountleft>0)){
- if ($accdata->{'amountoutstanding'} < $amountleft) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- } else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
- $amountleft = 0;
+
+ my $credit_total = $accountline->amountoutstanding + $total_to_refund;
+
+ if ( $credit_total > 0 ) {
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+ $credit = $account->add_credit(
+ { amount => $credit_total,
+ description => 'Item Returned ' . $item_id,
+ type => 'lost_item_return',
+ library_id => $branchcode
}
- my $thisacct = $accdata->{'accountlines_id'};
- # FIXME: move prepares outside while loop!
- my $usth = $dbh->prepare("UPDATE accountlines SET amountoutstanding= ?
- WHERE (accountlines_id = ?)");
- $usth->execute($newamtos,$thisacct);
- $usth = $dbh->prepare("INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- VALUES
- (?,?,?,?)");
- $usth->execute($data->{'borrowernumber'},$accdata->{'accountno'},$nextaccntno,$newamtos);
- }
+ );
+
+ # TODO: ->apply should just accept the accountline
+ $credit->apply( { debits => $accountlines->reset } );
}
- $amountleft *= -1 if ($amountleft > 0);
- my $desc = "Item Returned " . $item_id;
- $usth = $dbh->prepare("INSERT INTO accountlines
- (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
- VALUES (?,?,now(),?,?,'CR',?)");
- $usth->execute($data->{'borrowernumber'},$nextaccntno,0-$amount,$desc,$amountleft);
- if ($borrowernumber) {
- # FIXME: same as query above. use 1 sth for both
- $usth = $dbh->prepare("INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- VALUES (?,?,?,?)");
- $usth->execute($borrowernumber, $data->{'accountno'}, $nextaccntno, $offset);
+
+ # Manually set the accounttype
+ $accountline->discard_changes->accounttype('LR');
+ $accountline->store;
+
+ ModItem( { paidfor => '' }, undef, $itemnumber, { log_action => 0 } );
+
+ if ( defined $account and C4::Context->preference('AccountAutoReconcile') ) {
+ $account->reconcile_balance;
}
- ModItem({ paidfor => '' }, undef, $itemnumber);
- return;
+
+ return ($credit) ? $credit->id : undef;
}
=head2 _GetCircControlBranch
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 );
this function get all issues from a biblionumber.
Return:
-C<$issues> is a reference to array which each value is ref-to-hash. This ref-to-hash containts all column from
+C<$issues> is a reference to array which each value is ref-to-hash. This ref-to-hash contains all column from
tables issues and the firstname,surname & cardnumber from borrowers.
=cut
my $dbh = C4::Context->dbh;
my $statement = <<END_SQL;
-SELECT issues.*, items.itype as itemtype, items.homebranch, TO_DAYS( date_due )-TO_DAYS( NOW() ) as days_until_due, branches.branchemail
-FROM issues
-LEFT JOIN items USING (itemnumber)
-LEFT OUTER JOIN branches USING (branchcode)
-WHERE returndate is NULL
-HAVING days_until_due >= 0 AND days_until_due <= ?
+SELECT *
+FROM (
+ SELECT issues.*, items.itype as itemtype, items.homebranch, TO_DAYS( date_due )-TO_DAYS( NOW() ) as days_until_due, branches.branchemail
+ FROM issues
+ LEFT JOIN items USING (itemnumber)
+ LEFT OUTER JOIN branches USING (branchcode)
+ WHERE returndate is NULL
+) tmp
+WHERE days_until_due >= 0 AND days_until_due <= ?
END_SQL
my @bind_parameters = ( $params->{'days_in_advance'} );
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;
+ return ( 0, 'item_denied_renewal') if _item_denied_renewal({ item => $item });
- $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);
my $item = GetItem($i);
next if IsItemOnHoldAndFound($i);
for my $b (@borrowernumbers) {
- my $borr = $borrowers{$b}//= C4::Members::GetMember(borrowernumber => $b);
+ my $borr = $borrowers{$b} //= Koha::Patrons->find( $b )->unblessed;
next unless IsAvailableForItemLevelRequest($item, $borr);
next unless CanItemBeReserved($b,$i);
return ( 1, undef ) if $override_limit;
- my $branchcode = _GetCircControlBranch( $item, $borrower );
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
- { categorycode => $borrower->{categorycode},
+ { categorycode => $patron->categorycode,
itemtype => $item->{itype},
branchcode => $branchcode
}
);
return ( 0, "too_many" )
- if not $issuing_rule or $issuing_rule->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 ( $itemissue->{auto_renew} ) {
+ if ( $issue->auto_renew ) {
+
+ if ( $patron->category->effective_BlockExpiredPatronOpacActions and $patron->is_expired ) {
+ return ( 0, 'auto_account_expired' );
+ }
+
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($itemissue->{issuedate});
+ my $maximum_renewal_date = dt_from_string($issue->issuedate, 'sql');
$maximum_renewal_date->add(
$issuing_rule->lengthunit => $issuing_rule->no_auto_renewal_after
);
if ( C4::Context->preference('OPACFineNoRenewalsBlockAutoRenew') ) {
my $fine_no_renewals = C4::Context->preference("OPACFineNoRenewals");
- my ( $amountoutstanding ) = C4::Members::GetMemberAccountRecords($borrower->{borrowernumber});
+ my $amountoutstanding = $patron->account->balance;
if ( $amountoutstanding and $amountoutstanding > $fine_no_renewals ) {
return ( 0, "auto_too_much_oweing" );
}
{
# Calculate soonest renewal by subtracting 'No renewal before' from due date
- my $soonestrenewal =
- $itemissue->{date_due}->clone()
- ->subtract(
+ 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 ( $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.
- if ( $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, _GetCircControlBranch($item, $borrower), $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, { log_action => 0 } );
# 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 $accountno = C4::Accounts::getnextacctno( $borrowernumber );
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
- $sth = $dbh->prepare(
- "INSERT INTO accountlines
- (date, borrowernumber, accountno, amount, manager_id,
- description,accounttype, amountoutstanding, itemnumber)
- VALUES (now(),?,?,?,?,?,?,?,?)"
- );
- $sth->execute( $borrowernumber, $accountno, $charge, $manager_id,
- "Renewal of Rental Item $item->{'title'} $item->{'barcode'}",
- 'Rent', $charge, $itemnumber );
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+ Koha::Account::Line->new(
+ {
+ date => dt_from_string(),
+ borrowernumber => $borrowernumber,
+ accountno => $accountno,
+ amount => $charge,
+ manager_id => $manager_id,
+ accounttype => 'Rent',
+ amountoutstanding => $charge,
+ itemnumber => $itemnumber,
+ branchcode => $branchcode,
+ description => 'Renewal of Rental Item '
+ . $biblio->title
+ . " $item->{'barcode'}",
+ }
+ )->store();
}
# Send a renewal slip according to checkout alert preferencei
if ( C4::Context->preference('RenewalSendNotice') eq '1' ) {
- $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
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' });
}
+ 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 => C4::Context->userenv ? C4::Context->userenv->{branch} : $branch,
+ branch => $branch,
type => 'renew',
amount => $charge,
itemnumber => $itemnumber,
itemtype => $item->{itype},
+ location => $item->{location},
borrowernumber => $borrowernumber,
ccode => $item->{'ccode'}
}
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 $branchcode = _GetCircControlBranch($item, $patron->unblessed);
my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
- { categorycode => $borrower->{categorycode},
+ { categorycode => $patron->categorycode,
itemtype => $item->{itype},
branchcode => $branchcode
}
);
- $renewsallowed = $issuing_rule ? $issuing_rule->renewalsallowed : undef; # FIXME Just replace undef with 0 to get what we expected. But what about the side-effects? TODO LATER
+ $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::GetMember( borrowernumber => $borrowernumber )
+ $borrowernumber ||= $itemissue->borrowernumber;
+ my $patron = Koha::Patrons->find( $borrowernumber )
or return;
- my $branchcode = _GetCircControlBranch( $item, $borrower );
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
- { categorycode => $borrower->{categorycode},
+ { categorycode => $patron->categorycode,
itemtype => $item->{itype},
branchcode => $branchcode
}
and $issuing_rule->norenewalbefore ne "" )
{
my $soonestrenewal =
- $itemissue->{date_due}->clone()
- ->subtract(
+ dt_from_string( $itemissue->date_due )->subtract(
$issuing_rule->lengthunit => $issuing_rule->norenewalbefore );
if ( C4::Context->preference('NoRenewalBeforePrecision') eq 'date'
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::GetMember( borrowernumber => $borrowernumber )
+ $borrowernumber ||= $itemissue->borrowernumber;
+ my $patron = Koha::Patrons->find( $borrowernumber )
or return;
- my $branchcode = _GetCircControlBranch( $item, $borrower );
+ my $branchcode = _GetCircControlBranch( $item, $patron->unblessed );
my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
- { categorycode => $borrower->{categorycode},
+ { categorycode => $patron->categorycode,
itemtype => $item->{itype},
branchcode => $branchcode
}
my $maximum_renewal_date;
if ( $issuing_rule->no_auto_renewal_after ) {
- $maximum_renewal_date = dt_from_string($itemissue->{issuedate});
+ $maximum_renewal_date = dt_from_string($itemissue->issuedate);
$maximum_renewal_date->add(
$issuing_rule->lengthunit => $issuing_rule->no_auto_renewal_after
);
=head2 AddIssuingCharge
- &AddIssuingCharge( $itemno, $borrowernumber, $charge )
+ &AddIssuingCharge( $checkout, $charge )
=cut
sub AddIssuingCharge {
- my ( $itemnumber, $borrowernumber, $charge ) = @_;
- my $dbh = C4::Context->dbh;
- my $nextaccntno = getnextacctno( $borrowernumber );
- my $manager_id = 0;
+ my ( $checkout, $charge ) = @_;
+
+ # FIXME What if checkout does not exist?
+
+ my $nextaccntno = C4::Accounts::getnextacctno( $checkout->borrowernumber );
+
+ my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
- my $query ="
- INSERT INTO accountlines
- (borrowernumber, itemnumber, accountno,
- date, amount, description, accounttype,
- amountoutstanding, manager_id)
- VALUES (?, ?, ?,now(), ?, 'Rental', 'Rent',?,?)
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute( $borrowernumber, $itemnumber, $nextaccntno, $charge, $charge, $manager_id );
+
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
+ my $accountline = Koha::Account::Line->new(
+ {
+ borrowernumber => $checkout->borrowernumber,
+ itemnumber => $checkout->itemnumber,
+ issue_id => $checkout->issue_id,
+ accountno => $nextaccntno,
+ amount => $charge,
+ amountoutstanding => $charge,
+ manager_id => $manager_id,
+ branchcode => $branchcode,
+ description => 'Rental',
+ accounttype => 'Rent',
+ date => \'NOW()',
+ }
+ )->store();
+
+ Koha::Account::Offset->new(
+ {
+ debit_id => $accountline->id,
+ type => 'Rental Fee',
+ amount => $charge,
+ }
+ )->store();
}
=head2 GetTransfers
$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;
Code is either an itemtype or collection doe depending on the pref BranchTransferLimitsType
+Deprecated in favor of Koha::Item::Transfer::Limits->find/search and
+Koha::Item->can_be_transferred.
+
=cut
sub IsBranchTransferAllowed {
$code is either itemtype or collection code depending on what the pref BranchTransferLimitsType is set to.
+Deprecated in favor of Koha::Item::Transfer::Limit->new.
+
=cut
sub CreateBranchTransferLimit {
number of limits deleted, 0e0 if no limits were deleted, or undef if
no arguments are supplied.
+Deprecated in favor of Koha::Item::Transfer::Limits->search({
+ fromBranch => $fromBranch
+ })->delete.
+
=cut
sub DeleteBranchTransferLimits {
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);
}
sub LostItem{
- my ($itemnumber, $mark_returned) = @_;
+ my ($itemnumber, $mark_lost_from, $force_mark_returned) = @_;
+
+ unless ( $mark_lost_from ) {
+ # Temporary check to avoid regressions
+ die q|LostItem called without $mark_lost_from, check the API.|;
+ }
+
+ my $mark_returned;
+ if ( $force_mark_returned ) {
+ $mark_returned = 1;
+ } else {
+ my $pref = C4::Context->preference('MarkLostItemsAsReturned') // q{};
+ $mark_returned = ( $pref =~ m|$mark_lost_from| );
+ }
my $dbh = C4::Context->dbh();
my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title
# If a borrower lost the item, add a replacement cost to the their record
if ( my $borrowernumber = $issues->{borrowernumber} ){
- my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+ my $patron = Koha::Patrons->find( $borrowernumber );
+
+ my $fix = _FixOverduesOnReturn($borrowernumber, $itemnumber, C4::Context->preference('WhenLostForgiveFine'), 0); # 1, 0 = exemptfine, no-dropbox
+ defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $itemnumber...) failed!"; # zero is OK, check defined
- if (C4::Context->preference('WhenLostForgiveFine')){
- my $fix = _FixOverduesOnReturn($borrowernumber, $itemnumber, 1, 0); # 1, 0 = exemptfine, no-dropbox
- defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $itemnumber...) failed!"; # zero is OK, check defined
- }
if (C4::Context->preference('WhenLostChargeReplacementFee')){
- C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}");
+ C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'} $issues->{'itemcallnumber'}");
#FIXME : Should probably have a way to distinguish this from an item that really was returned.
#warn " $issues->{'borrowernumber'} / $itemnumber ";
}
- MarkIssueReturned($borrowernumber,$itemnumber,undef,undef,$borrower->{'privacy'}) if $mark_returned;
+ MarkIssueReturned($borrowernumber,$itemnumber,undef,$patron->privacy) if $mark_returned;
+ }
+
+ #When item is marked lost automatically cancel its outstanding transfers and set items holdingbranch to the transfer source branch (frombranch)
+ if (my ( $datesent,$frombranch,$tobranch ) = GetTransfers($itemnumber)) {
+ ModItem({holdingbranch => $frombranch}, undef, $itemnumber);
}
+ my $transferdeleted = DeleteTransfer($itemnumber);
}
sub GetOfflineOperations {
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(
$issue->{borrowernumber},
$itemnumber,
- undef,
$operation->{timestamp},
);
ModItem(
{ renewals => 0, onloan => undef },
$issue->{'biblionumber'},
- $itemnumber
+ $itemnumber,
+ { log_action => 0 }
);
return "Success.";
} else {
sub ProcessOfflineIssue {
my $operation = shift;
- my $borrower = C4::Members::GetMember( cardnumber => $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,
- undef,
$operation->{timestamp},
);
}
AddIssue(
- $borrower,
+ $patron->unblessed,
$operation->{'barcode'},
undef,
1,
sub ProcessOfflinePayment {
my $operation = shift;
- my $patron = Koha::Patrons->find( { cardnumber => $operation->{cardnumber} });
- my $amount = $operation->{amount};
+ my $patron = Koha::Patrons->find({ cardnumber => $operation->{cardnumber} });
- Koha::Account->new( { patron_id => $patron->id } )->pay( { amount => $amount } );
+ $patron->account->pay({ amount => $operation->{amount}, library_id => $operation->{branchcode} });
- return "Success."
+ return "Success.";
}
-
=head2 TransferSlip
TransferSlip($user_branch, $itemnumber, $barcode, $to_branch)
my $dbh = C4::Context->dbh;
my $query = q{
+ SELECT * FROM (
SELECT b.biblionumber, b.title, b.author, bi.itemtype, bi.publishercode,
bi.place, bi.publicationyear, b.copyrightdate, bi.pages, bi.size,
i.ccode, SUM(i.issues) AS count
}
$query .= q{
- GROUP BY b.biblionumber
- HAVING count > 0
+ GROUP BY b.biblionumber, b.title, b.author, bi.itemtype, bi.publishercode,
+ bi.place, bi.publicationyear, b.copyrightdate, bi.pages, bi.size,
+ i.ccode
ORDER BY count DESC
};
+ $query .= q{ ) xxx WHERE count > 0 };
$count = int($count);
if ($count > 0) {
$query .= "LIMIT $count";
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();
- my ( $amount, $type, $unitcounttotal ) =
+ my ( $amount, $unitcounttotal, $unitcount ) =
C4::Overdues::CalcFine( $item, $borrower->{categorycode}, $control_branchcode, $datedue, $date_returned );
- $type ||= q{};
-
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),
});
}
}
}
+sub _item_denied_renewal {
+ my ($params) = @_;
+
+ my $item = $params->{item};
+ return unless $item;
+
+ my $denyingrules = Koha::Config::SysPrefs->find('ItemsDeniedRenewal')->get_yaml_pref_hash();
+ return unless $denyingrules;
+ foreach my $field (keys %$denyingrules) {
+ my $val = $item->{$field};
+ if( !defined $val) {
+ if ( any { !defined $_ } @{$denyingrules->{$field}} ){
+ return 1;
+ }
+ } elsif (any { defined($_) && $val eq $_ } @{$denyingrules->{$field}}) {
+ # If the results matches the values in the syspref
+ # We return true if match found
+ return 1;
+ }
+ }
+ return 0;
+}
+
+
1;
__END__
projects / koha.git / blobdiff