From 993a143de3a4c7ab0d401d837bd7c7baca209f81 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 2 Dec 2011 10:49:07 -0500 Subject: [PATCH] Rebased against master 2014-01-30 http://bugs.koha-community.org/show_bug.cgi?id=6273 --- C4/Accounts.pm | 20 ++++++++++++++------ C4/SIP/ILS.pm | 2 +- C4/SIP/ILS/Transaction/FeePayment.pm | 3 ++- members/boraccount.pl | 2 +- members/printfeercpt.pl | 2 +- members/printinvoice.pl | 2 +- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/C4/Accounts.pm b/C4/Accounts.pm index 3fbb2ad..fa1ef77 100644 --- a/C4/Accounts.pm +++ b/C4/Accounts.pm @@ -70,11 +70,13 @@ patron. =head2 recordpayment - &recordpayment($borrowernumber, $payment); + &recordpayment($borrowernumber, $payment, $sip_paytype); Record payment by a patron. C<$borrowernumber> is the patron's borrower number. C<$payment> is a floating-point number, giving the -amount that was paid. +amount that was paid. C<$sip_paytype> is an optional flag to indicate this +payment was made over a SIP2 interface, rather than the staff client. The +value passed is the SIP2 payment type value (message 37, characters 21-22) Amounts owed are paid off oldest first. That is, if the patron has a $1 fine from Feb. 1, another $1 fine from Mar. 1, and makes a payment @@ -87,7 +89,7 @@ will be credited to the next one. sub recordpayment { #here we update the account lines - my ( $borrowernumber, $data ) = @_; + my ( $borrowernumber, $data, $sip_paytype ) = @_; my $dbh = C4::Context->dbh; my $newamtos = 0; my $accdata = ""; @@ -145,9 +147,15 @@ sub recordpayment { my $usth = $dbh->prepare( "INSERT INTO accountlines (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) - VALUES (?,?,now(),?,'','Pay',?,?)" + VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)" ); - $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft, $manager_id ); + + my $payment_description = "Payment, thanks"; + $payment_description .= " (via SIP2)" if defined $sip_paytype; + my $paytype = "Pay"; + $paytype .= "-$sip_paytype" if defined $sip_paytype; + $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, $payment_description, $paytype, 0 - $amountleft, $manager_id ); + $usth->finish; UpdateStats( $branch, 'payment', $data, '', '', '', $borrowernumber, $nextaccntno ); @@ -485,7 +493,7 @@ sub getcredits { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( "SELECT * FROM accountlines,borrowers - WHERE amount < 0 AND accounttype <> 'Pay' AND accountlines.borrowernumber = borrowers.borrowernumber + WHERE amount < 0 AND accounttype not like 'Pay%' AND accountlines.borrowernumber = borrowers.borrowernumber AND timestamp >=TIMESTAMP(?) AND timestamp < TIMESTAMP(?)" ); diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm index 703bb96..e2089e8 100644 --- a/C4/SIP/ILS.pm +++ b/C4/SIP/ILS.pm @@ -229,7 +229,7 @@ sub pay_fee { $trans->screen_msg('Invalid patron barcode.'); return $trans; } - $trans->pay($patron->{borrowernumber},$fee_amt); + $trans->pay($patron->{borrowernumber},$fee_amt, $pay_type); $trans->ok(1); return $trans; diff --git a/C4/SIP/ILS/Transaction/FeePayment.pm b/C4/SIP/ILS/Transaction/FeePayment.pm index 52619f4..ac6a3bc 100644 --- a/C4/SIP/ILS/Transaction/FeePayment.pm +++ b/C4/SIP/ILS/Transaction/FeePayment.pm @@ -46,8 +46,9 @@ sub pay { my $self = shift; my $borrowernumber = shift; my $amt = shift; + my $type = shift; warn("RECORD:$borrowernumber::$amt"); - recordpayment( $borrowernumber, $amt ); + recordpayment( $borrowernumber, $amt,$type ); } #sub DESTROY { diff --git a/members/boraccount.pl b/members/boraccount.pl index 255b1ff..4ade843 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -84,7 +84,7 @@ foreach my $accountline ( @{$accts}) { $accountline->{date} = format_date($accountline->{date}); $accountline->{amount} = sprintf '%.2f', $accountline->{amount}; $accountline->{amountoutstanding} = sprintf '%.2f', $accountline->{amountoutstanding}; - if ($accountline->{accounttype} eq 'Pay') { + if ($accountline->{accounttype} =~ /^Pay/) { $accountline->{payment} = 1; $reverse_col = 1; } diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index 6a86bc3..eff3200 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.pl @@ -99,7 +99,7 @@ for (my $i=0;$i<$numaccts;$i++){ 'amount' => sprintf("%.2f",$accts->[$i]{'amount'}), 'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}), 'accountno' => $accts->[$i]{'accountno'}, - 'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ), + 'payment' => ( $accts->[$i]{'accounttype'} =~ /^Pay/ ), ); diff --git a/members/printinvoice.pl b/members/printinvoice.pl index 10ae114..42e1182 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -99,7 +99,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) { 'amount' => sprintf( "%.2f", $accts->[$i]{'amount'} ), 'amountoutstanding' => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ), 'accountno' => $accts->[$i]{'accountno'}, - 'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ), + 'payment' => ( $accts->[$i]{'accounttype'} =~ /^Pay/ ), ); if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) { -- 1.8.3.2