[Koha-cvs] CVS: koha/C4 Accounts2.pm,1.25,1.26
Paul POULAIN
tipaul at users.sourceforge.net
Wed Oct 26 10:30:19 CEST 2005
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18712/C4
Modified Files:
Accounts2.pm
Log Message:
code cleaning : removing useless package (everything needed copied in Accounts2.pm)
Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Accounts2.pm 22 Sep 2005 10:01:45 -0000 1.25
--- Accounts2.pm 26 Oct 2005 08:30:17 -0000 1.26
***************
*** 53,57 ****
@ISA = qw(Exporter);
! @EXPORT = qw(&recordpayment &fixaccounts &makepayment &manualinvoice
&getnextacctno);
--- 53,57 ----
@ISA = qw(Exporter);
! @EXPORT = qw(
&getnextacctno);
***************
*** 61,196 ****
}
- =item recordpayment
- &recordpayment($env, $borrowernumber, $payment);
-
- 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<$env> is a reference-to-hash;
- C<$env-E<gt>{branchcode}> is the code of the branch where payment was
- made.
-
- 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{
- #here we update both the accountoffsets and the account lines
- my ($env,$bornumber,$data)=@_;
- warn "in accounts2.pm";
- my $dbh = C4::Context->dbh;
- my $newamtos = 0;
- my $accdata = "";
- my $branch=$env->{'branchcode'};
- warn $branch;
- my $amountleft = $data;
- # begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
- # get lines with outstanding amounts to offset
- my $sth = $dbh->prepare("select * from accountlines
- where (borrowernumber = ?) and (amountoutstanding<>0)
- order by date");
- $sth->execute($bornumber);
- # 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->{accountno};
- my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
- where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
- $usth->finish;
- $usth = $dbh->prepare("insert into accountoffsets
- (borrowernumber, accountno, offsetaccount, offsetamount)
- values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
- $usth->finish;
- }
- # create new line
- my $usth = $dbh->prepare("insert into accountlines
- (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)
- values (?,?,now(),?,'Payment,thanks','Pay',?)");
- $usth->execute($bornumber,$nextaccntno,0-$data,0-$amountleft);
- $usth->finish;
- UpdateStats($env,$branch,'payment',$data,'','','',$bornumber);
- $sth->finish;
- }
-
- =item makepayment
-
- &makepayment($borrowernumber, $acctnumber, $amount, $branchcode);
-
- Records the fact that a patron has paid off the entire amount he or
- she owes.
-
- C<$borrowernumber> is the patron's borrower number. C<$acctnumber> is
- the account that was credited. C<$amount> is the amount paid (this is
- only used to record the payment. It is assumed to be equal to the
- amount owed). C<$branchcode> is the code of the branch where payment
- was made.
-
- =cut
- #'
- # FIXME - I'm not at all sure about the above, because I don't
- # understand what the acct* tables in the Koha database are for.
- sub makepayment{
- #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 ($bornumber,$accountno,$amount,$user,$branch)=@_;
- my %env;
- $env{'branchcode'}=$branch;
- my $dbh = C4::Context->dbh;
- # begin transaction
- my $nextaccntno = getnextacctno(\%env,$bornumber,$dbh);
- my $newamtos=0;
- my $sth=$dbh->prepare("Select * from accountlines where borrowernumber=? and accountno=?");
- $sth->execute($bornumber,$accountno);
- my $data=$sth->fetchrow_hashref;
- $sth->finish;
-
- $dbh->do(<<EOT);
- UPDATE accountlines
- SET amountoutstanding = 0
- WHERE borrowernumber = $bornumber
- AND accountno = $accountno
- EOT
-
- # print $updquery;
- $dbh->do(<<EOT);
- INSERT INTO accountoffsets
- (borrowernumber, accountno, offsetaccount,
- offsetamount)
- VALUES ($bornumber, $accountno, $nextaccntno, $newamtos)
- EOT
-
- # create new line
- my $payment=0-$amount;
- $dbh->do(<<EOT);
- INSERT INTO accountlines
- (borrowernumber, accountno, date, amount,
- description, accounttype, amountoutstanding)
- VALUES ($bornumber, $nextaccntno, now(), $payment,
- 'Payment,thanks - $user', 'Pay', 0)
- EOT
-
- # FIXME - The second argument to &UpdateStats is supposed to be the
- # branch code.
- # UpdateStats is now being passed $accountno too. MTJ
- UpdateStats(\%env,$user,'payment',$amount,'','','',$bornumber,$accountno);
- $sth->finish;
- #check to see what accounttype
- if ($data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L'){
- returnlost($bornumber,$data->{'itemnumber'});
- }
- }
=item getnextacctno
--- 61,65 ----
***************
*** 222,252 ****
}
- =item fixaccounts
-
- &fixaccounts($borrowernumber, $accountnumber, $amount);
-
- =cut
- #'
- # FIXME - I don't understand what this function does.
- sub fixaccounts {
- my ($borrowernumber,$accountno,$amount)=@_;
- my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select * from accountlines where borrowernumber=?
- and accountno=?");
- $sth->execute($borrowernumber,$accountno);
- my $data=$sth->fetchrow_hashref;
- # FIXME - Error-checking
- my $diff=$amount-$data->{'amount'};
- my $outstanding=$data->{'amountoutstanding'}+$diff;
- $sth->finish;
-
- $dbh->do(<<EOT);
- UPDATE accountlines
- SET amount = '$amount',
- amountoutstanding = '$outstanding'
- WHERE borrowernumber = $borrowernumber
- AND accountno = $accountno
- EOT
- }
# FIXME - Never used, but not exported, either.
--- 91,94 ----
***************
*** 267,328 ****
}
- =item manualinvoice
-
- &manualinvoice($borrowernumber, $itemnumber, $description, $type,
- $amount, $user);
-
- 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.
-
- =cut
- #'
- # FIXME - Okay, so what does this function do, really?
- sub manualinvoice{
- my ($bornum,$itemnum,$desc,$type,$amount,$user)=@_;
- my $dbh = C4::Context->dbh;
- my $insert;
- $itemnum=~ s/ //g;
- my %env;
- my $accountno=getnextacctno('',$bornum,$dbh);
- 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(\%env,$bornum,$amount2,$itemnum,$type,$user);
- }
- if ($type eq 'N'){
- $desc.="New Card";
- }
- if ($type eq 'L' && $desc eq ''){
- $desc="Lost Item";
- }
- if ($type eq 'REF'){
- $amountleft=refund('',$bornum,$amount);
- }
- if ($itemnum ne ''){
- #FIXME to use ? before uncommenting
- # my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'");
- # $sth->execute;
- # my $data=$sth->fetchrow_hashref;
- # $sth->finish;
- $desc.=" ".$itemnum;
- my $sth=$dbh->prepare("INSERT INTO accountlines
- (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber)
- VALUES (?, ?, now(), ?,?, ?,?,?)");
- # $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
- $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
- } else {
- $desc=$dbh->quote($desc);
- my $sth=$dbh->prepare("INSERT INTO accountlines
- (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
- VALUES (?, ?, now(), ?, ?, ?, ?)");
- $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft);
- }
- }
# fixcredit
--- 109,112 ----
More information about the Koha-cvs
mailing list