&makepayment
&manualinvoice
&getnextacctno
- &reconcileaccount
&getcharges
&ModNote
&getcredits
#here we update both the accountoffsets and the account lines
#updated to check, if they are paying off a lost item, we return the item
# from their card, and put a note on the item record
- my ( $accountlines_id, $borrowernumber, $accountno, $amount, $user, $branch ) = @_;
+ my ( $accountlines_id, $borrowernumber, $accountno, $amount, $user, $branch, $payment_note ) = @_;
my $dbh = C4::Context->dbh;
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
my $sth = $dbh->prepare("SELECT * FROM accountlines WHERE accountlines_id=?");
$sth->execute( $accountlines_id );
my $data = $sth->fetchrow_hashref;
- $sth->finish;
my $payment;
if ( $data->{'accounttype'} eq "Pay" ){
"
);
$udp->execute($accountlines_id);
- $udp->finish;
}else{
my $udp =
$dbh->prepare(
"
);
$udp->execute($accountlines_id);
- $udp->finish;
# create new line
- $payment = 0 - $amount;
+ my $payment = 0 - $amount;
+ $payment_note //= "";
my $ins =
$dbh->prepare(
"INSERT
- INTO accountlines (borrowernumber, accountno, date, amount, itemnumber, description, accounttype, amountoutstanding, manager_id)
- VALUES ( ?, ?, now(), ?, ?, 'Payment,thanks', 'Pay', 0, ?)"
+ INTO accountlines (borrowernumber, accountno, date, amount, itemnumber, description, accounttype, amountoutstanding, manager_id, note)
+ VALUES ( ?, ?, now(), ?, ?, 'Payment,thanks', 'Pay', 0, ?, ?)"
);
- $ins->execute($borrowernumber, $nextaccntno, $payment, $data->{'itemnumber'}, $manager_id);
- $ins->finish;
+ $ins->execute($borrowernumber, $nextaccntno, $payment, $data->{'itemnumber'}, $manager_id, $payment_note);
}
if ( C4::Context->preference("FinesLog") ) {
my $sthr = $dbh->prepare("SELECT max(accountlines_id) AS lastinsertid FROM accountlines");
$sthr->execute();
my $datalastinsertid = $sthr->fetchrow_hashref;
- $sthr->finish;
return $datalastinsertid->{'lastinsertid'};
}
VALUES (?,?,now(),?,?,'L',?,?,?)");
$sth2->execute($borrowernumber,$accountno,$amount,
$description,$amount,$itemnumber,$manager_id);
- $sth2->finish;
if ( C4::Context->preference("FinesLog") ) {
logaction("FINES", 'CREATE', $borrowernumber, Dumper({
my $accountno = getnextacctno($borrowernumber);
my $amountleft = $amount;
-# if ( $type eq 'CS'
-# || $type eq 'CB'
-# || $type eq 'CW'
-# || $type eq 'CF'
-# || $type eq 'CL' )
-# {
-# my $amount2 = $amount * -1; # FIXME - $amount2 = -$amount
-# $amountleft =
-# fixcredit( $borrowernumber, $amount2, $itemnum, $type, $user );
-# }
if ( $type eq 'N' ) {
$desc .= " New Card";
}
$desc = " Lost Item";
}
-# if ( $type eq 'REF' ) {
-# $desc .= " Cash Refund";
-# $amountleft = refund( '', $borrowernumber, $amount );
-# }
if ( ( $type eq 'L' )
or ( $type eq 'F' )
or ( $type eq 'A' )
return 0;
}
-=head2 fixcredit #### DEPRECATED
-
- $amountleft = &fixcredit($borrowernumber, $data, $barcode, $type, $user);
-
- This function is only used internally, not exported.
-
-=cut
-
-# This function is deprecated in 3.0
-
-sub fixcredit {
-
- #here we update both the accountoffsets and the account lines
- my ( $borrowernumber, $data, $barcode, $type, $user ) = @_;
- my $dbh = C4::Context->dbh;
- my $newamtos = 0;
- my $accdata = "";
- my $amountleft = $data;
- if ( $barcode ne '' ) {
- my $item = GetBiblioFromItemNumber( '', $barcode );
- my $nextaccntno = getnextacctno($borrowernumber);
- my $query = "SELECT * FROM accountlines WHERE (borrowernumber=?
- AND itemnumber=? AND amountoutstanding > 0)";
- if ( $type eq 'CL' ) {
- $query .= " AND (accounttype = 'L' OR accounttype = 'Rep')";
- }
- elsif ( $type eq 'CF' ) {
- $query .= " AND (accounttype = 'F' OR accounttype = 'FU' OR
- accounttype='Res' OR accounttype='Rent')";
- }
- elsif ( $type eq 'CB' ) {
- $query .= " and accounttype='A'";
- }
-
- # print $query;
- my $sth = $dbh->prepare($query);
- $sth->execute( $borrowernumber, $item->{'itemnumber'} );
- $accdata = $sth->fetchrow_hashref;
- $sth->finish;
- if ( $accdata->{'amountoutstanding'} < $amountleft ) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- }
- else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
- $amountleft = 0;
- }
- my $thisacct = $accdata->{accountlines_id};
- my $usth = $dbh->prepare(
- "UPDATE accountlines SET amountoutstanding= ?
- WHERE (accountlines_id = ?)"
- );
- $usth->execute( $newamtos, $thisacct );
- $usth->finish;
- $usth = $dbh->prepare(
- "INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- VALUES (?,?,?,?)"
- );
- $usth->execute( $borrowernumber, $accdata->{'accountno'},
- $nextaccntno, $newamtos );
- $usth->finish;
- }
-
- # begin transaction
- my $nextaccntno = getnextacctno($borrowernumber);
-
- # get lines with outstanding amounts to offset
- my $sth = $dbh->prepare(
- "SELECT * FROM accountlines
- WHERE (borrowernumber = ?) AND (amountoutstanding >0)
- ORDER BY date"
- );
- $sth->execute($borrowernumber);
-
- # print $query;
- # offset transactions
- while ( ( $accdata = $sth->fetchrow_hashref ) and ( $amountleft > 0 ) ) {
- if ( $accdata->{'amountoutstanding'} < $amountleft ) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- }
- else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
- $amountleft = 0;
- }
- my $thisacct = $accdata->{accountlines_id};
- my $usth = $dbh->prepare(
- "UPDATE accountlines SET amountoutstanding= ?
- WHERE (accountlines_id = ?)"
- );
- $usth->execute( $newamtos, $thisacct );
- $usth->finish;
- $usth = $dbh->prepare(
- "INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- VALUE (?,?,?,?)"
- );
- $usth->execute( $borrowernumber, $accdata->{'accountno'},
- $nextaccntno, $newamtos );
- $usth->finish;
- }
- $sth->finish;
- $type = "Credit " . $type;
- UpdateStats( $user, $type, $data, $user, '', '', $borrowernumber );
- $amountleft *= -1;
- return ($amountleft);
-
-}
-
-=head2 refund
-
-#FIXME : DEPRECATED SUB
- This subroutine tracks payments and/or credits against fines/charges
- using the accountoffsets table, which is not used consistently in
- Koha's fines management, and so is not used in 3.0
-
-=cut
-
-sub refund {
-
- #here we update both the accountoffsets and the account lines
- my ( $borrowernumber, $data ) = @_;
- my $dbh = C4::Context->dbh;
- my $newamtos = 0;
- my $accdata = "";
- my $amountleft = $data * -1;
-
- # begin transaction
- my $nextaccntno = getnextacctno($borrowernumber);
-
- # get lines with outstanding amounts to offset
- my $sth = $dbh->prepare(
- "SELECT * FROM accountlines
- WHERE (borrowernumber = ?) AND (amountoutstanding<0)
- ORDER BY date"
- );
- $sth->execute($borrowernumber);
-
- # print $amountleft;
- # offset transactions
- while ( ( $accdata = $sth->fetchrow_hashref ) and ( $amountleft < 0 ) ) {
- if ( $accdata->{'amountoutstanding'} > $amountleft ) {
- $newamtos = 0;
- $amountleft -= $accdata->{'amountoutstanding'};
- }
- else {
- $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
- $amountleft = 0;
- }
-
- # print $amountleft;
- my $thisacct = $accdata->{accountlines_id};
- my $usth = $dbh->prepare(
- "UPDATE accountlines SET amountoutstanding= ?
- WHERE (accountlines_id = ?)"
- );
- $usth->execute( $newamtos, $thisacct );
- $usth->finish;
- $usth = $dbh->prepare(
- "INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- VALUES (?,?,?,?)"
- );
- $usth->execute( $borrowernumber, $accdata->{'accountno'},
- $nextaccntno, $newamtos );
- $usth->finish;
- }
- $sth->finish;
- return ($amountleft);
-}
-
sub getcharges {
my ( $borrowerno, $timestamp, $accountno ) = @_;
my $dbh = C4::Context->dbh;
=cut
sub recordpayment_selectaccts {
- my ( $borrowernumber, $amount, $accts ) = @_;
+ my ( $borrowernumber, $amount, $accts, $note ) = @_;
my $dbh = C4::Context->dbh;
my $newamtos = 0;
# create new line
$sql = 'INSERT INTO accountlines ' .
- '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) ' .
- q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)|;
- $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id );
+ '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id,note) ' .
+ q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?,?)|;
+ $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id, $note );
UpdateStats( $branch, 'payment', $amount, '', '', '', $borrowernumber, $nextaccntno );
if ( C4::Context->preference("FinesLog") ) {
# makepayment needs to be fixed to handle partials till then this separate subroutine
# fills in
sub makepartialpayment {
- my ( $accountlines_id, $borrowernumber, $accountno, $amount, $user, $branch ) = @_;
+ my ( $accountlines_id, $borrowernumber, $accountno, $amount, $user, $branch, $payment_note ) = @_;
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
if (!$amount || $amount < 0) {
return;
}
+ $payment_note //= "";
my $dbh = C4::Context->dbh;
my $nextaccntno = getnextacctno($borrowernumber);
# create new line
my $insert = 'INSERT INTO accountlines (borrowernumber, accountno, date, amount, '
- . 'description, accounttype, amountoutstanding, itemnumber, manager_id) '
- . ' VALUES (?, ?, now(), ?, ?, ?, 0, ?, ?)';
+ . 'description, accounttype, amountoutstanding, itemnumber, manager_id, note) '
+ . ' VALUES (?, ?, now(), ?, ?, ?, 0, ?, ?, ?)';
- $dbh->do( $insert, undef, $borrowernumber, $nextaccntno, 0 - $amount,
- "Payment, thanks - $user", 'Pay', $data->{'itemnumber'}, $manager_id);
+ $dbh->do( $insert, undef, $borrowernumber, $nextaccntno, $amount,
+ "Payment, thanks - $user", 'Pay', $data->{'itemnumber'}, $manager_id, $payment_note);
UpdateStats( $user, 'payment', $amount, '', '', '', $borrowernumber, $accountno );
=head2 WriteOffFee
- WriteOff( $borrowernumber, $accountline_id, $itemnum, $accounttype, $amount, $branch );
+ WriteOffFee( $borrowernumber, $accountline_id, $itemnum, $accounttype, $amount, $branch, $payment_note );
Write off a fine for a patron.
C<$borrowernumber> is the patron's borrower number.
C<$accounttype> is the account type of the fine being written off.
C<$amount> is a floating-point number, giving the amount that is being written off.
C<$branch> is the branchcode of the library where the writeoff occurred.
+C<$payment_note> is the note to attach to this payment
=cut
sub WriteOffFee {
- my ( $borrowernumber, $accountlines_id, $itemnum, $accounttype, $amount, $branch ) = @_;
+ my ( $borrowernumber, $accountlines_id, $itemnum, $accounttype, $amount, $branch, $payment_note ) = @_;
+ $payment_note //= "";
$branch ||= C4::Context->userenv->{branch};
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
$query ="
INSERT INTO accountlines
- ( borrowernumber, accountno, itemnumber, date, amount, description, accounttype, manager_id )
- VALUES ( ?, ?, ?, NOW(), ?, 'Writeoff', 'W', ? )
+ ( borrowernumber, accountno, itemnumber, date, amount, description, accounttype, manager_id, note )
+ VALUES ( ?, ?, ?, NOW(), ?, 'Writeoff', 'W', ?, ? )
";
$sth = $dbh->prepare( $query );
my $acct = getnextacctno($borrowernumber);
- $sth->execute( $borrowernumber, $acct, $itemnum, $amount, $manager_id );
+ $sth->execute( $borrowernumber, $acct, $itemnum, $amount, $manager_id, $payment_note );
if ( C4::Context->preference("FinesLog") ) {
logaction("FINES", 'CREATE',$borrowernumber,Dumper({
projects / koha.git / blobdiff