use C4::Context;
use C4::Stats;
use C4::Members;
-use C4::Circulation qw(ReturnLostItem);
use C4::Log qw(logaction);
use Koha::Account;
use Koha::Account::Lines;
use Koha::Account::Offsets;
use Koha::Items;
+use Mojo::Util qw(deprecated);
use Data::Dumper qw(Dumper);
use vars qw(@ISA @EXPORT);
require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(
- &manualinvoice
&getnextacctno
- &getcharges
- &ModNote
- &getcredits
- &getrefunds
&chargelostitem
- &ReversePayment
&purge_zero_balance_fees
);
}
return ($sth->fetchrow || 1);
}
-=head2 fixaccounts (removed)
-
- &fixaccounts($accountlines_id, $borrowernumber, $accountnumber, $amount);
-
-#'
-# FIXME - I don't understand what this function does.
-sub fixaccounts {
- my ( $accountlines_id, $borrowernumber, $accountno, $amount ) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare(
- "SELECT * FROM accountlines WHERE accountlines_id=?"
- );
- $sth->execute( $accountlines_id );
- my $data = $sth->fetchrow_hashref;
-
- # FIXME - Error-checking
- my $diff = $amount - $data->{'amount'};
- my $outstanding = $data->{'amountoutstanding'} + $diff;
- $sth->finish;
-
- $dbh->do(<<EOT);
- UPDATE accountlines
- SET amount = '$amount',
- amountoutstanding = '$outstanding'
- WHERE accountlines_id = $accountlines_id
-EOT
- # FIXME: exceedingly bad form. Use prepare with placholders ("?") in query and execute args.
-}
-
-=cut
-
=head2 chargelostitem
In a default install of Koha the following lost values are set
if ($usedefaultreplacementcost && $amount == 0 && $defaultreplacecost){
$replacementprice = $defaultreplacecost;
}
+
+ my $account = Koha::Account->new({ patron_id => $borrowernumber });
# first make sure the borrower hasn't already been charged for this item
# FIXME this should be more exact
# there is no reason a user can't lose an item, find and return it, and lost it again
- my $existing_charges = Koha::Account::Lines->search(
+ my $existing_charges = $account->lines->search(
{
- borrowernumber => $borrowernumber,
itemnumber => $itemnumber,
accounttype => 'L',
}
# OK, they haven't
unless ($existing_charges) {
+ my $checkout = Koha::Checkouts->find({ itemnumber => $itemnumber });
+ my $issue_id = $checkout ? $checkout->issue_id : undef;
#add processing fee
if ($processfee && $processfee > 0){
- my $accountline = Koha::Account::Line->new(
+ my $accountline = $account->add_debit(
{
- borrowernumber => $borrowernumber,
- accountno => getnextacctno($borrowernumber),
- date => \'NOW()',
- amount => $processfee,
- description => $description,
- accounttype => 'PF',
- amountoutstanding => $processfee,
- itemnumber => $itemnumber,
- note => $processingfeenote,
- manager_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+ amount => $processfee,
+ description => $description,
+ note => $processingfeenote,
+ user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+ library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+ type => 'processing',
+ item_id => $itemnumber,
+ issue_id => $issue_id,
}
- )->store();
-
- my $account_offset = Koha::Account::Offset->new(
- {
- debit_id => $accountline->id,
- type => 'Processing Fee',
- amount => $accountline->amount,
- }
- )->store();
-
- if ( C4::Context->preference("FinesLog") ) {
- logaction("FINES", 'CREATE',$borrowernumber,Dumper({
- action => 'create_fee',
- borrowernumber => $accountline->borrowernumber,,
- accountno => $accountline->accountno,
- amount => $accountline->amount,
- description => $accountline->description,
- accounttype => $accountline->accounttype,
- amountoutstanding => $accountline->amountoutstanding,
- note => $accountline->note,
- itemnumber => $accountline->itemnumber,
- manager_id => $accountline->manager_id,
- }));
- }
+ );
}
#add replace cost
if ($replacementprice > 0){
- my $accountline = Koha::Account::Line->new(
+ my $accountline = $account->add_debit(
{
- borrowernumber => $borrowernumber,
- accountno => getnextacctno($borrowernumber),
- date => \'NOW()',
- amount => $replacementprice,
- description => $description,
- accounttype => 'L',
- amountoutstanding => $replacementprice,
- itemnumber => $itemnumber,
- manager_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+ amount => $replacementprice,
+ description => $description,
+ note => undef,
+ user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+ library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+ type => 'lost_item',
+ item_id => $itemnumber,
+ issue_id => $issue_id,
}
- )->store();
-
- my $account_offset = Koha::Account::Offset->new(
- {
- debit_id => $accountline->id,
- type => 'Lost Item',
- amount => $accountline->amount,
- }
- )->store();
-
- if ( C4::Context->preference("FinesLog") ) {
- logaction("FINES", 'CREATE',$borrowernumber,Dumper({
- action => 'create_fee',
- borrowernumber => $accountline->borrowernumber,,
- accountno => $accountline->accountno,
- amount => $accountline->amount,
- description => $accountline->description,
- accounttype => $accountline->accounttype,
- amountoutstanding => $accountline->amountoutstanding,
- note => $accountline->note,
- itemnumber => $accountline->itemnumber,
- manager_id => $accountline->manager_id,
- }));
- }
+ );
}
}
}
&manualinvoice($borrowernumber, $itemnumber, $description, $type,
$amount, $note);
-C<$borrowernumber> is the patron's borrower number.
-C<$description> is a description of the transaction.
-C<$type> may be one of C<CS>, C<CB>, C<CW>, C<CF>, C<CL>, C<N>, C<L>,
-or C<REF>.
-C<$itemnumber> is the item involved, if pertinent; otherwise, it
-should be the empty string.
+This function is now deprecated and not used anywhere within koha. It is due for complete removal in 19.11
=cut
-#'
-# FIXME: In Koha 3.0 , the only account adjustment 'types' passed to this function
-# are:
-# 'C' = CREDIT
-# 'FOR' = FORGIVEN (Formerly 'F', but 'F' is taken to mean 'FINE' elsewhere)
-# 'N' = New Card fee
-# 'F' = Fine
-# 'A' = Account Management fee
-# 'M' = Sundry
-# 'L' = Lost Item
-#
-
sub manualinvoice {
- my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note, $skip_notify ) = @_;
+ my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_;
+
+ deprecated "C4::Accounts::manualinvoice is deprecated in favor of Koha::Account->add_debit";
+
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
my $dbh = C4::Context->dbh;
- my $notifyid = 0;
my $insert;
my $accountno = getnextacctno($borrowernumber);
my $amountleft = $amount;
- $skip_notify //= 0;
-
- if ( ( $type eq 'L' )
- or ( $type eq 'F' )
- or ( $type eq 'A' )
- or ( $type eq 'N' )
- or ( $type eq 'M' ) )
- {
- $notifyid = 1 unless $skip_notify;
- }
+
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $accountline = Koha::Account::Line->new(
{
accounttype => $type,
amountoutstanding => $amountleft,
itemnumber => $itemnum || undef,
- notify_id => $notifyid,
note => $note,
manager_id => $manager_id,
+ branchcode => $branchcode,
}
)->store();
description => $desc,
accounttype => $type,
amountoutstanding => $amountleft,
- notify_id => $notifyid,
note => $note,
itemnumber => $itemnum,
manager_id => $manager_id,
return 0;
}
-sub getcharges {
- my ( $borrowerno, $timestamp, $accountno ) = @_;
- my $dbh = C4::Context->dbh;
- my $timestamp2 = $timestamp - 1;
- my $query = "";
- my $sth = $dbh->prepare(
- "SELECT * FROM accountlines WHERE borrowernumber=? AND accountno = ?"
- );
- $sth->execute( $borrowerno, $accountno );
-
- my @results;
- while ( my $data = $sth->fetchrow_hashref ) {
- push @results,$data;
- }
- return (@results);
-}
-
-sub ModNote {
- my ( $accountlines_id, $note ) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare('UPDATE accountlines SET note = ? WHERE accountlines_id = ?');
- $sth->execute( $note, $accountlines_id );
-}
-
-sub getcredits {
- my ( $date, $date2 ) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare(
- "SELECT * FROM accountlines,borrowers
- WHERE amount < 0 AND accounttype not like 'Pay%' AND accountlines.borrowernumber = borrowers.borrowernumber
- AND timestamp >=TIMESTAMP(?) AND timestamp < TIMESTAMP(?)"
- );
-
- $sth->execute( $date, $date2 );
- my @results;
- while ( my $data = $sth->fetchrow_hashref ) {
- $data->{'date'} = $data->{'timestamp'};
- push @results,$data;
- }
- return (@results);
-}
-
-
-sub getrefunds {
- my ( $date, $date2 ) = @_;
- my $dbh = C4::Context->dbh;
-
- my $sth = $dbh->prepare(
- "SELECT *,timestamp AS datetime
- FROM accountlines,borrowers
- WHERE (accounttype = 'REF'
- AND accountlines.borrowernumber = borrowers.borrowernumber
- AND date >=? AND date <?)"
- );
-
- $sth->execute( $date, $date2 );
-
- my @results;
- while ( my $data = $sth->fetchrow_hashref ) {
- push @results,$data;
-
- }
- return (@results);
-}
-
-#FIXME: ReversePayment should be replaced with a Void Payment feature
-sub ReversePayment {
- my ($accountlines_id) = @_;
- my $dbh = C4::Context->dbh;
-
- my $accountline = Koha::Account::Lines->find($accountlines_id);
- my $amount_outstanding = $accountline->amountoutstanding;
-
- my $new_amountoutstanding =
- $amount_outstanding <= 0 ? $accountline->amount * -1 : 0;
-
- $accountline->description( $accountline->description . " Reversed -" );
- $accountline->amountoutstanding($new_amountoutstanding);
- $accountline->store();
-
- my $account_offset = Koha::Account::Offset->new(
- {
- credit_id => $accountline->id,
- type => 'Reverse Payment',
- amount => $amount_outstanding - $new_amountoutstanding,
- }
- )->store();
-
- if ( C4::Context->preference("FinesLog") ) {
- my $manager_id = 0;
- $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
-
- logaction(
- "FINES", 'MODIFY',
- $accountline->borrowernumber,
- Dumper(
- {
- action => 'reverse_fee_payment',
- borrowernumber => $accountline->borrowernumber,
- old_amountoutstanding => $amount_outstanding,
- new_amountoutstanding => $new_amountoutstanding,
- ,
- accountlines_id => $accountline->id,
- accountno => $accountline->accountno,
- manager_id => $manager_id,
- }
- )
- );
- }
-}
-
=head2 purge_zero_balance_fees
purge_zero_balance_fees( $days );
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
q{
- DELETE FROM accountlines
- WHERE date < date_sub(curdate(), INTERVAL ? DAY)
- AND ( amountoutstanding = 0 or amountoutstanding IS NULL );
+ DELETE a1 FROM accountlines a1
+
+ LEFT JOIN account_offsets credit_offset ON ( a1.accountlines_id = credit_offset.credit_id )
+ LEFT JOIN accountlines a2 ON ( credit_offset.debit_id = a2.accountlines_id )
+
+ LEFT JOIN account_offsets debit_offset ON ( a1.accountlines_id = debit_offset.debit_id )
+ LEFT JOIN accountlines a3 ON ( debit_offset.credit_id = a3.accountlines_id )
+
+ WHERE a1.date < date_sub(curdate(), INTERVAL ? DAY)
+ AND ( a1.amountoutstanding = 0 OR a1.amountoutstanding IS NULL )
+ AND ( a2.amountoutstanding = 0 OR a2.amountoutstanding IS NULL )
+ AND ( a3.amountoutstanding = 0 OR a3.amountoutstanding IS NULL )
}
);
$sth->execute($days) or die $dbh->errstr;
projects / koha.git / blobdiff