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 82ac243..40dd68a 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 #writen 11/1/2000 by chris@katipo.oc.nz
 #script to display borrowers account details
@@ -26,78 +25,102 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use CGI;
 use C4::Members;
-use HTML::Template;
+use C4::Branch;
 
 my $input=new CGI;
 
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-#my %tmpldata = pathtotemplate ( template => 'boraccount.tmpl', theme => $theme );
-#my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
+
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/boraccount.tmpl",
-                            query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
-                            debug => 1,
-                            });
-
-my $bornum=$input->param('bornum');
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
 #get borrower details
-my $data=borrdata('',$bornum);
+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 %bor;
-$bor{'borrowernumber'}=$bornum;
-my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
 my $totalcredit;
 if($total <= 0){
-       $totalcredit = 1;
+        $totalcredit = 1;
 }
 my @accountrows; # this is for the tmpl-loop
 
 my $toggle;
 for (my $i=0;$i<$numaccts;$i++){
-       if($i%2){
-               $toggle = 0;
-       } else {
-               $toggle = 1;
-       }
-  $accts->[$i]{'toggle'} = $toggle;
-  $accts->[$i]{'amount'}+=0.00;
-  if($accts->[$i]{'amount'} <= 0){
-       $accts->[$i]{'amountcredit'} = 1;
-  }
-  $accts->[$i]{'amountoutstanding'}+=0.00;
-  if($accts->[$i]{'amountoutstanding'} <= 0){
-       $accts->[$i]{'amountoutstandingcredit'} = 1;
-  }
-  my %row = (   'date'              => format_date($accts->[$i]{'date'}),
-               'amountcredit' => $accts->[$i]{'amountcredit'},
-               'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
-               'toggle' => $accts->[$i]{'toggle'},
-               'description'       => $accts->[$i]{'description'},
-               'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
-               'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}) );
-
-  if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-    $row{'printtitle'}=1;
-    $row{'title'} = $accts->[$i]{'title'};
-  }
-
-  push(@accountrows, \%row);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                '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'}) );
+    
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+    
+    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'},
-                       bornum          => $bornum,
-                       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;