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
&chargelostitem
&purge_zero_balance_fees
);
=head1 FUNCTIONS
-=head2 getnextacctno
-
- $nextacct = &getnextacctno($borrowernumber);
-
-Returns the next unused account number for the patron with the given
-borrower number.
-
-=cut
-
-#'
-# FIXME - Okay, so what does the above actually _mean_?
-sub getnextacctno {
- my ($borrowernumber) = shift or return;
- my $sth = C4::Context->dbh->prepare(
- "SELECT accountno+1 FROM accountlines
- WHERE (borrowernumber = ?)
- ORDER BY accountno DESC
- LIMIT 1"
- );
- $sth->execute($borrowernumber);
- return ($sth->fetchrow || 1);
-}
-
=head2 chargelostitem
In a default install of Koha the following lost values are set
=cut
-sub chargelostitem{
+sub chargelostitem {
my $dbh = C4::Context->dbh();
my ($borrowernumber, $itemnumber, $amount, $description) = @_;
my $itype = Koha::ItemTypes->find({ itemtype => Koha::Items->find($itemnumber)->effective_itemtype() });
if ($usedefaultreplacementcost && $amount == 0 && $defaultreplacecost){
$replacementprice = $defaultreplacecost;
}
- # 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 $checkout = Koha::Checkouts->find({ itemnumber => $itemnumber });
+ my $issue_id = $checkout ? $checkout->issue_id : undef;
+
+ my $account = Koha::Account->new({ patron_id => $borrowernumber });
+ # first make sure the borrower hasn't already been charged for this item (for this issuance)
+ my $existing_charges = $account->lines->search(
{
- borrowernumber => $borrowernumber,
itemnumber => $itemnumber,
- accounttype => 'L',
+ accounttype => 'LOST',
+ issue_id => $issue_id
}
)->count();
# 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,
- issue_id => $issue_id,
- 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'} : undef,
+ interface => C4::Context->interface,
+ 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,
- issue_id => $issue_id,
- 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'} : undef,
+ interface => C4::Context->interface,
+ 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 ) = @_;
- my $manager_id = 0;
- $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
+
+ deprecated "C4::Accounts::manualinvoice is deprecated in favor of Koha::Account->add_debit";
+
+ my $manager_id = C4::Context->userenv ? C4::Context->userenv->{'number'} : undef;
my $dbh = C4::Context->dbh;
my $insert;
- my $accountno = getnextacctno($borrowernumber);
my $amountleft = $amount;
+ my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
+ my $issue_id;
+ if ( $type eq 'LOST' && $itemnum ) {
+ my $checkouts = Koha::Checkouts->search(
+ { itemnumber => $itemnum, borrowernumber => $borrowernumber } );
+ my $checkout =
+ $checkouts->count
+ ? $checkouts->next
+ : Koha::Old::Checkouts->search(
+ { itemnumber => $itemnum, borrowernumber => $borrowernumber },
+ { order_by => { -desc => 'returndate' }, rows => 1 }
+ )->next;
+ $issue_id = $checkout ? $checkout->issue_id : undef;
+ }
+
my $accountline = Koha::Account::Line->new(
{
borrowernumber => $borrowernumber,
- accountno => $accountno,
date => \'NOW()',
amount => $amount,
description => $desc,
accounttype => $type,
amountoutstanding => $amountleft,
itemnumber => $itemnum || undef,
+ issue_id => $issue_id,
note => $note,
manager_id => $manager_id,
+ interface => C4::Context->interface,
+ branchcode => $branchcode,
}
)->store();
logaction("FINES", 'CREATE',$borrowernumber,Dumper({
action => 'create_fee',
borrowernumber => $borrowernumber,
- accountno => $accountno,
amount => $amount,
description => $desc,
accounttype => $type,
projects / koha-equinox.git / blobdiff