X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=e9017745bf7f87b40d9c6d54d3f34b8629795ab3;hp=6daff50316ebd074d7b8c9d50b2e77e7b7b13025;hb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;hpb=0376f47e1ec2ec9b8702a0e6c5146af9c66beb5e

diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 6daff5031..e9017745b 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -3,60 +3,95 @@
 
 %#this should use cust_pkg->status and cust_pkg->statuscolor eventually
 
+% if ( $cust_pkg->order_date ) {
+    <% pkg_status_row($cust_pkg, emt('Ordered'), 'order_date', %opt ) %>
+% }
+
 % 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', %opt ) %>
+    <% pkg_status_row($cust_pkg, emt('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', 'colspan'=>$colspan,
+         %opt
        )
     %>
 
 %   unless ( $cust_pkg->get('setup') ) { 
 
-        <% pkg_status_row_colspan('Never billed', '', 'colspan'=>$colspan, ) %>
+        <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', 'colspan'=>$colspan, %opt, ) %>
 
 %   } else { 
 
-       <% pkg_status_row( $cust_pkg, 'Setup', 'setup', %opt ) %>
+       <% pkg_status_row( $cust_pkg, emt('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 ) %>
+       <% pkg_status_row_if( $cust_pkg, emt('Suspended'), 'susp', %opt, curuser=>$curuser ) %>
 
 %   } 
 %
-% } else { 
+%   if ( $part_pkg->freq ) { #?
+
+      <TR>
+        <TD COLSPAN=<%$colspan%>>
+          <FONT SIZE=-1>
+%           if ( $curuser->access_right('Un-cancel customer package') ) { 
+              (&nbsp;<% pkg_uncancel_link($cust_pkg) %>&nbsp;)
+%           } 
+          <FONT>
+        </TD>
+      </TR>
+%   }
+%
+% } else {
 %
 %   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', %opt ) %>
+    <% pkg_status_row( $cust_pkg, emt('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', 'colspan'=>$colspan,
+         %opt,
        )
     %>
 
+    <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+    <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
 %   unless ( $cust_pkg->get('setup') ) { 
-      <% pkg_status_row_colspan('Never billed', '', 'colspan'=>$colspan ) %>
+      <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', 'colspan'=>$colspan, %opt ) %>
 %   } else { 
-      <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
+      <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt ) %>
 %   } 
 
+    <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %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($cust_pkg, 'Next bill', 'bill', %opt)
-    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
+%   if ( $cust_pkg->option('suspend_bill', 1)
+%        || ( $part_pkg->option('suspend_bill', 1)
+%               && ! $cust_pkg->option('no_suspend_bill',1)
+%           )
+%      )
+%   {
+      <% pkg_status_row_if( $cust_pkg, emt('Next bill'), 'bill', %opt, curuser=>$curuser ) %>
+%   }
+    <% pkg_status_row_if( $cust_pkg, emt('Will resume'), 'resume', %opt, curuser=>$curuser ) %>
+    <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+    <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
         <FONT SIZE=-1>
 %         if ( $curuser->access_right('Unsuspend customer package') ) { 
             (&nbsp;<% pkg_unsuspend_link($cust_pkg) %>&nbsp;)
-%         } 
+            (&nbsp;<% pkg_resume_link($cust_pkg) %>&nbsp;)
+%         }
 %         if ( $curuser->access_right('Cancel customer package immediately') ) {
             (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
 %         } 
@@ -68,11 +103,23 @@
 %
 %     unless ( $cust_pkg->get('setup') ) { #not setup
 %
-%       unless ( $part_pkg->freq ) { 
+%       unless ( $part_pkg->freq ) {
 
-          <% pkg_status_row_colspan('Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)', '', 'colspan'=>$colspan, ) %>
+          <% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', 'colspan'=>$colspan, %opt ) %>
 
-          <% pkg_status_row_if($cust_pkg, 'Start billing', 'start_date', %opt) %>
+          <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row_if(
+               $cust_pkg,
+               ( $part_pkg->freq ? emt('Start billing') : emt('Bill on') ),
+               'start_date',
+               %opt
+             )
+          %>
+
+          <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
 
           <TR>
             <TD COLSPAN=<%$colspan%>>
@@ -86,9 +133,14 @@
 
 %       } else { 
 
-         <% pkg_status_row_colspan("Not&nbsp;yet&nbsp;billed&nbsp;($billed_or_prepaid&nbsp;". myfreq($part_pkg). ')', '', 'colspan'=>$colspan ) %>
+          <% pkg_status_row_colspan($cust_pkg, emt("Not yet billed ($billed_or_prepaid [_1])", myfreq($part_pkg) ), '', 'colspan'=>$colspan, %opt ) %>
+
+          <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
 
-          <% pkg_status_row_if($cust_pkg, 'Start billing', 'start_date', %opt) %>
+          <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row_if($cust_pkg, emt('Start billing'), 'start_date', %opt) %>
+          <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
 
 %       } 
 %
@@ -96,31 +148,50 @@
 %
 %       unless ( $part_pkg->freq ) { 
 
-          <% pkg_status_row_colspan('One-time&nbsp;charge', '', 'colspan'=>$colspan, ) %>
+          <% pkg_status_row_colspan($cust_pkg, emt('One-time charge'), '', 'colspan'=>$colspan, %opt ) %>
+
+          <% pkg_status_row($cust_pkg, emt('Billed'), 'setup', %opt) %>
+
+          <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
 
-          <% pkg_status_row($cust_pkg, 'Billed', 'setup', %opt) %>
+          <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
 
 %       } else { 
 %
-%         if (scalar($cust_pkg->overlimit)) {
+%         my $num_cust_svc = $cust_pkg->num_cust_svc;
+%         my $summarize = $opt{'cust_pkg-large_pkg_size'} > 0
+%                           && $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc;
+%
+%         #overlimit process is expensive with many services, so skip w/summary
+%         if ( !$summarize && scalar($cust_pkg->overlimit) ) {
 
-            <% pkg_status_row_colspan(
-                 'Overlimit',
+            <% pkg_status_row_colspan( $cust_pkg,
+                 emt('Overlimit'),
                  $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
                  'color'=>'FFD000', 'colspan'=>$colspan,
+                 %opt
                )
             %>
 
 %         } else {
-            <% pkg_status_row_colspan(
-                 'Active',
+            <% pkg_status_row_colspan( $cust_pkg,
+                 emt('Active'),
                  $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
                  'color'=>'00CC00', 'colspan'=>$colspan,
+                 %opt
                )
             %>
 %         } 
 
-          <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt) %>
+          <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+          <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt) %>
+
+          <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
 
 %       } 
 %
@@ -134,9 +205,12 @@
       <% 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 ) %>
+      <% pkg_status_row_if($cust_pkg, emt('Will automatically suspend by'), 'autosuspend', %opt) %>
+      <% pkg_status_row_if($cust_pkg, emt('Automatic suspension delayed until'), 'dundate', %opt) %>
+      <% pkg_status_row_if( $cust_pkg, emt('Will suspend on'), 'adjourn', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, emt('Will resume on'), 'resume', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
 
 %     if ( $part_pkg->freq ) { 
 
@@ -169,7 +243,6 @@
 
   </TABLE>
 </TD>
-
 <%init>
 
 my %opt = @_;
@@ -198,7 +271,7 @@ unless ( $part_pkg->is_prepaid ) {
 sub myfreq {
   my $part_pkg = shift;
   my $freq = $part_pkg->freq_pretty;
-  $freq =~ s/ /&nbsp;/g;
+  #$freq =~ s/ /&nbsp;/g;
   $freq;
 }
 
@@ -218,8 +291,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).'</TR>';
+  $html   .= pkg_datestr($cust_pkg, $field, %opt). '</TR>';
 
   $html;
 }
@@ -246,14 +326,16 @@ sub pkg_status_row_changed {
   return '' unless $cust_pkg->change_date;
 
   my $html =
-    pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date', %opt );
+    pkg_status_row( $cust_pkg, emt('Package 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_comment(nopartpkg => 1);
-    $html .= pkg_status_row_colspan( $label, '',
+    $html .= pkg_status_row_colspan( $cust_pkg, 
+                                     emt("Changed from [_1]: [_2]",
+                                            $cust_pkg->change_pkgnum,
+                                            $part_pkg->pkg_comment(nopartpkg => 1) ),
+                                     '',
                                      'size'    => '-1',
                                      'align'   => 'right',
                                      'colspan' => $opt{'colspan'},
@@ -263,8 +345,54 @@ sub pkg_status_row_changed {
   $html;
 }
 
+sub pkg_status_row_noauto {
+  my( $cust_pkg, %opt ) = @_;
+  my $part_pkg = $opt{'part_pkg'};
+  return '' unless $cust_pkg->no_auto || $part_pkg->no_auto;
+
+  #inefficient, should be passed in
+  my $cust_main = $cust_pkg->cust_main;
+
+  return '' unless $cust_main->payby =~ /^(CARD|CHEK)$/;
+  my $what = lc(FS::payby->shortname($cust_main->payby));
+
+  pkg_status_row_colspan( $cust_pkg, emt("No automatic $what charge"), '',
+                          'colspan' => $opt{'colspan'},
+                        );
+}
+
+sub pkg_status_row_discount {
+  my( $cust_pkg, %opt ) = @_;
+
+  my $html;
+
+  foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
+
+    my $discount = $cust_pkg_discount->discount;
+
+    my $label = '<B>'.emt('Discount').'</B>: '. $discount->description;
+    if ( $discount->months ) {
+      my $remaining = $discount->months - $cust_pkg_discount->months_used;
+      $remaining = sprintf('%.2f', $remaining) if $remaining =~ /\./;
+      $label .= emt("([_1] months remaining)",$remaining);
+    }
+
+    $label .= ' <FONT SIZE="-1">('.
+                '<A HREF="../misc/delete-cust_pkg_discount.html?'.
+                  $cust_pkg_discount->pkgdiscountnum.
+                '">'.emt('remove discount').'</A>)</FONT>';
+
+    $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
+                                     'colspan' => $opt{'colspan'},
+                                   );
+
+  }
+
+  $html;
+}
+
 sub pkg_status_row_colspan {
-  my($title, $addl, %opt) = @_;
+  my($cust_pkg, $title, $addl, %opt) = @_;
 
   my $colspan  = $opt{'colspan'};
 
@@ -279,6 +407,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;
@@ -305,8 +440,8 @@ sub pkg_datestr {
 sub pkg_suspend_link {
   include( '/elements/popup_link-cust_pkg.html',
              'action'      => $p. 'misc/cancel_pkg.html?method=suspend',
-             'label'       => 'Suspend&nbsp;now',
-             'actionlabel' => 'Suspend',
+             'label'       => emt('Suspend now'),
+             'actionlabel' => emt('Suspend'),
              'color'       => '#FF9900',
              'cust_pkg'    => shift,
          )
@@ -315,41 +450,65 @@ sub pkg_suspend_link {
 sub pkg_adjourn_link {
   include( '/elements/popup_link-cust_pkg.html',
              'action'      => $p. 'misc/cancel_pkg.html?method=adjourn',
-             'label'       => 'Suspend&nbsp;later',
-             'actionlabel' => 'Adjourn',
+             'label'       => emt('Suspend later'),
+             'actionlabel' => emt('Adjourn'),
              'color'       => '#CC6600',
              'cust_pkg'    => shift,
          )
 }
 
 sub pkg_delay_link  {
+  my($cust_pkg) = shift;
   include( '/elements/popup_link-cust_pkg.html',
              'action'      => $p. 'misc/delay_susp_pkg.html',
-             'label'       => 'Delay&nbsp;suspend',
-             'actionlabel' => 'Delay suspend for',
+             'label'       => ( $cust_pkg->dundate
+                                  ? emt('Edit suspension delay')
+                                  : emt('Delay suspend')
+                              ),
+             'actionlabel' => emt('Delay suspend for'),
+             'cust_pkg'    => $cust_pkg,
+         )
+}
+
+sub pkg_resume_link {
+  include( '/elements/popup_link-cust_pkg.html',
+             'action'      => $p. 'misc/cancel_pkg.html?method=resume',
+             'label'       => emt('Unsuspend later'),
+             'actionlabel' => emt('Resume'),
+             'color'       => '#00CC00',
              'cust_pkg'    => shift,
          )
 }
 
-sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg',    'Unsuspend', @_ ); }
-sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', 'Abort',     @_ ); }
-sub pkg_unexpire_link  { pkg_link('misc/unexpire_pkg',  'Abort',     @_ ); }
+sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg',    emt('Unsuspend now'), @_ ); }
+sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', emt('Abort'),     @_ ); }
+sub pkg_unexpire_link  { pkg_link('misc/unexpire_pkg',  emt('Abort'),     @_ ); }
 
 sub pkg_cancel_link {
   include( '/elements/popup_link-cust_pkg.html',
              'action'      => $p. 'misc/cancel_pkg.html?method=cancel',
-             'label'       => 'Cancel&nbsp;now',
-             'actionlabel' => 'Cancel',
+             'label'       => emt('Cancel now'),
+             'actionlabel' => emt('Cancel'),
              'color'       => '#ff0000',
              'cust_pkg'    => shift,
          )
 }
 
+sub pkg_uncancel_link {
+  include( '/elements/popup_link-cust_pkg.html',
+             'action'      => $p. 'misc/cancel_pkg.html?method=uncancel',
+             'label'       => emt('Un-cancel'),
+             'actionlabel' => emt('Un-cancel'),
+             #'color'       =>  #?
+             'cust_pkg'    => shift,
+         )
+}
+
 sub pkg_expire_link {
   include( '/elements/popup_link-cust_pkg.html',
              'action'      => $p. 'misc/cancel_pkg.html?method=expire',
-             'label'       => 'Cancel&nbsp;later',
-             'actionlabel' => 'Expire', #"Cancel package $num later"
+             'label'       => emt('Cancel later'),
+             'actionlabel' => emt('Expire'),
              'color'       => '#CC0000',
              'cust_pkg'    => shift,
          )
@@ -358,8 +517,8 @@ sub pkg_expire_link {
 sub svc_recharge_link {
   include( '/elements/popup_link-cust_svc.html',
              'action'      => $p. 'misc/recharge_svc.html',
-             'label'       => 'Recharge',
-             'actionlabel' => 'Recharge',
+             'label'       => emt('Recharge'),
+             'actionlabel' => emt('Recharge'),
              'color'       => '#333399',
              'cust_svc'    => shift,
          )