Merge remote-tracking branch 'origin/new/bug_5327'

[koha.git] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 24fc15b..b4fb8a7 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -32,6 +32,7 @@ use C4::Branch;
 use List::MoreUtils qw/any/;
 
 use C4::Dates qw/format_date/;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input = CGI->new;
 
@@ -40,6 +41,14 @@ my $data = undef;
 my $borrowernumber = undef;
 my $cardnumber = undef;
 
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
+                               query => $input,
+                               type => "intranet",
+                               authnotrequired => 0,
+                               flagsrequired => {borrowers => 1},
+                               debug => 1,
+                               });
+
 if ($input->param('cardnumber')) {
     $cardnumber = $input->param('cardnumber');
     $data = GetMember(cardnumber => $cardnumber);
@@ -50,28 +59,9 @@ if ($input->param('borrowernumber')) {
     $data = GetMember(borrowernumber => $borrowernumber);
 }
 
-my $order=$input->param('order') || 'date_due desc';
-my $limit=$input->param('limit');
-
-if ($limit){
-    if ($limit eq 'full'){
-               $limit=0;
-    }
-}
-else {
-  $limit=50;
-}
+my $order = 'date_due desc';
+my $limit = 0;
 my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
-warn "BORR : $borrowernumber = ".Data::Dumper::Dumper($issues);
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/readingrec.tmpl",
-                               query => $input,
-                               type => "intranet",
-                               authnotrequired => 0,
-                               flagsrequired => {borrowers => 1},
-                               debug => 1,
-                               });
 
 my @loop_reading;
 
@@ -85,7 +75,7 @@ foreach my $issue (@{$issues}){
        $line{date_due}        = format_date($issue->{'date_due'});
        $line{returndate}      = format_date($issue->{'returndate'});
        $line{issuedate}       = format_date($issue->{'issuedate'});
-       $line{issuingbranch}   = GetBranchName($issue->{'issuingbranch'});
+       $line{issuingbranch}   = GetBranchName($issue->{'branchcode'});
        $line{renewals}        = $issue->{'renewals'};
        $line{barcode}         = $issue->{'barcode'};
        $line{volumeddesc}     = $issue->{'volumeddesc'};
@@ -107,12 +97,21 @@ if (! $limit){
 my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
 $template->param( picture => 1 ) if $picture;
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
 $template->param(
                                                readingrecordview => 1,
                                                biblionumber => $data->{'biblionumber'},
                                                title => $data->{'title'},
                                                initials => $data->{'initials'},
                                                surname => $data->{'surname'},
+                                               othernames => $data->{'othernames'},
                                                borrowernumber => $borrowernumber,
                                                limit => $limit,
                                                firstname => $data->{'firstname'},
@@ -124,6 +123,7 @@ $template->param(
                                            address => $data->{'address'},
                                                address2 => $data->{'address2'},
                                            city => $data->{'city'},
+                                           state => $data->{'state'},
                                                zipcode => $data->{'zipcode'},
                                                country => $data->{'country'},
                                                phone => $data->{'phone'},
@@ -132,7 +132,8 @@ $template->param(
                                                is_child        => ($data->{'category_type'} eq 'C'),
                                                branchname => GetBranchName($data->{'branchcode'}),
                                                showfulllink => (scalar @loop_reading > 50),                                    
-                                               loop_reading => \@loop_reading);
+                                               loop_reading => \@loop_reading,
+);
 output_html_with_http_headers $input, $cookie, $template->output;