[freeside-commits] branch master updated. e8740b7c8f772508c0a393d3c0de2b3c8531280d

[Mitch Jackson]

The branch, master has been updated
       via  e8740b7c8f772508c0a393d3c0de2b3c8531280d (commit)
      from  85aeb9ff889959bb3f6c91e318ef856833efd504 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8740b7c8f772508c0a393d3c0de2b3c8531280d
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Wed Jul 18 19:03:57 2018 +0000

    RT# 32234 unmask_ss deprecated - drop from templates

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 05bf4377a..56c396271 100755
--- 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;
-  $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
diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html
index 120475b92..0319cf027 100644
--- a/httemplate/edit/cust_main/name.html
+++ b/httemplate/edit/cust_main/name.html
@@ -5,7 +5,6 @@
 % if (
 %   $value
 %   && ref $unmask_field
-%   && !$unmask_field->{unmask_ss}
 %   && $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',
-          unmask_ss    => $conf->exists('unmask_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;
 
-if ( $cgi->param('error') or $conf->exists('unmask_ss') ) {
+if ( $cgi->param('error') ) {
   $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 11efcd568..efcf48ecc 100644
--- 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;">
-      <% $conf->exists('unmask_ss')
-           ? $cust_main->ss
-           : $cust_main->masked('ss') || ' ' %>
+      <% $cust_main->masked('ss') || ' ' %>
 %   if (
 %         $cust_main->ss
-%         && !$conf->exists('unmask_ss')
 %         && $FS::CurrentUser::CurrentUser->access_right('Unmask customer SSN')
 %   ) {
       <& /elements/link-replace_element_text.html, {

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/cust_main.cgi           | 2 +-
 httemplate/edit/cust_main/name.html     | 4 +---
 httemplate/view/cust_main/contacts.html | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)