[freeside-commits] freeside/httemplate/edit/cust_main billing.html, 1.31, 1.31.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/cust_main
In directory wavetail.420.am:/tmp/cvs-serv19187/httemplate/edit/cust_main

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	billing.html 
Log Message:
add disable_payauto_default conf, RT#12431

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/billing.html,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -w -d -r1.31 -r1.31.2.1
--- billing.html	5 Nov 2010 18:32:57 -0000	1.31
+++ billing.html	12 Apr 2011 02:51:52 -0000	1.31.2.1
@@ -112,6 +112,14 @@
 %    $text_disabled = 'style="color: #000000";'
 %  }
 %
+%  my $disable_payauto = $conf->exists('disable_payauto_default');
+%  my $CARD_payauto_checked =   $payby eq 'DCRD' ? ''
+%                             : $payby eq 'CARD' ? 'CHECKED'
+%                             : $disable_payauto ? '' : 'CHECKED';
+%  my $CHEK_payauto_checked =   $payby eq 'DCHK' ? ''
+%                             : $payby eq 'CHEK' ? 'CHECKED'
+%                             : $disable_payauto ? '' : 'CHECKED';
+%
 %  my %payby = (
 %
 %    'CARD' =>
@@ -163,7 +171,7 @@
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Exact name on card </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %
-%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="CARD_payauto" !. ( $payby eq 'DCRD' ? '' : 'CHECKED' ). '> Charge future payments to this card automatically</TD></TR>'.
+%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="CARD_payauto" $CARD_payauto_checked> Charge future payments to this card automatically</TD></TR>!.
 %
 %      '</TABLE>',
 %
@@ -201,7 +209,7 @@
 %       ).
 %
 %
-%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" NAME="CHEK_payauto" !. ( $payby eq 'DCHK' ? '' : 'CHECKED' ). '> Charge future payments to this electronic check automatically</TD></TR>'.
+%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" NAME="CHEK_payauto" $CHEK_payauto_checked> Charge future payments to this electronic check automatically</TD></TR>!.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
 %        '<TR><TD>&nbsp;</TD></TR>'.