X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=dbd346dba3dc2d78fb14d1a65b0f1fc59e318a07;hp=32b5a69e8898557bd74e4c6c701fd30250653bf8;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=23f2db6452f097640447b9b35dd106f408dbc20b

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 32b5a69e8..dbd346dba 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -44,7 +44,7 @@
                         },
                     sub { my $c = shift;
                           sprintf( $money_char.'%.2f',
-                                   $c->part_pkg->base_recur($c)
+                                   $c->base_recur
                                  );
                         },
                     sub { FS::part_pkg::freq_pretty(shift); },
@@ -156,15 +156,16 @@ my %search_hash = ();
 $search_hash{'query'} = $cgi->keywords;
 
 #scalars
-for (qw( agentnum cust_main_salesnum salesnum custnum magic status custom
-         cust_fields pkgbatch
+for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+         custom cust_fields pkgbatch zip
+         477part 477rownum date 
     )) 
 {
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
 }
 
 #arrays
-for my $param (qw( pkgpart classnum )) {
+for my $param (qw( pkgpart classnum refnum towernum )) {
   $search_hash{$param} = [ $cgi->param($param) ]
     if grep { $_ eq $param } $cgi->param;
 }
@@ -175,6 +176,10 @@ for my $param (qw( censustract censustract2 )) {
     if grep { $_ eq $param } $cgi->param;
 }
 
+#location flags (checkboxes)
+my @loc = grep /^\w+$/, $cgi->param('loc');
+$search_hash{"location_$_"} = 1 foreach @loc;
+
 my $report_option = $cgi->param('report_option');
 $search_hash{report_option} = $report_option if $report_option;
 
@@ -305,11 +310,14 @@ my $process_svc_labels = sub {
       foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) {
         push @out, [ 
         { 'data' => $_->[0]. ':',
-          'align'=> 'right', },
+          'align'=> 'right',
+        },
+
         { 'data' => $_->[1],
           'align'=> 'left',
-          'link' => $p. 'view/' .
-          $_->[2]. '.cgi?'. $_->[3], },
+          'link' => $p. 'view/cust_svc.cgi?' . $_->[3],
+        },
+
         ];
       }
     }