batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails.

[koha.git] / members / boraccount.pl

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 0492f62..40dd68a 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -28,7 +28,7 @@ use C4::Output;
 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,13 +95,10 @@ for (my $i=0;$i<$numaccts;$i++){
     push(@accountrows, \%row);
 }
 
-my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 
-# grab patron's image if available
-my $picture = GetPatronImage($data->{'cardnumber'});
-$template->param( picture => $picture );
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
 
 $template->param(
     finesview           => 1,
@@ -102,7 +108,8 @@ $template->param(
     cardnumber          => $data->{'cardnumber'},
     categorycode        => $data->{'categorycode'},
     category_type       => $data->{'category_type'},
-    category_description => $data->{'description'},
+ #   category_description => $data->{'description'},
+    categoryname                => $data->{'description'},
     address             => $data->{'address'},
     address2            => $data->{'address2'},
     city                => $data->{'city'},
@@ -110,8 +117,10 @@ $template->param(
     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;