X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=4e35b91dde201b872c65c7262fa2112f72a18621;hb=883f6c25e41831d9183e9500accb89f4cb23ae73;hp=20f1154c00e330a527d1bc8bbf67881080a7c5b3;hpb=5185768dd336f0a9e8fc4fb757b4e968baa5d8ed;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 20f1154c0..4e35b91dd 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -6,9 +6,12 @@
                   'count_query' => $count_query,
                   #'redirect'    => $link,
                   'header'      => [ '#',
+                                     'Quan.',
                                      'Package',
                                      'Class',
                                      'Status',
+                                     'Setup',
+                                     'Base Recur',
                                      'Freq.',
                                      'Setup',
                                      'Last bill',
@@ -25,12 +28,22 @@
                                    ],
                   'fields'      => [
                     'pkgnum',
+                    'quantity',
                     sub { #my $part_pkg = $part_pkg{shift->pkgpart};
                           #$part_pkg->pkg; # ' - '. $part_pkg->comment;
                           $_[0]->pkg; # ' - '. $_[0]->comment;
                         },
                     'classname',
                     sub { ucfirst(shift->status); },
+                    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)
+                                 );
+                        },
                     sub { #shift->part_pkg->freq_pretty;
 
                           #my $part_pkg = $part_pkg{shift->pkgpart};
@@ -50,11 +63,10 @@
 
                     sub { my $self = shift;
                           my $return = '';
-                          if ($self->getfield('cancel') ||
-                            $self->getfield('suspend')) {
-                              my $reason = $self->last_reason;# too inefficient?
-                              $return = $reason->reason if $reason;
-
+                          foreach my $action ( qw ( cancel susp ) ) {
+                            my $reason = $self->last_reason($action);
+                            $return = $reason->reason if $reason;
+                            last if $return;
                           }
                           $return;
                         },
@@ -87,6 +99,7 @@
                     '',
                     '',
                     '',
+                    '',
                     sub { shift->statuscolor; },
                     '',
                     '',
@@ -97,16 +110,21 @@
                     '',
                     '',
                     '',
+                    '',
+                    '',
                     FS::UI::Web::cust_colors(),
                     '',
                   ],
-                  'style' => [ '', '', '', 'b', '', '', '', '', '', '', '', '', '',
+                  'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
                                FS::UI::Web::cust_styles() ],
-                  'size'  => [ '', '', '', '-1' ],
-                  'align' => 'rlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+                  'size'  => [ '', '', '', '', '-1' ],
+                  'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
                   'links' => [
                     $link,
                     $link,
+                    $link,
+                    '',
+                    '',
                     '',
                     '',
                     '',
@@ -130,8 +148,13 @@
 %>
 <%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', {});
 
@@ -139,7 +162,7 @@ die "access denied"
   
   $search_hash{'query'} = $cgi->keywords;
   
-  for my $param (qw(agentnum magic status classnum pkgpart)) {
+  for my $param (qw(agentnum magic status classnum pkgpart custom)) {
     $search_hash{$param} = $cgi->param($param)
       if $cgi->param($param);
   }
@@ -172,8 +195,17 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
 my $sql_query = FS::cust_pkg->search_sql(\%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 {
@@ -209,29 +241,22 @@ sub time_or_blank {
    };
 }
 
-my $html_init = '';
-for (qw (overlibmws overlibmws_iframe overlibmws_draggable iframecontentmws))
-{
-  $html_init .=
-    qq!<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/$_.js"></SCRIPT>!;
-}
+my $html_init = include('/elements/init_overlib.html');
 
 my $extra_choices = sub {
   my $query = shift;
-  my $choices = '';
-
-  my $url = qq!overlib( OLiframeContent('!. popurl(2).
-            qq!misc/bulk_change_pkg.cgi?$query', 768, 336, !.
-            qq!'bulk_pkg_change_popup' ), CAPTION, 'Change Packages'!.
-            qq!, STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, !.
-            qq!CLOSECLICK ); return false;!;
-
-  if ($FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages')) {
-    $choices .= qq!<BR><A HREF="javascript:void(0);"!.
-                qq!onClick="$url">Change these packages</A>!;
-  }
 
-  return $choices;
+  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,
+         );
 };
 
 </%init>