RT#14671: Usage for current day when billing outstanding usage (for cancelling customers)

[freeside.git] / httemplate / view / cust_main / misc.html

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 5311aa5..fe0e329 100644 (file)
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -7,7 +7,7 @@
 
 <TR>
   <TD ALIGN="right"><% mt('Status') |h %></TD>
-  <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% ucfirst($cust_main->status) %></B></FONT></TD>
+  <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% $status_label %></B></FONT></TD>
 </TR>
 
 % my @part_tag = $cust_main->part_tag;
@@ -141,21 +141,20 @@
     <TD BGCOLOR="#ffffff"><% $dt ? $dt->strftime($date_format) : '' %></TD>
   </TR>
 
-% }
-
-% if ( $conf->exists('cust_main-enable_spouse_birthdate') ) {
-%   my $dt = $cust_main->spouse_birthdate ne ''
-%              ? DateTime->from_epoch( 'epoch'  => $cust_main->spouse_birthdate,
-%                                      'time_zone' =>'floating',
-%                                    )
-%              : '';
+%   if ( $conf->exists('cust_main-enable_spouse') 
+%        and $cust_main->spouse_birthdate ) {
+%     my $dt = DateTime->from_epoch(
+%                   'epoch'  => $cust_main->spouse_birthdate,
+%                   'time_zone' =>'floating'
+%              );
 
   <TR>
     <TD ALIGN="right"><% mt('Spouse Date of Birth') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $dt ? $dt->strftime($date_format) : '' %></TD>
   </TR>
 
-% }
+%   }
+% } # enable_birthdate
 
 % if ( $conf->exists('cust_main-enable_anniversary_date') ) {
 %   my $dt = $cust_main->anniversary_date ne ''
@@ -171,17 +170,6 @@
 
 % }
 
-% if ( $conf->exists('cust_main-require_censustract') ) {
-
-  <TR>
-    <TD ALIGN="right">
-      <% mt('Census tract ([_1])', $cust_main->ship_location->censusyear) |h %>
-    </TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->ship_location->censustract  %></TD>
-  </TR>
-
-% }
-
 % if ( $cust_main->district ) {
 
   <TR>
@@ -216,4 +204,9 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 
 my @agentnums = $curuser->agentnums;
 
+my $status_label = $cust_main->status_label;
+if ($cust_main->is_status_delay_cancel) {
+  $status_label .= ' (Cancelled)';
+}
+
 </%init>