Bug 7695 - Change boolean operator from "and" to "AND"

[koha_gimpoz] / members / pay.pl

diff --git a/members/pay.pl b/members/pay.pl
index 72a109f..fe1dc8c 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -43,7 +43,7 @@ use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input = CGI->new;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/pay.tmpl',
         query           => $input,
         type            => 'intranet',
@@ -53,9 +53,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $writeoff_sth;
-my $add_writeoff_sth;
-
 my @names = $input->param;
 
 my $borrowernumber = $input->param('borrowernumber');
@@ -89,8 +86,8 @@ if ($writeoff_all) {
     my $accountno    = $input->param('accountno');
     my $itemno       = $input->param('itemnumber');
     my $account_type = $input->param('accounttype');
-    my $amount       = $input->param('amount');
-    writeoff( $accountno, $itemno, $account_type, $amount );
+    my $amount       = $input->param('amountoutstanding');
+    WriteOffFee( $borrowernumber, $accountno, $itemno, $account_type, $amount, $branch );
 }
 
 for (@names) {
@@ -109,21 +106,6 @@ add_accounts_to_template();
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
-sub writeoff {
-    my ( $accountnum, $itemnum, $accounttype, $amount ) = @_;
-
-    # if no item is attached to fine, make sure to store it as a NULL
-    $itemnum ||= undef;
-    get_writeoff_sth();
-    $writeoff_sth->execute( $accountnum, $borrowernumber );
-
-    my $acct = getnextacctno($borrowernumber);
-    $add_writeoff_sth->execute( $borrowernumber, $acct, $itemnum, $amount );
-
-    UpdateStats( $branch, 'writeoff', $amount, q{}, q{}, q{}, $borrowernumber );
-
-    return;
-}
 
 sub add_accounts_to_template {
 
@@ -200,9 +182,9 @@ sub writeoff_all {
 
             #    my $borrowernum    = $input->param("borrowernumber$value");
             my $itemno    = $input->param("itemnumber$value");
-            my $amount    = $input->param("amount$value");
+            my $amount    = $input->param("amountoutstanding$value");
             my $accountno = $input->param("accountno$value");
-            writeoff( $accountno, $itemno, $accounttype, $amount );
+            WriteOffFee( $borrowernumber, $accountno, $itemno, $accounttype, $amount, $branch );
         }
     }
 
@@ -268,23 +250,3 @@ sub payselected {
     print $input->redirect($redirect);
     return;
 }
-
-sub get_writeoff_sth {
-
-    # lets prepare these statement handles only once
-    if ($writeoff_sth) {
-        return;
-    } else {
-        my $dbh = C4::Context->dbh;
-
-        # Do we need to validate accounttype
-        my $sql = 'Update accountlines set amountoutstanding=0 '
-          . 'WHERE accountno=? and borrowernumber=?';
-        $writeoff_sth = $dbh->prepare($sql);
-        my $insert =
-q{insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype)}
-          . q{values (?,?,?,now(),?,'Writeoff','W')};
-        $add_writeoff_sth = $dbh->prepare($insert);
-    }
-    return;
-}