per-customer configurable payment date for auto CHEK/CARD, RT10813

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 296e914..b5654f0 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -107,7 +107,7 @@
         var f = (payauto_field.name == 'CARD_payauto') ? 'card_billday' : 'chek_billday';
         f = document.getElementById(f);
         if ( f == null) return;
-        if(payauto_field.checked) f.style.display = 'inline';
+        if(payauto_field.checked) f.style.display = '';
         else f.style.display = 'none';
     }
 
@@ -145,8 +145,9 @@
 %   }
 %   $ret;
 %  }
-%  my $billday_card_display = $payby eq 'CARD' ? 'inline' : 'none';
-%  my $billday_chek_display = $payby eq 'CHEK' ? 'inline' : 'none';
+%
+%  my $card_billday_style = $payby eq 'CARD' ? '' : 'style="display: none"';
+%  my $chek_billday_style = $payby eq 'CHEK' ? '' : 'style="display: none"';
 %
 %  my %payby = (
 %
@@ -199,16 +200,18 @@
 %        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" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> Charge future payments to this card automatically</TD></TR>!.
+%        qq!<TR><TD COLSPAN=2 WIDTH="608">!.
+%           qq!<INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> !.
+%           qq!Charge future payments to this card automatically!.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
-%        qq!<TR><TD COLSPAN=2 WIDTH="608" id="card_billday" style="display: $billday_card_display">
-%                    Charge on this day of each month <SELECT NAME="billday">!
-%                . billday_options($cust_main->billday) . qq!</SELECT> </TD></TR>!
+%           qq!<BR><DIV id="card_billday" $card_billday_style>
+%                       Charge on this day of each month <SELECT NAME="billday">!
+%                . billday_options($cust_main->billday) . qq!</SELECT> </DIV>!
 %        : ''
 %      ).
 %
-%      '</TABLE>',
+%      '</TD></TR></TABLE>',
 %
 %    'CHEK' => 
 %
@@ -244,16 +247,18 @@
 %       ).
 %
 %
-%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" ID="CHEK_payauto" NAME="CHEK_payauto" $CHEK_payauto_checked> Charge future payments to this electronic check automatically</TD></TR>!.
+%        qq!<TR><TD COLSPAN=4 WIDTH="608">!.
+%           qq!<INPUT TYPE="checkbox" onchange="payauto_changed(this);" ID="CHEK_payauto" NAME="CHEK_payauto" $CHEK_payauto_checked> !.
+%              qq!Charge future payments to this electronic check automatically!.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
-%        qq!<TR><TD COLSPAN=2 WIDTH="608" id="chek_billday" style="display: $billday_chek_display">
+%           qq!<DIV id="chek_billday" $chek_billday_style>
 %                    Charge on this day of each month <SELECT NAME="billday">!
-%                . billday_options($cust_main->billday) . qq!</SELECT> </TD></TR>!
+%                . billday_options($cust_main->billday) . qq!</SELECT> </DIV>!
 %        : ''
 %      ).
 %
-%      '</TABLE>',
+%      '</TD></TR></TABLE>',
 %
 %    'LECB' =>  
 %