RT# 32234 unmask_ss deprecated - drop from templates

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 05bf437..56c3962 100755 (executable)
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -286,7 +286,7 @@ if ( $cgi->param('error') ) {
     $cust_main->paycvv($paycvv);
   }
   @invoicing_list = $cust_main->invoicing_list;
     $cust_main->paycvv($paycvv);
   }
   @invoicing_list = $cust_main->invoicing_list;

-  $ss = $conf->exists('unmask_ss') ? $cust_main->ss : $cust_main->masked('ss');
+  $ss = $cust_main->masked('ss');

   $stateid = $cust_main->masked('stateid');
 
 } else { #new customer
   $stateid = $cust_main->masked('stateid');
 
 } else { #new customer

diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html
index 120475b..0319cf0 100644 (file)
--- a/httemplate/edit/cust_main/name.html
+++ b/httemplate/edit/cust_main/name.html
@@ -5,7 +5,6 @@
 % if (
 %   $value
 %   && ref $unmask_field
 % if (
 %   $value
 %   && ref $unmask_field

-%   && !$unmask_field->{unmask_ss}

 %   && $FS::CurrentUser::CurrentUser->access_right( $unmask_field->{access_right} )
 % ) {
   <& /elements/link-replace_element_text.html, {
 %   && $FS::CurrentUser::CurrentUser->access_right( $unmask_field->{access_right} )
 % ) {
   <& /elements/link-replace_element_text.html, {


@@ -28,7 +27,6 @@
           target_id    => 'ss',
           replace_text => $cust_main->ss,
           access_right => 'Unmask customer SSN',
           target_id    => 'ss',
           replace_text => $cust_main->ss,
           access_right => 'Unmask customer SSN',

-          unmask_ss    => $conf->exists('unmask_ss'),

         } &>
 % } else  {
         <INPUT TYPE="hidden" NAME="ss" VALUE="<% $ss %>">
         } &>
 % } else  {
         <INPUT TYPE="hidden" NAME="ss" VALUE="<% $ss %>">


@@ -63,7 +61,7 @@ my $agentnum = $cust_main->agentnum if $cust_main->custnum;
 my $conf = FS::Conf->new;
 my $ss;
 
 my $conf = FS::Conf->new;
 my $ss;
 

-if ( $cgi->param('error') or $conf->exists('unmask_ss') ) {
+if ( $cgi->param('error') ) {

   $ss = $cust_main->ss;
 } else {
   $ss = $cust_main->masked('ss');
   $ss = $cust_main->ss;
 } else {
   $ss = $cust_main->masked('ss');

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 11efcd5..efcf48e 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -31,12 +31,9 @@
     <TH ALIGN="right"><% mt('SS#') |h %></TH>
     <TD>
       <span id="ss_span" style="white-space:nowrap;">
     <TH ALIGN="right"><% mt('SS#') |h %></TH>
     <TD>
       <span id="ss_span" style="white-space:nowrap;">

-      <% $conf->exists('unmask_ss')
-           ? $cust_main->ss
-           : $cust_main->masked('ss') || '&nbsp;' %>
+      <% $cust_main->masked('ss') || '&nbsp;' %>

 %   if (
 %         $cust_main->ss
 %   if (
 %         $cust_main->ss

-%         && !$conf->exists('unmask_ss')

 %         && $FS::CurrentUser::CurrentUser->access_right('Unmask customer SSN')
 %   ) {
       <& /elements/link-replace_element_text.html, {
 %         && $FS::CurrentUser::CurrentUser->access_right('Unmask customer SSN')
 %   ) {
       <& /elements/link-replace_element_text.html, {