This commit was generated by cvs2svn to compensate for changes in r10640,

[freeside.git] / httemplate / view / cust_main / packages / status.html

diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index a686843..2707803 100644 (file)
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -3,6 +3,10 @@
 
 %#this should use cust_pkg->status and cust_pkg->statuscolor eventually
 
+% if ( $cust_pkg->order_date ) {
+    <% pkg_status_row($cust_pkg, 'Ordered', 'order_date', %opt ) %>
+% }
+
 % if ( $cust_pkg->get('cancel') ) { #status: cancelled
 %   my $cpr = $cust_pkg->last_cust_pkg_reason('cancel');
 
@@ -54,8 +58,11 @@
 
     <% 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)
+%   if ( $part_pkg->option('suspend_bill', 1) ) {
+      <% pkg_status_row_if( $cust_pkg, 'Next&nbsp;bill', 'bill', %opt, curuser=>$curuser ) %>
+%   }
     <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
+    <% pkg_status_row_if( $cust_pkg, 'Contract ends', 'contract_end', %opt ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
@@ -167,6 +174,7 @@
       <% 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, 'Contract ends', 'contract_end', %opt ) %>
 
 %     if ( $part_pkg->freq ) {