X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=df1d7e589e5fe759435becc6448596e31a70bcbe;hb=6f58ae775b905cd462dd0faafee95973414a45d2;hp=995779a4636cb0cb10f8835485ee1a59a7b232e6;hpb=47c250d15d752e6210b9c044a4a64e2e8992c64e;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 995779a46..df1d7e589 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); },
@@ -157,14 +157,15 @@ $search_hash{'query'} = $cgi->keywords;
 
 #scalars
 for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
-         custom cust_fields pkgbatch
+         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;
 
@@ -198,6 +203,8 @@ my %disable = (
 
 foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
 
+  $search_hash{$field.'_null'} = scalar( $cgi->param($field.'_null') );
+
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
   next if $beginning == 0 && $ending == 4294967295
@@ -305,11 +312,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],
+        },
+
         ];
       }
     }