DBI call fix for bug 662

[koha-ffzg.git] / C4 / Accounts.pm

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index c203463..3020f7a 100755 (executable)
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -1,6 +1,6 @@
 package C4::Accounts; #assumes C4/Accounts
 
-# This module uses the CDK modules, and crashes if called from a web script
+# FIXME: This module uses the CDK modules, and crashes if called from a web script
 # Hence the existence of Accounts2
 #
 # This module will be deprecated when we build a new curses/slang/character
@@ -32,8 +32,8 @@ use C4::Context;
 use C4::Format;
 use C4::Search;
 use C4::Stats;
-use C4::InterfaceCDK;
-use C4::Interface::AccountsCDK;
+#use C4::InterfaceCDK;
+#use C4::Interface::AccountsCDK;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
@@ -61,10 +61,6 @@ patron.
 
 @ISA = qw(Exporter);
 @EXPORT = qw(&checkaccount &reconcileaccount &getnextacctno);
-# FIXME - This is never used
-sub displayaccounts{
-  my ($env)=@_;
-}
 
 =item checkaccount
 
@@ -160,7 +156,6 @@ sub reconcileaccount {
 sub recordpayment{
   #here we update both the accountoffsets and the account lines
   my ($env,$bornumber,$dbh,$data)=@_;
-  my $updquery = "";
   my $newamtos = 0;
   my $accdata = "";
   my $amountleft = $data;
@@ -169,11 +164,10 @@ sub recordpayment{
 #  $sth->execute;
   my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
   # get lines with outstanding amounts to offset
-  my $query = "select * from accountlines
-  where (borrowernumber = '$bornumber') and (amountoutstanding<>0)
-  order by date";
-  my $sth = $dbh->prepare($query);
-  $sth->execute;
+  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) {
@@ -184,18 +178,16 @@ sub recordpayment{
        $amountleft = 0;
      }
      my $thisacct = $accdata->{accountno};
-     $updquery = "update accountlines set amountoutstanding= '$newamtos'
-     where (borrowernumber = '$bornumber') and (accountno='$thisacct')";
-     my $usth = $dbh->prepare($updquery);
-     $usth->execute;
+     my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
+     where (borrowernumber = ?) and (accountno=?)");
+     $usth->execute($newamtos,$bornumber,$thisacct);
      $usth->finish;
-     $updquery = "insert into accountoffsets
+     
+     $usth = $dbh->prepare("insert into accountoffsets
      (borrowernumber, accountno, offsetaccount,  offsetamount)
-     values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
-     # FIXME - There's already a $usth in this scope.
-     my $usth = $dbh->prepare($updquery);
+     values (?,?,?,?)");
 #     print $updquery
-     $usth->execute;
+     $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
      $usth->finish;
   }
   # create new line
@@ -203,19 +195,12 @@ sub recordpayment{
   #accountno,date,amount,description,accounttype,amountoutstanding) values
   #($bornumber,$nextaccntno,datetime('now'::abstime),0-$data,'Payment,thanks',
   #'Pay',0-$amountleft)";
-  $updquery = "insert into accountlines
+  my $usth = $dbh->prepare("insert into accountlines
   (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)
-  values ($bornumber,$nextaccntno,now(),0-$data,'Payment,thanks',
-  'Pay',0-$amountleft)";
-  my $usth = $dbh->prepare($updquery);
-  $usth->execute;
+  values (?,?,now(),?,?,'Payment,thanks','Pay')");
+  $usth->execute($bornumber,$nextaccntno,0-$data,0-$amountleft);
   $usth->finish;
   UpdateStats($env,'branch','payment',$data)
-#  $sth->finish;
-#  $query = "commit";
-#  $sth = $dbh->prepare;
-#  $sth->execute;
-#  $sth-finish;
 }
 
 =item getnextacctno
@@ -234,18 +219,14 @@ C<$env> is ignored.
 sub getnextacctno {
   my ($env,$bornumber,$dbh)=@_;
   my $nextaccntno = 1;
-  # FIXME - This could just be
-  #    SELECT max(accountno)+1 from accountlines;
-  my $query = "select * from accountlines
-  where (borrowernumber = '$bornumber')
-  order by accountno desc";
-  my $sth = $dbh->prepare($query);
+  
+  my $sth = $dbh->prepare("select max(accountno)+1 from accountlines");
   $sth->execute;
   if (my $accdata=$sth->fetchrow_hashref){
     $nextaccntno = $accdata->{'accountno'} + 1;
   }
   $sth->finish;
-  return($nextaccntno);
+  return$nextaccntno;
 }
 
 END { }       # module clean-up code here (global destructor)