X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=367659293261c053e4ca96b0845bd7565e3a61d8;hb=ca8a483f90e0c9ee4a1d2e65ddee07278ff48a9d;hp=a41a4836b7f128d5cfc13d83745c7c27ada1bb96;hpb=b94de8e60418744e1526d96a0e85715e3e350c9d;p=freeside.git

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index a41a4836b..367659293 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,7 +10,7 @@
 %   if ( $this eq 'ship' and 
 %       $cust_main->bill_locationnum == $cust_main->ship_locationnum )
 %   {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
 %   }
 </FONT>
 %   if (
@@ -29,9 +29,20 @@
     <TD COLSPAN=5><% $cust_main->contact |h %></TD>
 %   if ( $conf->exists('show_ss') ) {
     <TH ALIGN="right"><% mt('SS#') |h %></TH>
-    <TD><% $conf->exists('unmask_ss')
-                              ? $cust_main->ss
-                              : $cust_main->masked('ss') || '&nbsp;' %></TD>
+    <TD>
+      <span id="ss_span" style="white-space:nowrap;">
+      <% $conf->exists('unmask_ss')
+           ? $cust_main->ss
+           : $cust_main->masked('ss') || '&nbsp;' %>
+%   if ( !$conf->exists('unmask_ss') && $FS::CurrentUser::CurrentUser->access_right('Unmask customer SSN')) {
+      <& /elements/link-replace_element_text.html, {
+           target_id    => 'ss_span',
+           replace_text => $cust_main->ss,
+           element_type => 'span'
+      } &>
+%   }
+      </span>
+    </TD>
 %   }
   </TR>
 %   if ( $conf->exists('cust_main-enable_spouse') and
@@ -82,7 +93,7 @@
 % } elsif ( $this eq 'ship' ) {
 %   if ( $cust_main->ship_company ) { # mostly obsolete these days...
   <TR>
-    <TD ALIGN="right"><% mt('Company') |h %></TD>
+    <TH ALIGN="right"><% mt('Company') |h %></TH>
     <TD COLSPAN=7><% $cust_main->ship_company |h %></TD>
   </TR>
 %   }
@@ -93,7 +104,7 @@
 
 %   if ( $location->locationname ) {
       <TR>
-        <TD ALIGN="right"><% mt('Location ID') |h %></TD>
+        <TH ALIGN="right"><% mt('Location ID') |h %></TH>
         <TD COLSPAN=7><% $location->locationname |h %></TD>
       </TR>
 %   }
@@ -122,12 +133,12 @@
  (<% $location->county |h %> county)\
 % }
 <% ($location->city || $location->county) ? ', ' : ''%><% state_label( $location->state, $location->country ) |h %>
-  <% $location->zip %>
+  <% $location->zip |h %>
 </TD>
 </TR>
 <TR>
   <TH></TH>
-  <TD><% code2country( $location->country ) %></TD>
+  <TD><% $location->country_full |h %></TD>
 </TR>
 
 % if ( $location->latitude && $location->longitude ) {
@@ -160,7 +171,7 @@
 %   if ( $cust_main->get('fax') ) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Fax') |h %></TD>
+    <TH ALIGN="right"><% mt('Fax') |h %></TH>
     <TD COLSPAN=3>
       <% $cust_main->get('fax') || '&nbsp;' %>
     </TD>
@@ -171,9 +182,20 @@
 %   if ( $conf->exists('show_stateid') ) { 
 
 <TR>
-    <TD ALIGN="right"><% $stateid_label %></TD>
-    <TD><% $cust_main->masked('stateid') || '&nbsp' %></TD>
-    <TD ALIGN="right"><% $stateid_state_label %></TD>
+    <TH ALIGN="right"><% $stateid_label %></TH>
+    <TD>
+      <span id="stateid_span" style="white-space:nowrap;">
+      <% $cust_main->masked('stateid') || '&nbsp' %>
+%   if ( $FS::CurrentUser::CurrentUser->access_right('Unmask customer DL')) {
+      <& /elements/link-replace_element_text.html, {
+           target_id => 'stateid_span',
+           replace_text => $cust_main->stateid,
+           element_type => 'span'
+      } &>
+%   }
+      </span>
+    </TD>
+    <TH ALIGN="right"><% $stateid_state_label %></TH>
     <TD><% $cust_main->stateid_state || '&nbsp' %></TD>
   </TR>