X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fpay.pl;h=bd25aceee4f0456a5236347d3dbf186206960446;hb=85c9138b35199b222d9ec2f84be6b94b4a51d794;hp=b4883b549a310b67a9e43e400c6c6c0c4f92a55f;hpb=7bd99ef3657c02a60e9880a3aabb1883d50779b0;p=koha.git

diff --git a/members/pay.pl b/members/pay.pl
index b4883b549a..bd25aceee4 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -17,7 +17,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 =head1 pay.pl
 
@@ -27,6 +26,8 @@
 =cut
 
 use strict;
+use warnings;
+
 use C4::Context;
 use C4::Auth;
 use C4::Output;
@@ -40,20 +41,28 @@ 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 = borrdata( '', $borrowernumber );
+my $data = GetMember( borrowernumber => $borrowernumber );
 my $user = $input->remote_user;
 
 # get account details
-my %bor;
-$bor{'borrowernumber'} = $borrowernumber;
 my $branches = GetBranches();
-my $printers = GetPrinters();
 my $branch   = GetBranch( $input, $branches );
 
 my @names = $input->param;
@@ -75,25 +84,13 @@ for ( my $i = 0 ; $i < @names ; $i++ ) {
         $check = 2;
     }
 }
-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 );
     }
 
-    my ( $numaccts, $accts, $total ) = getboracctrecord( '', \%bor );
-
-#       creation d'une fonction qui va nous retourner le notify_id dans un tableau
+    my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 
     my @allfile;
     my @notify = NumberNotifyId($borrowernumber);
@@ -101,11 +98,11 @@ if ( $check == 0 ) {
     my $numberofnotify = scalar(@notify);
     for ( my $j = 0 ; $j < scalar(@notify) ; $j++ ) {
         my @loop_pay;
-        my ( $numaccts, $accts, $total ) =
-          GetBorNotifyAcctRecord( '', \%bor, $notify[$j] );
+        my ( $total , $accts, $numaccts) =
+          GetBorNotifyAcctRecord( $borrowernumber, $notify[$j] );
         for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
             my %line;
-            if ( $accts->[$i]{'amountoutstanding'} > 0 ) {
+            if ( $accts->[$i]{'amountoutstanding'} != 0 ) {
                 $accts->[$i]{'amount'}            += 0.00;
                 $accts->[$i]{'amountoutstanding'} += 0.00;
                 $line{i}           = $j . "" . $i;
@@ -120,29 +117,55 @@ if ( $check == 0 ) {
                 $line{title}          = $accts->[$i]{'title'};
                 $line{notify_id}      = $accts->[$i]{'notify_id'};
                 $line{notify_level}   = $accts->[$i]{'notify_level'};
-
+                $line{net_balance} = 1 if($accts->[$i]{'amountoutstanding'} > 0); # you can't pay a credit.
+                push( @loop_pay, \%line );
             }
-            push( @loop_pay, \%line );
         }
 
-        my $totalnotify = AmountNotify( $notify[$j] );
+        my $totalnotify = AmountNotify( $notify[$j], $borrowernumber );
         ( $totalnotify = '0' ) if ( $totalnotify =~ /^0.00/ );
         push @allfile,
           {
             'loop_pay' => \@loop_pay,
             'notify'   => $notify[$j],
-            'total'    => $totalnotify
+            'total'    =>  sprintf( "%.2f",$totalnotify),
+			
           };
     }
-
+	
+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'},
+	categoryname  => $data->{'description'},
+	address => $data->{'address'},
+	address2 => $data->{'address2'},
+	city => $data->{'city'},
+	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 )
     );
-    print "Content-Type: text/html\n\n", $template->output;
+    output_html_with_http_headers $input, $cookie, $template->output;
 
 }
 else {
@@ -169,16 +192,17 @@ else {
     }
     $borrowernumber = $input->param('borrowernumber');
     print $input->redirect(
-        "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
+        "/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
 }
 
 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;