X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fboraccount.pl;h=6233e780841d7556dc6ff3310d4365b799e4fe4b;hb=ed9d4873d4c09a050a60532202d6758bc634c122;hp=eec30d18d8828b5ed0a52e66478d7627d47ab02a;hpb=5a541da6ce3372243c6e866883117a4e4d6a7395;p=koha_gimpoz

diff --git a/members/boraccount.pl b/members/boraccount.pl
index eec30d18d8..6233e78084 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -23,12 +23,15 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 use C4::Auth;
 use C4::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use CGI;
 use C4::Members;
-
+use C4::Branch;
+use C4::Accounts;
 
 my $input=new CGI;
 
@@ -38,13 +41,26 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
                             debug => 1,
                             });
 
 my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+
 #get borrower details
-my $data=GetMember($borrowernumber,'borrowernumber');
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'reverse' ) {
+  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+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;
+}
 
 #get account details
 my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
@@ -75,8 +91,14 @@ for (my $i=0;$i<$numaccts;$i++){
                 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
                 'toggle' => $accts->[$i]{'toggle'},
                 'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
                 'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
-                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}) );
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+                
+                );
     
     if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
         $row{'printtitle'}=1;
@@ -86,24 +108,33 @@ for (my $i=0;$i<$numaccts;$i++){
     push(@accountrows, \%row);
 }
 
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
 $template->param(
-				finesview => 1,
-                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'},
-	            total => sprintf("%.2f",$total),
-                totalcredit => $totalcredit,
-                accounts        => \@accountrows );
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    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'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
 
 output_html_with_http_headers $input, $cookie, $template->output;