X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=2b6db8c754ca80a36bc350471645660568aff5ce;hb=e92fa2f0535551a4e4cd92d10ccbcf930a5e5e62;hp=e797e35e9d68d0d6736c0700e0ce464a9d37a6ff;hpb=586a2e2c99956f17899e2fbb52b11a0ac0293a17;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index e797e35e9..2b6db8c75 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -19,6 +19,7 @@
                                      'Adjourn',
                                      'Susp.',
                                      'Expire',
+                                     'Contract end',
                                      'Cancel',
                                      'Reason',
                                      FS::UI::Web::cust_header(
@@ -39,8 +40,9 @@
                                    shift->part_pkg->option('setup_fee'),
                                  );
                         },
-                    sub { sprintf( $money_char.'%.2f',
-                                   shift->part_pkg->base_recur
+                    sub { my $c = shift;
+                          sprintf( $money_char.'%.2f',
+                                   $c->part_pkg->base_recur($c)
                                  );
                         },
                     sub { #shift->part_pkg->freq_pretty;
@@ -58,7 +60,7 @@
                     #sub { time2str('%b %d %Y', shift->expire); },
                     #sub { time2str('%b %d %Y', shift->get('cancel')); },
                     ( map { time_or_blank($_) }
-                          qw( setup last_bill bill adjourn susp expire cancel ) ),
+          qw( setup last_bill bill adjourn susp expire contract_end cancel ) ),
 
                     sub { my $self = shift;
                           my $return = '';
@@ -79,6 +81,18 @@
                     #      '</table>';
                     #    },
                     sub {
+                      my $cust_pkg = shift;
+                      my $type = $cgi->param('_type') || '';
+                      if ($type =~ /xls|csv/) {
+                        my $cust_svc = $cust_pkg->primary_cust_svc;
+                        if($cust_svc) {
+                          return join ": ",($cust_svc->label)[0,1];
+                        }
+                        else {
+                          return '';
+                        }
+                      }
+                      else {
                           [ map {
                                   [ 
                                     { 'data' => $_->[0]. ':',
@@ -90,9 +104,10 @@
                                                 $_->[2]. '.cgi?'. $_->[3],
                                     },
                                   ];
-                                } shift->labels
+                                } $cust_pkg->labels
                           ];
-                        },
+                      }
+                    }
                   ],
                   'color' => [
                     '',
@@ -111,13 +126,14 @@
                     '',
                     '',
                     '',
+                    '',
                     FS::UI::Web::cust_colors(),
                     '',
                   ],
-                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
+                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '',
                                FS::UI::Web::cust_styles() ],
                   'size'  => [ '', '', '', '', '-1' ],
-                  'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+                  'align' => 'rrlccrrlrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
                   'links' => [
                     $link,
                     $link,
@@ -135,6 +151,7 @@
                     '',
                     '',
                     '',
+                    '',
                     ( map { $_ ne 'Cust. Status' ? $clink : '' }
                           FS::UI::Web::cust_header(
                                                     $cgi->param('cust_fields')
@@ -142,27 +159,41 @@
                     ),
                     '',
                   ],
-                  'extra_choices_callback'=> $extra_choices, 
               )
 %>
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+  unless $curuser->access_right('List packages');
 
 my $conf = new FS::Conf;
 my $money_char = $conf->config('money_char') || '$';
 
 # my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-  my %search_hash = ();
-  
-  $search_hash{'query'} = $cgi->keywords;
+my %search_hash = ();
+
+#some false laziness w/misc/bulk_change_pkg.cgi
   
-  for my $param (qw(agentnum magic status classnum pkgpart)) {
-    $search_hash{$param} = $cgi->param($param)
-      if $cgi->param($param);
-  }
+$search_hash{'query'} = $cgi->keywords;
+
+#scalars
+for (qw( agentnum custnum magic status classnum custom cust_fields pkgbatch )) {
+  $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+}
+
+$search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
+
+for my $param ( qw(censustract) ) {
+  $search_hash{$param} = $cgi->param($param) || ''
+    if ( grep { /$param/ } $cgi->param );
+}
+
+my @report_option = $cgi->param('report_option')
+  if $cgi->param('report_option');
+$search_hash{report_option} = join(',', @report_option) if @report_option;
 
 ###
 # parse dates
@@ -178,7 +209,7 @@ my %disable = (
   ''                => {},
 );
 
-foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel active )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
@@ -189,11 +220,20 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
 
 }
 
-my $sql_query = FS::cust_pkg->search_sql(\%search_hash);
+my $sql_query = FS::cust_pkg->search(\%search_hash);
 my $count_query = delete($sql_query->{'count_query'});
 
+my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+             ? ''
+             : ';show=packages';
+
 my $link = sub {
-  [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
+  my $self = shift;
+  my $frag = 'cust_pkg'. $self->pkgnum; #hack for IE ignoring real #fragment
+  [ "${p}view/cust_main.cgi?custnum=".$self->custnum.
+                           "$show;fragment=$frag#cust_pkg",
+    'pkgnum'
+  ];
 };
 
 my $clink = sub {
@@ -229,22 +269,36 @@ sub time_or_blank {
    };
 }
 
-my $html_init = include('/elements/init_overlib.html');
-
-my $extra_choices = sub {
+my $html_init = sub {
   my $query = shift;
+  my $text = '';
+  my $curuser = $FS::CurrentUser::CurrentUser;
 
-  return '' unless
-   $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
-    
-  '<BR><BR>'.
-  include( '/elements/popup_link.html',
-             'label'       => 'Change these packages',
-             'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
-             'actionlabel' => 'Change Packages',
-             'width'       => 763,
-             'height'      => 336,
-         );
+  if ( $curuser->access_right('Bulk change customer packages') ) {
+    $text .= include('/elements/init_overlib.html').
+             include( '/elements/popup_link.html',
+               'label'       => 'Change these packages',
+               'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
+               'actionlabel' => 'Change Packages',
+               'width'       => 569,
+               'height'      => 210,
+             ). '<BR>';
+
+    if ( $curuser->access_right('Edit customer package dates') ) {
+      $text .= include( '/elements/popup_link.html',
+                 'label'       => 'Increment next bill date',
+                 'action'      => "${p}misc/bulk_pkg_increment_bill.cgi?$query",
+                 'actionlabel' => 'Increment Bill Date',
+                 'width'       => 569,
+                 'height'      => 210,
+              ). '<BR>';
+    }
+    $text .= include( '/elements/email-link.html',
+                'search_hash' => \%search_hash,
+                'table'       => 'cust_pkg',
+                );
+  }
+  return $text;
 };
 
 </%init>