MT3421, Follow-up: Moves subscription history in a separate page

[koha.git] / labels / pcard-member-search.pl

diff --git a/labels/pcard-member-search.pl b/labels/pcard-member-search.pl
index 484ff31..3842bd0 100755 (executable)
--- a/labels/pcard-member-search.pl
+++ b/labels/pcard-member-search.pl
@@ -39,6 +39,7 @@ $debug and warn "[In pcard-member-search] Batch Id: $batch_id, and Type: $batch_
 my $quicksearch = $input->param('quicksearch');
 my $startfrom = $input->param('startfrom')||1;
 my $resultsperpage = $input->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
+my $category = $input->param('category');
 
 my ($template, $loggedinuser, $cookie);
 if($quicksearch){
@@ -75,7 +76,7 @@ $orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
 
-unless ($member) {
+unless ($member||$category) {
     $template->param( batch_id => $batch_id, type => $batch_type,);
     output_html_with_http_headers $input, $cookie, $template->output;
     exit;
@@ -89,19 +90,17 @@ if(length($member) == 1)
 }
 else
 {
-    ($count,$results)=SearchMember($member,$orderby,"advanced");
+    ($count,$results)=SearchMember($member,$orderby,"advanced",$category);
 }
 
 
 my @resultsdata;
-my $toggle = 0;
 my $to=($count>($startfrom*$resultsperpage)?$startfrom*$resultsperpage:$count);
 for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){
   #find out stats
   my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
 
   my %row = (
-    toggle => $toggle,
     count => $i+1,
     borrowernumber => $results->[$i]{'borrowernumber'},
     cardnumber => $results->[$i]{'cardnumber'},
@@ -124,7 +123,6 @@ for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){
     sort2 => $results->[$i]{'sort2'},
     dateexpiry => C4::Dates->new($results->[$i]{'dateexpiry'},'iso')->output('syspref'),
     );
-  if ( $toggle ) { $toggle = 0; } else {$toggle = 1; }
   push(@resultsdata, \%row);
 }
 my $base_url =
@@ -133,15 +131,17 @@ my $base_url =
     '&amp;',
     map { $_->{term} . '=' . $_->{val} } (
         { term => 'member',         val => $member         },
+        { term => 'category',         val => $category         },
         { term => 'orderby',        val => $orderby        },
         { term => 'resultsperpage', val => $resultsperpage },
-        { term => 'type',           val => 'intranet'      },
+        { term => 'type',           val => $batch_type     },
+        { term => 'batch_id',       val => $batch_id       },
     )
   );
 
 $template->param(
     paginationbar => pagination_bar(
-        $base_url,  int( $count / $resultsperpage ) + 1,
+        $base_url,  int( ($count - 1) / $resultsperpage ) + 1,
         $startfrom, 'startfrom'
     ),
     startfrom => $startfrom,
@@ -153,6 +153,7 @@ $template->param(
 $template->param( 
         searching       => "1",
         member          => $member,
+        category_type   => $category,
         numresults      => $count,
         resultsloop     => \@resultsdata,
         batch_id        => $batch_id,