X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fboraccount.pl;h=40dd68ae369f7013df4cc5be69d2ab2ab290957f;hb=7c0183e07a465e47d15a2c662c17494e02369ca9;hp=350b537e14ca9ae8ebd9fcb953019d43a295b4de;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha.git

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 350b537e14..40dd68ae36 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -25,10 +25,10 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use CGI;
 use C4::Members;
-
+use C4::Branch;
 
 my $input=new CGI;
 
@@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
                             debug => 1,
                             });
 
@@ -46,6 +46,13 @@ my $borrowernumber=$input->param('borrowernumber');
 #get borrower details
 my $data=GetMember($borrowernumber,'borrowernumber');
 
+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);
 my $totalcredit;
@@ -75,6 +82,8 @@ 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'}) );
     
@@ -86,12 +95,32 @@ 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(
-                firstname       => $data->{'firstname'},
-                surname         => $data->{'surname'},
-                borrowernumber          => $borrowernumber,
-                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'},
+    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;