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
&chargelostitem
- &ReversePayment
&purge_zero_balance_fees
);
}
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 ) = @_;
+
+ 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 $accountno = getnextacctno($borrowernumber);
my $amountleft = $amount;
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
my $accountline = Koha::Account::Line->new(
{
borrowernumber => $borrowernumber,
itemnumber => $itemnum || undef,
note => $note,
manager_id => $manager_id,
+ branchcode => $branchcode,
}
)->store();
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);
-}
-
-#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 );
projects / koha.git / blobdiff