Bug 5453 : Move declarations out of conditionals

[koha_gimpoz] / members / pay.pl

diff --git a/members/pay.pl b/members/pay.pl
index 6ea2c21..4ecdcc9 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -13,9 +14,9 @@
 # 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.
 
 
 =head1 pay.pl
@@ -26,6 +27,8 @@
 =cut
 
 use strict;
+use warnings;
+
 use C4::Context;
 use C4::Auth;
 use C4::Output;
@@ -39,13 +42,24 @@ use C4::Branch; # GetBranches
 
 my $input = new CGI;
 
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "members/pay.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1, updatecharges => 1 },
+        debug           => 1,
+    }
+);
+
 my $borrowernumber = $input->param('borrowernumber');
 if ( $borrowernumber eq '' ) {
     $borrowernumber = $input->param('borrowernumber0');
 }
 
 # get borrower details
-my $data = GetMember( $borrowernumber,'borrowernumber' );
+my $data = GetMember( borrowernumber => $borrowernumber );
 my $user = $input->remote_user;
 
 # get account details
@@ -70,19 +84,16 @@ for ( my $i = 0 ; $i < @names ; $i++ ) {
         makepayment( $borrowernumber, $accountno, $amount, $user, $branch );
         $check = 2;
     }
+    if ( $temp eq 'no'||$temp eq 'yes'||$temp eq 'wo') {
+        my $borrowernumber = $input->param( $names[ $i + 5 ] );
+        my $accountno      = $input->param( $names[ $i + 6 ] );
+        my $note     = $input->param( $names[ $i + 10 ] );
+        ModNote( $borrowernumber, $accountno, $note );
+    }
 }
-my $total = $input->param('total');
+
+my $total = $input->param('total') || '';
 if ( $check == 0 ) {
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "members/pay.tmpl",
-            query           => $input,
-            type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { borrowers => 1 },
-            debug           => 1,
-        }
-    );
     if ( $total ne '' ) {
         recordpayment( $borrowernumber, $total );
     }
@@ -111,10 +122,11 @@ if ( $check == 0 ) {
                 $line{borrowernumber} = $borrowernumber;
                 $line{accountno}      = $accts->[$i]{'accountno'};
                 $line{description}    = $accts->[$i]{'description'};
+                $line{note}           = $accts->[$i]{'note'};
                 $line{title}          = $accts->[$i]{'title'};
                 $line{notify_id}      = $accts->[$i]{'notify_id'};
                 $line{notify_level}   = $accts->[$i]{'notify_level'};
-                $line{net_balance} = 1;
+                $line{net_balance} = 1 if($accts->[$i]{'amountoutstanding'} > 0); # you can't pay a credit.
                 push( @loop_pay, \%line );
             }
         }
@@ -130,26 +142,37 @@ if ( $check == 0 ) {
           };
     }
        
-my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+       
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
        
     $template->param(
         allfile        => \@allfile,
         firstname      => $data->{'firstname'},
         surname        => $data->{'surname'},
         borrowernumber => $borrowernumber,
-               cardnumber => $data->{'cardnumber'},
-           categorycode => $data->{'categorycode'},
-           category_type => $data->{'category_type'},
-           category_description => $data->{'description'},
-           address => $data->{'address'},
-               address2 => $data->{'address2'},
-           city => $data->{'city'},
-               zipcode => $data->{'zipcode'},
-               phone => $data->{'phone'},
-               email => $data->{'email'},
-           branchcode => $data->{'branchcode'},
+       cardnumber => $data->{'cardnumber'},
+       categorycode => $data->{'categorycode'},
+       category_type => $data->{'category_type'},
+       categoryname  => $data->{'description'},
+       address => $data->{'address'},
+       address2 => $data->{'address2'},
+       city => $data->{'city'},
+    state => $data->{'state'},
+       zipcode => $data->{'zipcode'},
+       country => $data->{'country'},
+       phone => $data->{'phone'},
+       email => $data->{'email'},
+       branchcode => $data->{'branchcode'},
+       branchname => GetBranchName($data->{'branchcode'}),
+       is_child        => ($data->{'category_type'} eq 'C'),
         total          => sprintf( "%.2f", $total )
     );
     output_html_with_http_headers $input, $cookie, $template->output;
@@ -186,9 +209,10 @@ sub writeoff {
     my ( $borrowernumber, $accountnum, $itemnum, $accounttype, $amount ) = @_;
     my $user = $input->remote_user;
     my $dbh  = C4::Context->dbh;
+    undef $itemnum unless $itemnum; # if no item is attached to fine, make sure to store it as a NULL
     my $sth =
       $dbh->prepare(
-"Update accountlines set amountoutstanding=0 where (accounttype='Res' OR accounttype='FU' OR accounttype ='IP' OR accounttype='CH' OR accounttype='N' OR accounttype='F' OR accounttype='A' OR accounttype='M' OR accounttype='L' OR accounttype='RE' OR accounttype='RL') and accountno=? and borrowernumber=?"
+"Update accountlines set amountoutstanding=0 where accountno=? and borrowernumber=?"
       );
     $sth->execute( $accountnum, $borrowernumber );
     $sth->finish;