Bug 5670: [QA Followup] Fix `div.patroninfo`.

[koha-ffzg.git] / members / printinvoice.pl

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 4999fbb..252c241 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -28,10 +28,11 @@ use C4::Output;
 use Koha::DateUtils;
 use CGI qw ( -utf8 );
 use C4::Members;
-use C4::Branch;
 use C4::Accounts;
 use Koha::Patron::Images;
 
+use Koha::Patron::Categories;
+
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -52,10 +53,9 @@ my $accountlines_id = $input->param('accountlines_id');
 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;
+    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
+    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
+    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
 }
 
 #get account details
@@ -101,6 +101,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
         'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
         'accountno'               => $accts->[$i]{'accountno'},
         accounttype               => $accts->[$i]{accounttype},
+        'note'                    => $accts->[$i]{'note'},
     );
 
     if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
@@ -133,7 +134,6 @@ $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' ),