X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=6667a554dc5086df315c5ab8d89598d30a19a1c9;hb=4e70896aa834fe3cdd6c5dba9b0a186c572e1886;hp=4e7462b75f68412f64ad2b08a5f5e281121a88c4;hpb=2b8ffc98529637ffddfe7cbf6b4f9b8deb90f0fa;p=freeside.git

diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 4e7462b75..6667a554d 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -6,24 +6,25 @@
 % if ( $cust_pkg->get('cancel') ) { #status: cancelled
 %   my $cpr = $cust_pkg->last_cust_pkg_reason('cancel');
 
-    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %>
+    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', %opt ) %>
 
-    <% pkg_status_row_colspan(
+    <% pkg_status_row_colspan( $cust_pkg,
          ( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
-         'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
+         'align'=>'right', 'color'=>'ff0000', 'size'=>'-2', 'colspan'=>$colspan,
+         %opt
        )
     %>
 
 %   unless ( $cust_pkg->get('setup') ) { 
 
-        <% pkg_status_row_colspan('Never billed') %>
+        <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt, ) %>
 
 %   } else { 
 
-       <% pkg_status_row( $cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
-       <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
-       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
-       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf, curuser=>$curuser ) %>
+       <% pkg_status_row( $cust_pkg, 'Setup', 'setup', %opt ) %>
+       <% pkg_status_row_changed( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', %opt, curuser=>$curuser ) %>
 
 %   } 
 %
@@ -32,24 +33,25 @@
 %   if ( $cust_pkg->get('susp') ) { #status: suspended
 %     my $cpr = $cust_pkg->last_cust_pkg_reason('susp');
 
-    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', %opt ) %>
 
-    <% pkg_status_row_colspan(
+    <% pkg_status_row_colspan( $cust_pkg,
          ( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
-         'align' => 'right', 'color' => 'FF9900', 'size' => '-2',
+         'align'=>'right', 'color'=>'FF9900', 'size'=>'-2', 'colspan'=>$colspan,
+         %opt,
        )
     %>
 
 %   unless ( $cust_pkg->get('setup') ) { 
-      <% pkg_status_row_colspan('Never billed') %>
+      <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt ) %>
 %   } else { 
-      <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
+      <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
 %   } 
 
-    <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
-    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
-%   # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
-    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
+    <% pkg_status_row_changed( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+%   # pkg_status_row($cust_pkg, 'Next bill', 'bill', %opt)
+    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
@@ -70,7 +72,15 @@
 %
 %       unless ( $part_pkg->freq ) { 
 
-          <% pkg_status_row_colspan('Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)') %>
+          <% pkg_status_row_colspan( $cust_pkg, 'Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)', '', 'colspan'=>$colspan, %opt ) %>
+
+          <% pkg_status_row_if(
+               $cust_pkg,
+               ( $part_pkg->freq ? 'Start billing' : 'Bill on' ),
+               'start_date',
+               %opt
+             )
+          %>
 
           <TR>
             <TD COLSPAN=<%$colspan%>>
@@ -84,7 +94,9 @@
 
 %       } else { 
 
-         <% pkg_status_row_colspan("Not&nbsp;yet&nbsp;billed&nbsp;($billed_or_prepaid&nbsp;". myfreq($part_pkg). ')' ) %>
+         <% pkg_status_row_colspan($cust_pkg, "Not&nbsp;yet&nbsp;billed&nbsp;($billed_or_prepaid&nbsp;". myfreq($part_pkg). ')', '', 'colspan'=>$colspan, %opt ) %>
+
+          <% pkg_status_row_if($cust_pkg, 'Start billing', 'start_date', %opt) %>
 
 %       } 
 %
@@ -92,44 +104,49 @@
 %
 %       unless ( $part_pkg->freq ) { 
 
-          <% pkg_status_row_colspan('One-time&nbsp;charge') %>
+          <% pkg_status_row_colspan($cust_pkg, 'One-time&nbsp;charge', '', 'colspan'=>$colspan, %opt ) %>
 
-          <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %>
+          <% pkg_status_row($cust_pkg, 'Billed', 'setup', %opt) %>
 
 %       } else { 
 %
 %         if (scalar($cust_pkg->overlimit)) {
 
-            <% pkg_status_row_colspan(
+            <% pkg_status_row_colspan( $cust_pkg,
                  'Overlimit',
                  $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
-                 'color' => 'FFD000',
+                 'color'=>'FFD000', 'colspan'=>$colspan,
+                 %opt
                )
             %>
 
 %         } else {
-            <% pkg_status_row_colspan(
+            <% pkg_status_row_colspan( $cust_pkg,
                  'Active',
                  $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
-                 'color' => '00CC00',
+                 'color'=>'00CC00', 'colspan'=>$colspan,
+                 %opt
                )
             %>
 %         } 
 
-          <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %>
+          <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt) %>
 
 %       } 
 %
 %     } 
-%   my $autosuspend = pkg_autosuspend_time( $cust_pkg );
-%   $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend;
+%
+%     if ( $opt{'cust_pkg-show_autosuspend'} ) {
+%       my $autosuspend = pkg_autosuspend_time( $cust_pkg );
+%       $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend;
+%     }
 
-      <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
-      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
-      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf, curuser=>$curuser ) %>
-      <% pkg_status_row_if($cust_pkg, 'Will automatically suspend by', 'autosuspend', conf=>$conf) %>
-      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf, curuser=>$curuser ) %>
-      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
+      <% pkg_status_row_changed( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if($cust_pkg, 'Will automatically suspend by', 'autosuspend', %opt) %>
+      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
 
 %     if ( $part_pkg->freq ) { 
 
@@ -162,7 +179,6 @@
 
   </TABLE>
 </TD>
-
 <%init>
 
 my %opt = @_;
@@ -171,9 +187,8 @@ my $bgcolor  = $opt{'bgcolor'};
 my $cust_pkg = $opt{'cust_pkg'};
 my $part_pkg = $opt{'part_pkg'};
 my $curuser  = $FS::CurrentUser::CurrentUser;
-my $conf     = new FS::Conf;
-my $colspan  = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-my $width    = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+my $colspan  = $opt{'cust_pkg-display_times'} ? 8 : 4;
+my $width    = $opt{'cust_pkg-display_times'} ? '38%' : '56%';
 
 #false laziness w/edit/REAL_cust_pkg.cgi
 my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
@@ -212,8 +227,15 @@ sub pkg_status_row {
   $html   .= qq(<FONT COLOR="#$color"><B>) if length($color);
   $html   .= qq($title&nbsp;);
   $html   .= qq(</B></FONT>) if length($color);
+
+  if ( $opt{'pkg_balances'} && ! $cust_pkg->{_printed_balance}++ ) { #kludge
+    $html .= ' (Balance:&nbsp;<B>'. $opt{'money_char'}.
+             $cust_pkg->cust_main->balance_pkgnum($cust_pkg->pkgnum).
+             '</B>)';
+  }
+
   $html   .= qq(</TD>);
-  $html   .= pkg_datestr($cust_pkg, $field, $opt{conf}).'</TR>';
+  $html   .= pkg_datestr($cust_pkg, $field, %opt). '</TR>';
 
   $html;
 }
@@ -236,20 +258,31 @@ sub pkg_status_row_if {
 
 sub pkg_status_row_changed {
   my( $cust_pkg, %opt ) = @_;
+
   return '' unless $cust_pkg->change_date;
-  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date', conf=>$opt{'conf'} );
+
+  my $html =
+    pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date', %opt );
+
   my $old = $cust_pkg->old_cust_pkg;
   if ( $old ) {
     my $part_pkg = $old->part_pkg;
     my $label = 'Changed from '. $cust_pkg->change_pkgnum. ': '.
-                $part_pkg->pkg. ' - '. $part_pkg->comment;
-    $html .= pkg_status_row_colspan( $label, '', size=>'-1', align=>'right' );
+                $part_pkg->pkg_comment(nopartpkg => 1);
+    $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
+                                     'size'    => '-1',
+                                     'align'   => 'right',
+                                     'colspan' => $opt{'colspan'},
+                                   );
   }
+
   $html;
 }
 
 sub pkg_status_row_colspan {
-  my($title, $addl, %opt) = @_;
+  my($cust_pkg, $title, $addl, %opt) = @_;
+
+  my $colspan  = $opt{'colspan'};
 
   my $align = $opt{'align'} ? 'ALIGN="'. $opt{'align'}.'"' : '';
   my $color = $opt{'color'} ? 'COLOR="#'.$opt{'color'}.'"' : '';
@@ -262,6 +295,13 @@ sub pkg_status_row_colspan {
   $html   .= qq(</B>) if $color && !$size;
   $html   .= qq(</FONT>) if length($color) || $size;
   $html   .= ",&nbsp;$addl" if length($addl);
+
+  if ( $opt{'pkg-balances'} && ! $cust_pkg->{_printed_balance}++ ) { #kludge
+    $html .= ' (Balance:&nbsp;<B>'. $opt{'money_char'}.
+             $cust_pkg->cust_main->balance_pkgnum($cust_pkg->pkgnum).
+             '</B>)';
+  }
+
   $html   .= qq(</TD></TR>);
 
   $html;
@@ -269,7 +309,7 @@ sub pkg_status_row_colspan {
 }
 
 sub pkg_datestr {
-  my($cust_pkg, $field, $conf) = @_ or return '';
+  my($cust_pkg, $field, %opt) = @_ or return '';
   return '&nbsp;' unless $cust_pkg->get($field);
   my $format = '<TD align="left"><B>%b</B></TD>'.
                '<TD align="right"><B>&nbsp;%o,</B></TD>'.
@@ -279,7 +319,7 @@ sub pkg_datestr {
              '<TD ALIGN="center"><B>:</B></TD>'.
              '<TD ALIGN="left"><B>%M</B></TD>'.
              '<TD ALIGN="left"><B>&nbsp;%P</B></TD>'
-    if $conf->exists('cust_pkg-display_times');
+    if $opt{'cust_pkg-display_times'};
   my $strip = time2str($format, $cust_pkg->get($field) );
   $strip =~ s/ (\d)/$1/g;
   $strip;
@@ -353,7 +393,8 @@ sub pkg_autosuspend_time {
   my $days = 7;
   my $time = time;
   my $pending_suspend = 0;
-  #this seems to be extremely inefficient...
+  #this seems to be extremely inefficient...  and is slowing down all customer
+  #views
   while ( $days > 0 &&
           scalar(
             grep { $_->part_event->action eq 'suspend' }