X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fmisc.html;h=cb465f57e116c39943dd7af7d1fe5f7b8a04e301;hp=28414ef2daa5af7801deecdf0fcf59b77a8b1a60;hb=ae58eda132b5a89ce251dbdf13822dee2f3bc92f;hpb=5e76ae4e7a11bd28478ed68eef8124fb7ff0767c

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 28414ef2d..cb465f57e 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -1,19 +1,10 @@
-<% ntable("#cccccc") %><TR><TD><% &ntable("#cccccc",2) %>
-
-<TR>
-  <TD ALIGN="right"><% mt('Customer number') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->display_custnum %></TD>
-</TR>
-
-<TR>
-  <TD ALIGN="right"><% mt('Status') |h %></TD>
-  <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% ucfirst($cust_main->status) %></B></FONT></TD>
-</TR>
+<FONT CLASS="fsinnerbox-title"><% mt('Miscellaneous information') |h %></FONT>
+<TABLE CLASS="fsinnerbox">
 
 % my @part_tag = $cust_main->part_tag;
 % if ( $conf->config('cust_tag-location') =~ /^(cust_misc|)$/ && @part_tag ) {
 <TR>
-  <TD ALIGN="right"><% mt('Tags') |h %></TD>
+  <TH ALIGN="right"><% mt('Tags') |h %></TH>
   <TD BGCOLOR="#ffffff">
 %   foreach my $part_tag ( @part_tag ) {
       <FONT <% length($part_tag->tagcolor)
@@ -26,20 +17,11 @@
 </TR>
 % }
 
-%unless ( scalar(@agentnums) == 1
-%         && !$curuser->access_right('View customers of all agents')  ) {
-%  my $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
-   <TR>
-     <TD ALIGN="right"><% mt('Agent') |h %></TD>
-     <TD BGCOLOR="#ffffff"><% $agent->agentnum %>: <% $agent->agent %></TD>
-   </TR>
-% }
-
 %  if ( $cust_main->agent_custid
 %       && ! $conf->exists('cust_main-default_agent_custid') ) {
 
 <TR>
-  <TD ALIGN="right"><% mt('Agent customer ref#') |h %></TD>
+  <TH ALIGN="right"><% mt('Agent customer ref#') |h %></TH>
   <TD BGCOLOR="#ffffff"><% $cust_main->agent_custid %></TD>
 </TR>
 %
@@ -47,26 +29,33 @@
 
 %  #if ( $cust_main->classnum ) {
      <TR>
-       <TD ALIGN="right"><% mt('Class') |h %></TD>
-       <TD BGCOLOR="#ffffff"><% $cust_main->classname || '('.emt('none').')' %></TD>
+       <TH ALIGN="right"><% mt('Class') |h %></TH>
+       <TD><% $cust_main->classname || '('.emt('none').')' %></TD>
      </TR>
 %  #}
 
+% if ( $cust_main->salesnum ) {
+    <TR>
+      <TH ALIGN="right"><% mt('Sales Person') |h %></TH>
+      <TD><% $cust_main->salesperson |h %></TD>
+    </TR>
+% }
+
 %  unless ( FS::part_referral->num_part_referral == 1 ) {
 %    my $referral = qsearchs('part_referral', {
 %      'refnum' => $cust_main->refnum
 %    } );
 
 <TR>
-  <TD ALIGN="right"><% mt('Advertising source') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $referral->refnum %>: <% $referral->referral%></TD>
+  <TH ALIGN="right"><% mt('Advertising source') |h %></TH>
+  <TD><% $referral->refnum %>: <% $referral->referral%></TD>
 </TR>
 % } 
 
 
 <TR>
-  <TD ALIGN="right"><% mt('Referring Customer') |h %></TD>
-  <TD BGCOLOR="#ffffff">
+  <TH ALIGN="right"><% mt('Referring Customer') |h %></TH>
+  <TD>
 %
 %  my $referring_cust_main = '';
 %  if ( $cust_main->referral_custnum
@@ -93,15 +82,35 @@
 </TR>
 
 <TR>
-  <TD ALIGN="right"><% mt('Order taker') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->otaker %></TD>
+  <TH ALIGN="right"><% mt('Order taker') |h %></TH>
+  <TD><% $cust_main->otaker %></TD>
 </TR>
 
   <TR>
-    <TD ALIGN="right"><% mt('Signup Date') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->signupdate ? time2str($date_format, $cust_main->signupdate) : '' %></TD>
+    <TH ALIGN="right"><% mt('Signup Date') |h %></TH>
+    <TD><% $cust_main->signupdate ? time2str($date_format, $cust_main->signupdate) : '' %></TD>
   </TR>
 
+% my $id_country = $conf->config('national_id-country');
+%  if ( $id_country ) {
+%   if ( $id_country eq 'MY' ) {
+      <TR>
+%     my($old, $nric) = ( '', '');
+%     if ( $cust_main->national_id =~ /^\d{6}\-\d{2}\-\d{4}$/ ) {
+          <TH ALIGN="right"><% mt('NRIC') |h %></TH>
+%     } else { # elsif ( $cust_main->national_id =~ /^\w\d{9}$/ ) {
+          <TH ALIGN="right"><% mt('Old IC/Passport') |h %></TH>
+%     #} else {
+%     #  warn "unknown national_id format";
+%#         <TH ALIGN="right"></TH>
+%     }
+        <TD><% $cust_main->national_id |h %></TD>
+      </TR>
+%   } else {
+%     warn "unknown national_id-country $id_country";
+%   }
+% }
+
 % if ( $conf->exists('cust_main-enable_birthdate') ) {
 %   my $dt = $cust_main->birthdate ne ''
 %              ? DateTime->from_epoch( 'epoch'     => $cust_main->birthdate,
@@ -110,19 +119,35 @@
 %              : '';
 
   <TR>
-    <TD ALIGN="right"><% mt('Date of Birth') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $dt ? $dt->strftime($date_format) : '' %></TD>
+    <TH ALIGN="right"><% mt('Date of Birth') |h %></TH>
+    <TD><% $dt ? $dt->strftime($date_format) : '' %></TD>
   </TR>
 
-% }
+%   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>
+    <TH ALIGN="right"><% mt('Spouse Date of Birth') |h %></TH>
+    <TD><% $dt ? $dt->strftime($date_format) : '' %></TD>
+  </TR>
 
-% if ( $conf->exists('cust_main-require_censustract') ) {
+%   }
+% } # enable_birthdate
+
+% if ( $conf->exists('cust_main-enable_anniversary_date') ) {
+%   my $dt = $cust_main->anniversary_date ne ''
+%              ? DateTime->from_epoch( 'epoch'  => $cust_main->anniversary_date,
+%                                      'time_zone' =>'floating',
+%                                    )
+%              : '';
 
   <TR>
-    <TD ALIGN="right">
-      <% mt('Census tract ([_1])', $cust_main->censusyear) |h %>
-    </TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->censustract  %></TD>
+    <TH ALIGN="right"><% mt('Anniversary Date') |h %></TH>
+    <TD><% $dt ? $dt->strftime($date_format) : '' %></TD>
   </TR>
 
 % }
@@ -130,8 +155,8 @@
 % if ( $cust_main->district ) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Tax district') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->district %></TD>
+    <TH ALIGN="right"><% mt('Tax district') |h %></TH>
+    <TD><% $cust_main->ship_location->district %></TD>
   </TR>
 
 % }
@@ -140,8 +165,8 @@
 % if ( $conf->exists('ticket_system-selfservice_edit_subject') ) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Edit ticket subjects') %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->edit_subject ? 'yes' : 'no' %></TD>
+    <TH ALIGN="right"><% emt('Edit ticket subjects') %></TH>
+    <TD><% $cust_main->edit_subject ? 'yes' : 'no' %></TD>
   </TR>
 
 % }
@@ -150,7 +175,7 @@
     <% $cust_main->pvf($_)->widget('HTML', 'view', $cust_main->getfield($_)) %>
 % }
 
-</TABLE></TD></TR></TABLE>
+</TABLE>
 <%init>
 
 my( $cust_main ) = @_;
@@ -161,4 +186,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>