X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=dbd346dba3dc2d78fb14d1a65b0f1fc59e318a07;hb=8572f2347f879d414a60e8e0dc111fa927d66c14;hp=8f4cce199c5abef5cd8e97dc5d5184d9340c9334;hpb=1451f08927d675651f1fec1fda13cf3267bf0867;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 8f4cce199..dbd346dba 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -9,6 +9,8 @@
                                      emt('Package'),
                                      emt('Class'),
                                      emt('Status'),
+                                     emt('Sales Person'),
+                                     emt('Ordered by'),
                                      emt('Setup'),
                                      emt('Base Recur'),
                                      emt('Freq.'),
@@ -20,6 +22,7 @@
                                      emt('Susp. delay'),
                                      emt('Expire'),
                                      emt('Contract end'),
+                                     emt('Changed'),
                                      emt('Cancel'),
                                      emt('Reason'),
                                      FS::UI::Web::cust_header(
@@ -33,19 +36,21 @@
                     sub { $_[0]->pkg; },
                     'classname',
                     sub { ucfirst(shift->status); },
+                    'salesperson',
+                    'otaker',
                     sub { sprintf( $money_char.'%.2f',
                                    shift->part_pkg->option('setup_fee'),
                                  );
                         },
                     sub { my $c = shift;
                           sprintf( $money_char.'%.2f',
-                                   $c->part_pkg->base_recur($c)
+                                   $c->base_recur
                                  );
                         },
                     sub { FS::part_pkg::freq_pretty(shift); },
 
                     ( map { time_or_blank($_) }
-          qw( setup last_bill bill adjourn susp dundate expire contract_end cancel ) ),
+          qw( setup last_bill bill adjourn susp dundate expire contract_end change_date cancel ) ),
 
                     sub { my $self = shift;
                           my $return = '';
@@ -94,13 +99,16 @@
                     '',
                     '',
                     '',
+                    '',
+                    '',
+                    '',
                     FS::UI::Web::cust_colors(),
                     '',
                   ],
-                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '',
+                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
                                FS::UI::Web::cust_styles() ],
                   'size'  => [ '', '', '', '', '-1' ],
-                  'align' => 'rrlccrrlrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+                  'align' => 'rrlccccrrlrrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
                   'links' => [
                     $link,
                     $link,
@@ -119,6 +127,9 @@
                     '',
                     '',
                     '',
+                    '', # link to changed-from package?
+                    '',
+                    '',
                     '',
                     ( map { $_ ne 'Cust. Status' ? $clink : '' }
                           FS::UI::Web::cust_header(
@@ -145,12 +156,16 @@ my %search_hash = ();
 $search_hash{'query'} = $cgi->keywords;
 
 #scalars
-for (qw( agentnum custnum magic status custom cust_fields pkgbatch )) {
-  $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+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;
 }
@@ -161,10 +176,14 @@ 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;
 
-for my $param (grep /^report_option_any/, $cgi->params) {
+for my $param (grep /^report_option_any/, $cgi->param) {
   $search_hash{$param} = $cgi->param($param);
 }
 
@@ -182,7 +201,7 @@ my %disable = (
   ''                => {},
 );
 
-foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel active )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
@@ -291,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],
+        },
+
         ];
       }
     }