Fix for Bug 3949, "already received box has funny shading" and other cosmetic changes

[koha_fer] / members / member-flags.pl

diff --git a/members/member-flags.pl b/members/member-flags.pl
index 4f45033..749cecc 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -5,12 +5,14 @@
 # July 26, 2002 (my birthday!)
 
 use strict;
+use warnings;
 
 use CGI;
 use C4::Output;
 use C4::Auth qw(:DEFAULT :EditPermissions);
 use C4::Context;
 use C4::Members;
+use C4::Branch;
 #use C4::Acquisitions;
 
 use C4::Output;
@@ -153,6 +155,13 @@ if ($input->param('newflags')) {
            push @loop, \%row;
     }
 
+    if ( $bor->{'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;
+    }
+       
 $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
     my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
     $template->param( picture => 1 ) if $picture;
@@ -164,14 +173,16 @@ $template->param(
                firstname => $bor->{'firstname'},
                categorycode => $bor->{'categorycode'},
                category_type => $bor->{'category_type'},
-               category_description => $bor->{'description'},
+               categoryname => $bor->{'description'},
                address => $bor->{'address'},
                address2 => $bor->{'address2'},
                city => $bor->{'city'},
                zipcode => $bor->{'zipcode'},
+               country => $bor->{'country'},
                phone => $bor->{'phone'},
                email => $bor->{'email'},
                branchcode => $bor->{'branchcode'},
+               branchname => GetBranchName($bor->{'branchcode'}),
                loop => \@loop,
                is_child        => ($bor->{'category_type'} eq 'C'),
                );