Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster

[koha.git] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index b899ac1..e7586a0 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -40,6 +40,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,43 +58,10 @@ if ($input->param('borrowernumber')) {
     $data = GetMember(borrowernumber => $borrowernumber);
 }
 
-my $order=$input->param('order') || '';
-my $order2=$order;
-if ($order2 eq ''){
-  $order2="date_due desc";
-}
-my $limit=$input->param('limit');
-=======
-my $borrowernumber = $input->param('borrowernumber');
-my $limit          = $input->param('limit');
-my $order          = $input->param('order') || '';
-
-$order = "issuestimestamp desc" if not any { $order =~ $_ } ('issuestimestamp', 'title', 'author', 'returndate');
-
-#get borrower details
-my $data=GetMember('borrowernumber'=>$borrowernumber);
-
->>>>>>> (MT #2920) fix reading record scripts:members/readingrec.pl
-
-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);
 
-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;
 
 foreach my $issue (@{$issues}){
@@ -98,7 +73,8 @@ foreach my $issue (@{$issues}){
        $line{classification}  = $issue->{'classification'} || $issue->{'itemcallnumber'};
        $line{date_due}        = format_date($issue->{'date_due'});
        $line{returndate}      = format_date($issue->{'returndate'});
-       $line{issuedate}      = format_date($issue->{'issuedate'});
+       $line{issuedate}       = format_date($issue->{'issuedate'});
+       $line{issuingbranch}   = GetBranchName($issue->{'branchcode'});
        $line{renewals}        = $issue->{'renewals'};
        $line{barcode}         = $issue->{'barcode'};
        $line{volumeddesc}     = $issue->{'volumeddesc'};
@@ -137,6 +113,7 @@ $template->param(
                                            address => $data->{'address'},
                                                address2 => $data->{'address2'},
                                            city => $data->{'city'},
+                                           state => $data->{'state'},
                                                zipcode => $data->{'zipcode'},
                                                country => $data->{'country'},
                                                phone => $data->{'phone'},