From dcdf657e77ec7b46dc69e19a849a9c133123db7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Dec 2006 06:00:46 +0000
Subject: encryption fixes from huntsberg & jayce

---
 httemplate/view/cust_main/billing.html         | 8 ++++++--
 httemplate/view/cust_main/payment_history.html | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index d1be8936f..1f80dc5bc 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -7,7 +7,11 @@
 
 
 Billing information
-(<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+%  # If we can't see the unencrypted card, then bill now is an exercise in frustration 
+%if ( ! $cust_main->is_encrypted($cust_main->payinfo) ) { 
+  (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+% } 
+
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 %
 %( my $balance = $cust_main->balance )
@@ -31,7 +35,7 @@ Billing information
 </TR>
 <TR>
   <TD ALIGN="right">Card number</TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->payinfo_masked %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->paymask %></TD>
 </TR>
 %
 %#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 4f46ace6d..57d11b9e8 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -18,6 +18,7 @@
 
 % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
 %        && $curuser->access_right('Process payment')
+%        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
   <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card payment</A>
@@ -25,6 +26,7 @@
 
 % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
 %        && $curuser->access_right('Process payment')
+%        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
   <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) payment</A>
@@ -76,7 +78,7 @@
 %
 %  my $payinfo;
 %  if ( $payby eq 'CARD' ) {
-%    $payinfo = $cust_pay->payinfo_masked;
+%    $payinfo = $cust_pay->paymask;
 %  } elsif ( $payby eq 'CHEK' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) {
 %    $payinfo = "ABA $2, Acct# $1";
 %  } else {
-- 
cgit v1.2.1