X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=0524ecbf97621548e7d95cd68e45905a164706f3;hb=ea1aa7a0d906d583375618e37be60e9f0d62d939;hp=e9675798c351f011de75b0572c87d60aea85e4a0;hpb=f74da1e83442a730e2e56866f57b9f5aef93a3f5;p=koha_fer

diff --git a/members/moremember.pl b/members/moremember.pl
index e9675798c3..0524ecbf97 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -251,7 +251,7 @@ if ( @borrowernumbers ) {
 }
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = DateTime->now( time_zone => C4::Context->tz);
-$today->truncate(to => 'days');
+$today->truncate(to => 'day');
 my @borrowers_with_issues;
 my $overdues_exist = 0;
 my $totalprice = 0;
@@ -320,6 +320,8 @@ if ($borrowernumber) {
             $getreserv{biblionumber}  = $num_res->{'biblionumber'};	
         }
         $getreserv{waitingposition} = $num_res->{'priority'};
+        $getreserv{suspend} = $num_res->{'suspend'};
+        $getreserv{suspend_until} = $num_res->{'suspend_until'};
 
         push( @reservloop, \%getreserv );
     }
@@ -362,11 +364,29 @@ my $branch=C4::Context->userenv->{'branch'};
 $template->param(%$data);
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
+    my @classes = uniq( map {$_->{class}} @$attributes );
+    @classes = sort @classes;
+
+    my @attributes_loop;
+    for my $class (@classes) {
+        my @items;
+        for my $attr (@$attributes) {
+            push @items, $attr if $attr->{class} eq $class
+        }
+        my $lib = GetAuthorisedValueByCode( 'PA_CLASS', $class ) || $class;
+        push @attributes_loop, {
+            class => $class,
+            items => \@items,
+            lib   => $lib,
+        };
+    }
+
     $template->param(
         ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
+        attributes_loop => \@attributes_loop
     );
+
     my @types = C4::Members::AttributeTypes::GetAttributeTypes();
     if (scalar(@types) == 0) {
         $template->param(no_patron_attribute_types => 1);
@@ -378,6 +398,7 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) {
     $template->param(messaging_form_inactive => 1);
     $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
     $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
+    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
 }
 
 # in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
@@ -401,7 +422,6 @@ $template->param(
     relissueloop    => @relissuedata,
     overdues_exist  => $overdues_exist,
     error           => $error,
-    $error          => 1,
     StaffMember     => ($category_type eq 'S'),
     is_child        => ($category_type eq 'C'),
 #   reserveloop     => \@reservedata,
@@ -409,8 +429,11 @@ $template->param(
     "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
     samebranch     => $samebranch,
     quickslip		  => $quickslip,
-	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
+    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
 );
+$template->param( $error => 1 ) if $error;
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
@@ -428,13 +451,13 @@ sub build_issue_data {
         $issue->{cardnumber} = $memberdetails->{cardnumber};
         my $issuedate;
         if ($issue->{issuedate} ) {
-            $issuedate = $issue->{issuedate}->clone();
+           $issuedate = $issue->{issuedate}->clone();
         }
 
-        #wtf $issue->{'date_due'}  = format_date($issue->[$i]->{issuedate});
         $issue->{date_due}  = output_pref( $issue->{date_due} );
         $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate};
         my $biblionumber = $issue->{biblionumber};
+        $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
         my %row          = %{$issue};
         $totalprice += $issue->{replacementprice};
 
@@ -472,7 +495,7 @@ sub build_issue_data {
             $row{red} = 1;
         }
         if ($issuedate) {
-            $issuedate->truncate( to => 'days' );
+            $issuedate->truncate( to => 'day' );
             if ( DateTime->compare( $issuedate, $today ) == 0 ) {
                 $row{today} = 1;
             }