X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=0f794e334ef46b49c96bf26daf5d098a7da6d1b3;hb=817c1ce0e1cbcfd1f684222c66f46dd13b2d6dd7;hp=84241d2978cc5d8bd7a010979c7791bc671d85f3;hpb=747949f05c140e23221b3a2364928431f58fc2d3;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 84241d297..0f794e334 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,18 +1,4 @@
 <FONT CLASS="fsinnerbox-title"><% mt('Billing information') |h %></FONT>
-%# If we can't see the unencrypted card, then bill now is an exercise in
-%# frustration (without some sort of job queue magic to send it to a secure
-%# machine, anyway)
-%if (  $FS::CurrentUser::CurrentUser->access_right('Bill customer now')
-%      && ! $cust_main->is_encrypted($cust_main->payinfo)
-%   ) { 
-%#  (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>"><% mt('Bill now') |h %></A>)
-  <& /elements/bill.html,
-       custnum   => $cust_main->custnum,
-       label     => emt('Bill now'),
-       url       => $p.'view/cust_main.cgi?'.$cust_main->custnum,
-  &>
-% } 
-
 % my $yes = emt('yes');
 % my $no = emt('no');
 
@@ -85,7 +71,7 @@
     </TR>
 % }
 
-% if ( $conf->exists('enable_taxproducts') ) {
+% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
 <TR>
   <TH ALIGN="right"><% mt('Tax location') |h %></TH>
 % my $tax_location = $conf->exists('tax-ship_address')