X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FAccounts.pm;h=2352e9e5b73cde5d61d42666bc908362f35fe200;hb=3bb33fd666d4d0eea26114b373874189edc82459;hp=a8db9307c864caf8478cadd577f364a498ccc585;hpb=534956bc31f84bd11e75092f92b34a2b3ac1459a;p=koha_gimpoz diff --git a/C4/Accounts.pm b/C4/Accounts.pm index a8db9307c8..2352e9e5b7 100644 --- a/C4/Accounts.pm +++ b/C4/Accounts.pm @@ -13,28 +13,33 @@ package C4::Accounts; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +#use warnings; FIXME - Bug 2505 use C4::Context; use C4::Stats; use C4::Members; use C4::Items; +use C4::Circulation qw(MarkIssueReturned); -#use C4::Circulation; use vars qw($VERSION @ISA @EXPORT); BEGIN { # set the version for version checking - $VERSION = 3.01; + $VERSION = 3.03; require Exporter; @ISA = qw(Exporter); @EXPORT = qw( - &recordpayment &fixaccounts &makepayment &manualinvoice - &getnextacctno &reconcileaccount + &recordpayment &makepayment &manualinvoice + &getnextacctno &reconcileaccount &getcharges &ModNote &getcredits + &getrefunds &chargelostitem + &ReversePayment + makepartialpayment + recordpayment_selectaccts ); } @@ -72,7 +77,7 @@ will be credited to the next one. #' sub recordpayment { - #here we update both the accountoffsets and the account lines + #here we update the account lines my ( $borrowernumber, $data ) = @_; my $dbh = C4::Context->dbh; my $newamtos = 0; @@ -108,13 +113,13 @@ sub recordpayment { ); $usth->execute( $newamtos, $borrowernumber, $thisacct ); $usth->finish; - $usth = $dbh->prepare( - "INSERT INTO accountoffsets - (borrowernumber, accountno, offsetaccount, offsetamount) - VALUES (?,?,?,?)" - ); - $usth->execute( $borrowernumber, $accdata->{'accountno'}, - $nextaccntno, $newamtos ); +# $usth = $dbh->prepare( +# "INSERT INTO accountoffsets +# (borrowernumber, accountno, offsetaccount, offsetamount) +# VALUES (?,?,?,?)" +# ); +# $usth->execute( $borrowernumber, $accdata->{'accountno'}, +# $nextaccntno, $newamtos ); $usth->finish; } @@ -126,7 +131,7 @@ sub recordpayment { ); $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft ); $usth->finish; - UpdateStats( $branch, 'payment', $data, '', '', '', $borrowernumber ); + UpdateStats( $branch, 'payment', $data, '', '', '', $borrowernumber, $nextaccntno ); $sth->finish; } @@ -155,6 +160,8 @@ sub makepayment { # from their card, and put a note on the item record my ( $borrowernumber, $accountno, $amount, $user, $branch ) = @_; my $dbh = C4::Context->dbh; + my $manager_id = 0; + $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; # begin transaction my $nextaccntno = getnextacctno($borrowernumber); @@ -166,38 +173,48 @@ sub makepayment { my $data = $sth->fetchrow_hashref; $sth->finish; - $dbh->do( - "UPDATE accountlines - SET amountoutstanding = 0 - WHERE borrowernumber = $borrowernumber - AND accountno = $accountno - " - ); - - # print $updquery; - $dbh->do( " - INSERT INTO accountoffsets - (borrowernumber, accountno, offsetaccount, - offsetamount) - VALUES ($borrowernumber, $accountno, $nextaccntno, $newamtos) - " ); - - # create new line - my $payment = 0 - $amount; - $dbh->do( " - INSERT INTO accountlines - (borrowernumber, accountno, date, amount, - description, accounttype, amountoutstanding) - VALUES ($borrowernumber, $nextaccntno, now(), $payment, - 'Payment,thanks - $user', 'Pay', 0) - " ); + if($data->{'accounttype'} eq "Pay"){ + my $udp = + $dbh->prepare( + "UPDATE accountlines + SET amountoutstanding = 0, description = 'Payment,thanks' + WHERE borrowernumber = ? + AND accountno = ? + " + ); + $udp->execute($borrowernumber, $accountno ); + $udp->finish; + }else{ + my $udp = + $dbh->prepare( + "UPDATE accountlines + SET amountoutstanding = 0 + WHERE borrowernumber = ? + AND accountno = ? + " + ); + $udp->execute($borrowernumber, $accountno ); + $udp->finish; + + # create new line + my $payment = 0 - $amount; + + my $ins = + $dbh->prepare( + "INSERT + INTO accountlines (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding) + VALUES ( ?, ?, now(), ?, 'Payment,thanks', 'Pay', 0)" + ); + $ins->execute($borrowernumber, $nextaccntno, $payment); + $ins->finish; + } # FIXME - The second argument to &UpdateStats is supposed to be the # branch code. # UpdateStats is now being passed $accountno too. MTJ UpdateStats( $user, 'payment', $amount, '', '', '', $borrowernumber, $accountno ); - $sth->finish; + #from perldoc: for SELECT only #$sth->finish; #check to see what accounttype if ( $data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L' ) { @@ -216,29 +233,22 @@ borrower number. #' # FIXME - Okay, so what does the above actually _mean_? -sub getnextacctno { - my ($borrowernumber) = @_; - my $nextaccntno = 1; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( - "SELECT * FROM accountlines - WHERE (borrowernumber = ?) - ORDER BY accountno DESC" +sub getnextacctno ($) { + my ($borrowernumber) = shift or return undef; + my $sth = C4::Context->dbh->prepare( + "SELECT accountno+1 FROM accountlines + WHERE (borrowernumber = ?) + ORDER BY accountno DESC + LIMIT 1" ); $sth->execute($borrowernumber); - if ( my $accdata = $sth->fetchrow_hashref ) { - $nextaccntno = $accdata->{'accountno'} + 1; - } - $sth->finish; - return ($nextaccntno); + return ($sth->fetchrow || 1); } -=head2 fixaccounts +=head2 fixaccounts (removed) &fixaccounts($borrowernumber, $accountnumber, $amount); -=cut - #' # FIXME - I don't understand what this function does. sub fixaccounts { @@ -263,31 +273,75 @@ sub fixaccounts { WHERE borrowernumber = $borrowernumber AND accountno = $accountno EOT + # FIXME: exceedingly bad form. Use prepare with placholders ("?") in query and execute args. } -# FIXME - Never used, but not exported, either. -sub returnlost { +=cut + +sub returnlost{ my ( $borrowernumber, $itemnum ) = @_; - my $dbh = C4::Context->dbh; - my $borrower = C4::Members::GetMember( $borrowernumber, 'borrowernumber' ); - my $sth = $dbh->prepare( - "UPDATE issues SET returndate=now() WHERE - borrowernumber=? AND itemnumber=? AND returndate IS NULL" - ); - $sth->execute( $borrowernumber, $itemnum ); - $sth->finish; + C4::Circulation::MarkIssueReturned( $borrowernumber, $itemnum ); + my $borrower = C4::Members::GetMember( 'borrowernumber'=>$borrowernumber ); my @datearr = localtime(time); - my $date = - ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3]; - my $bor = -"$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; + my $date = ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3]; + my $bor = "$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; ModItem({ paidfor => "Paid for by $bor $date" }, undef, $itemnum); } + +sub chargelostitem{ +# lost ==1 Lost, lost==2 longoverdue, lost==3 lost and paid for +# FIXME: itemlost should be set to 3 after payment is made, should be a warning to the interface that +# a charge has been added +# FIXME : if no replacement price, borrower just doesn't get charged? + + my $dbh = C4::Context->dbh(); + my ($itemnumber) = @_; + my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title + FROM issues + JOIN items USING (itemnumber) + JOIN biblio USING (biblionumber) + WHERE issues.itemnumber=?"); + $sth->execute($itemnumber); + my $issues=$sth->fetchrow_hashref(); + + # if a borrower lost the item, add a replacement cost to the their record + if ( $issues->{borrowernumber} ){ + + # first make sure the borrower hasn't already been charged for this item + my $sth1=$dbh->prepare("SELECT * from accountlines + WHERE borrowernumber=? AND itemnumber=? and accounttype='L'"); + $sth1->execute($issues->{'borrowernumber'},$itemnumber); + my $existing_charge_hashref=$sth1->fetchrow_hashref(); + + # OK, they haven't + unless ($existing_charge_hashref) { + # This item is on issue ... add replacement cost to the borrower's record and mark it returned + # Note that we add this to the account even if there's no replacement price, allowing some other + # process (or person) to update it, since we don't handle any defaults for replacement prices. + my $accountno = getnextacctno($issues->{'borrowernumber'}); + my $sth2=$dbh->prepare("INSERT INTO accountlines + (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber) + VALUES (?,?,now(),?,?,'L',?,?)"); + $sth2->execute($issues->{'borrowernumber'},$accountno,$issues->{'replacementprice'}, + "Lost Item $issues->{'title'} $issues->{'barcode'}", + $issues->{'replacementprice'},$itemnumber); + $sth2->finish; + # FIXME: Log this ? + } + #FIXME : Should probably have a way to distinguish this from an item that really was returned. + #warn " $issues->{'borrowernumber'} / $itemnumber "; + C4::Circulation::MarkIssueReturned($issues->{borrowernumber},$itemnumber); + # Shouldn't MarkIssueReturned do this? + C4::Items::ModItem({ onloan => undef }, undef, $itemnumber); + } + $sth->finish; +} + =head2 manualinvoice &manualinvoice($borrowernumber, $itemnumber, $description, $type, - $amount, $user); + $amount, $note); C<$borrowernumber> is the patron's borrower number. C<$description> is a description of the transaction. @@ -299,47 +353,58 @@ should be the empty string. =cut #' -# FIXME - Okay, so what does this function do, really? +# 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, $user ) = @_; + my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_; + my $manager_id = 0; + $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; my $dbh = C4::Context->dbh; my $notifyid = 0; my $insert; - $itemnum =~ s/ //g; 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 '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 .= " New Card"; } if ( $type eq 'F' ) { - $desc .= "Fine"; + $desc .= " Fine"; } if ( $type eq 'A' ) { - $desc .= "Account Management fee"; + $desc .= " Account Management fee"; } if ( $type eq 'M' ) { - $desc .= "Sundry"; + $desc .= " Sundry"; } if ( $type eq 'L' && $desc eq '' ) { - $desc = "Lost Item"; - } - if ( $type eq 'REF' ) { - $desc .= "Cash Refund"; - $amountleft = refund( '', $borrowernumber, $amount ); + $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' ) @@ -349,33 +414,34 @@ sub manualinvoice { $notifyid = 1; } - if ( $itemnum ne '' ) { - $desc .= " " . $itemnum; + if ( $itemnum ) { + $desc .= ' ' . $itemnum; my $sth = $dbh->prepare( - "INSERT INTO accountlines - (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id) - VALUES (?, ?, now(), ?,?, ?,?,?,?)"); - $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid) || return $sth->errstr; + 'INSERT INTO accountlines + (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id, note, manager_id) + VALUES (?, ?, now(), ?,?, ?,?,?,?,?,?)'); + $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid, $note, $manager_id) || return $sth->errstr; } else { my $sth=$dbh->prepare("INSERT INTO accountlines - (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id) - VALUES (?, ?, now(), ?, ?, ?, ?,?)" + (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id, note, manager_id) + VALUES (?, ?, now(), ?, ?, ?, ?,?,?,?)" ); $sth->execute( $borrowernumber, $accountno, $amount, $desc, $type, - $amountleft, $notifyid ); + $amountleft, $notifyid, $note, $manager_id ); } return 0; } -=head2 fixcredit +=head2 fixcredit #### DEPRECATED $amountleft = &fixcredit($borrowernumber, $data, $barcode, $type, $user); This function is only used internally, not exported. - FIXME - Figure out what this function does, and write it down. =cut +# This function is deprecated in 3.0 + sub fixcredit { #here we update both the accountoffsets and the account lines @@ -478,7 +544,10 @@ sub fixcredit { =head2 refund -# FIXME - Figure out what this function does, and write it down. +#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 @@ -535,6 +604,189 @@ sub refund { return ($amountleft); } +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 ( $borrowernumber, $accountno, $note ) = @_; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare('UPDATE accountlines SET note = ? WHERE borrowernumber = ? AND accountno = ?'); + $sth->execute( $note, $borrowernumber, $accountno ); +} + +sub getcredits { + my ( $date, $date2 ) = @_; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare( + "SELECT * FROM accountlines,borrowers + WHERE amount < 0 AND accounttype <> '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 execute( $date, $date2 ); + + my @results; + while ( my $data = $sth->fetchrow_hashref ) { + push @results,$data; + + } + return (@results); +} + +sub ReversePayment { + my ( $borrowernumber, $accountno ) = @_; + my $dbh = C4::Context->dbh; + + my $sth = $dbh->prepare('SELECT amountoutstanding FROM accountlines WHERE borrowernumber = ? AND accountno = ?'); + $sth->execute( $borrowernumber, $accountno ); + my $row = $sth->fetchrow_hashref(); + my $amount_outstanding = $row->{'amountoutstanding'}; + + if ( $amount_outstanding <= 0 ) { + $sth = $dbh->prepare('UPDATE accountlines SET amountoutstanding = amount * -1, description = CONCAT( description, " Reversed -" ) WHERE borrowernumber = ? AND accountno = ?'); + $sth->execute( $borrowernumber, $accountno ); + } else { + $sth = $dbh->prepare('UPDATE accountlines SET amountoutstanding = 0, description = CONCAT( description, " Reversed -" ) WHERE borrowernumber = ? AND accountno = ?'); + $sth->execute( $borrowernumber, $accountno ); + } +} + +=head2 recordpayment_selectaccts + + recordpayment_selectaccts($borrowernumber, $payment,$accts); + +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. C<$accts> is an array ref to a list of +accountnos which the payment can be recorded against + +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 +of $1.50, then the oldest fine will be paid off in full, and $0.50 +will be credited to the next one. + +=cut + +sub recordpayment_selectaccts { + my ( $borrowernumber, $amount, $accts ) = @_; + + my $dbh = C4::Context->dbh; + my $newamtos = 0; + my $accdata = q{}; + my $branch = C4::Context->userenv->{branch}; + my $amountleft = $amount; + my $sql = 'SELECT * FROM accountlines WHERE (borrowernumber = ?) ' . + 'AND (amountoutstanding<>0) '; + if (@{$accts} ) { + $sql .= ' AND accountno IN ( ' . join ',', @{$accts}; + $sql .= ' ) '; + } + $sql .= ' ORDER BY date'; + # begin transaction + my $nextaccntno = getnextacctno($borrowernumber); + + # get lines with outstanding amounts to offset + my $rows = $dbh->selectall_arrayref($sql, { Slice => {} }, $borrowernumber); + + # offset transactions + my $sth = $dbh->prepare('UPDATE accountlines SET amountoutstanding= ? ' . + 'WHERE (borrowernumber = ?) AND (accountno=?)'); + for my $accdata ( @{$rows} ) { + if ($amountleft == 0) { + last; + } + if ( $accdata->{amountoutstanding} < $amountleft ) { + $newamtos = 0; + $amountleft -= $accdata->{amountoutstanding}; + } + else { + $newamtos = $accdata->{amountoutstanding} - $amountleft; + $amountleft = 0; + } + my $thisacct = $accdata->{accountno}; + $sth->execute( $newamtos, $borrowernumber, $thisacct ); + } + + # create new line + $sql = 'INSERT INTO accountlines ' . + '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding) ' . + q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?)|; + $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft ); + UpdateStats( $branch, 'payment', $amount, '', '', '', $borrowernumber, $nextaccntno ); + return; +} + +# makepayment needs to be fixed to handle partials till then this separate subroutine +# fills in +sub makepartialpayment { + my ( $borrowernumber, $accountno, $amount, $user, $branch ) = @_; + if (!$amount || $amount < 0) { + return; + } + my $dbh = C4::Context->dbh; + + my $nextaccntno = getnextacctno($borrowernumber); + my $newamtos = 0; + + my $data = $dbh->selectrow_hashref( + 'SELECT * FROM accountlines WHERE borrowernumber=? AND accountno=?',undef,$borrowernumber,$accountno); + my $new_outstanding = $data->{amountoutstanding} - $amount; + + my $update = 'UPDATE accountlines SET amountoutstanding = ? WHERE borrowernumber = ? ' + . ' AND accountno = ?'; + $dbh->do( $update, undef, $new_outstanding, $borrowernumber, $accountno); + + # create new line + my $insert = 'INSERT INTO accountlines (borrowernumber, accountno, date, amount, ' + . 'description, accounttype, amountoutstanding) ' + . ' VALUES (?, ?, now(), ?, ?, ?, 0)'; + + $dbh->do( $insert, undef, $borrowernumber, $nextaccntno, $amount, + "Payment, thanks - $user", 'Pay'); + + UpdateStats( $user, 'payment', $amount, '', '', '', $borrowernumber, $accountno ); + + return; +} + + + END { } # module clean-up code here (global destructor) 1;