X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fmisc.html;h=fe0e329c3af4fde57bcdd26071e251b59c148311;hb=4d0db1129018d2f598091edbbffeb09b23c64d99;hp=9713b246937b45b47ddb4d26b6ea2fcf8bcb310f;hpb=5a204201503f8e0db6087db6e53b84297cbc739a;p=freeside.git

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 9713b2469..fe0e329c3 100644
--- 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;
@@ -52,6 +52,13 @@
      </TR>
 %  #}
 
+% if ( $cust_main->salesnum ) {
+    <TR>
+      <TD ALIGN="right"><% mt('Sales Person') |h %></TD>
+      <TD BGCOLOR="#ffffff"><% $cust_main->salesperson |h %></TD>
+    </TR>
+% }
+
 %  unless ( FS::part_referral->num_part_referral == 1 ) {
 %    my $referral = qsearchs('part_referral', {
 %      'refnum' => $cust_main->refnum
@@ -107,13 +114,13 @@
 %   if ( $id_country eq 'MY' ) {
       <TR>
 %     my($old, $nric) = ( '', '');
-%     if ( $cust_main->national_id =~ /^\w\d{9}$/ ) {
-          <TD ALIGN="right"><% mt('Old IC/Passport') |h %></TD>
-%     } elsif ( $cust_main->national_id =~ /^\d{6}\-\d{2}\-\d{4}$/ ) {
+%     if ( $cust_main->national_id =~ /^\d{6}\-\d{2}\-\d{4}$/ ) {
           <TD ALIGN="right"><% mt('NRIC') |h %></TD>
-%     } else {
-%       warn "unknown national_id format";
-          <TD ALIGN="right"></TD>
+%     } else { # elsif ( $cust_main->national_id =~ /^\w\d{9}$/ ) {
+          <TD ALIGN="right"><% mt('Old IC/Passport') |h %></TD>
+%     #} else {
+%     #  warn "unknown national_id format";
+%#         <TD ALIGN="right"></TD>
 %     }
         <TD BGCOLOR="#ffffff"><% $cust_main->national_id |h %></TD>
       </TR>
@@ -134,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 ''
@@ -164,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>
@@ -209,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>