Fix itemtype image problem in moremember.pl

[srvgit] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index a41bc1b..87a5659 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -37,6 +37,7 @@ use C4::Context;
 use C4::Auth;
 use C4::Output;
 use C4::Members;
+use C4::Members::Attributes;
 use C4::Dates;
 use C4::Reserves;
 use C4::Circulation;
@@ -101,8 +102,7 @@ if ( $reregistration eq 'y' ) {
        $data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber );
 }
 
-my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
+my $category_type = $data->{'category_type'};
 
 ### $category_type
 
@@ -131,19 +131,18 @@ $data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} );
 $data->{ "sex_".$data->{'sex'}."_p" } = 1;
 
 my $catcode;
-if ( $category_type eq 'C' and $data->{'guarantorid'} ne '0' ) {
-    my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber');
-    foreach (qw(address city B_address B_city phone mobile zipcode)) {
-        $data->{$_} = $data2->{$_};
-    }
-    my  ( $catcodes, $labels ) = 
-        GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
-    my $cnt = scalar(@$catcodes);
-
-#     $cnt  =  1;
-    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
-       
-    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+if ( $category_type eq 'C') {
+       if ($data->{'guarantorid'} ne '0' ) {
+       my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber');
+       foreach (qw(address city B_address B_city phone mobile zipcode)) {
+           $data->{$_} = $data2->{$_};
+       }
+   }
+   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;
 }
 
 
@@ -217,8 +216,9 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 #
 my ( $count, $issue ) = GetPendingIssues($borrowernumber);
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
-my $today       = POSIX::strftime("%Y%m%d", localtime);        # iso format
+my $today       = POSIX::strftime("%Y-%m-%d", localtime);      # iso format
 my @issuedata;
+my $overdues_exist = 0;
 my $totalprice = 0;
 my $toggle     = 0;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
@@ -228,9 +228,10 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     my %row = %{ $issue->[$i] };
     $totalprice += $issue->[$i]{'replacementprice'};
     $row{'replacementprice'} = $issue->[$i]{'replacementprice'};
-    if ( $datedue < $today ) {
+    if ( $datedue lt $today ) {
+        $overdues_exist = 1;
         $row{'red'} = 1;    #print "<font color=red>";
-    }
+       }
     $row{toggle} = $toggle++ % 2;
 
     #find the charge for an item
@@ -271,9 +272,10 @@ if ($borrowernumber) {
                                $getreserv{$_} = 0;
                }
         $getreserv{reservedate}  = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
-               foreach (qw(biblionumber title author barcodereserv itemcallnumber )) {
+               foreach (qw(biblionumber title author itemcallnumber )) {
                                $getreserv{$_} = $getiteminfo->{$_};
                }
+        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemtype}  = $itemtypeinfo->{'description'};
 
         #              check if we have a waitin status for reservations
@@ -304,13 +306,12 @@ if ($borrowernumber) {
             my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
             $getreserv{color}           = 'inwait';
             $getreserv{title}           = $getbibinfo->{'title'};
-            $getreserv{waitingposition} = $num_res->{'priority'};
             $getreserv{nottransfered}   = 0;
             $getreserv{itemtype}        = $getbibtype->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
-            $getreserv{itemcallnumber}  = '----------';
             $getreserv{biblionumber}  = $num_res->{'biblionumber'};    
         }
+        $getreserv{waitingposition} = $num_res->{'priority'};
 
         push( @reservloop, \%getreserv );
     }
@@ -336,22 +337,30 @@ my $branch=C4::Context->userenv->{'branch'};
 
 $template->param($data);
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    $template->param(ExtendedPatronAttributes => 1);
+    $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
+}
+
 $template->param(
        detailview => 1,
   DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(), 
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
+    categoryname       => $data->{'description'},
     reregistration   => $reregistration,
     branch          => $branch,        
     totalprice       => sprintf( "%.2f", $totalprice ),
     totaldue         => sprintf( "%.2f", $total ),
     issueloop        => \@issuedata,
+    overdues_exist   => $overdues_exist,
     unvalidlibrarian => $unvalidlibrarian,
        error            => $error,
        $error                  => 1,
     StaffMember                => ($category_type eq 'S'),
        is_child        => ($category_type eq 'C'),
        #                reserveloop     => \@reservedata,
+       dateformat    => C4::Context->preference("dateformat"),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;