bundled package presentation improvements

[freeside.git] / httemplate / edit / cust_main / billing.html

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 65b4400..d4c5034 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -10,7 +10,7 @@
 
     <INPUT TYPE="hidden" NAME="payinfo" VALUE="<% $cust_main->paymask %>">
 
-% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip )) { 
+% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip paytype paystate )) { 
 
     <INPUT TYPE="hidden" NAME="<% $field %>" VALUE="<% $cust_main->getfield($field) %>">
 
@@ -107,18 +107,10 @@
 
   </SCRIPT>
 
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript">
-  function OLiframeContent(src, width, height, name) {
-    return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-     +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-     +'<div>[iframe not supported]</div></iframe>');
-  }
-  </SCRIPT>
+  <% include('/elements/init_overlib.html') %>
 
 %  my $payby = $cust_main->payby;
+%  my $paytype = $cust_main->paytype;
 %  my( $account, $aba ) = split('@', $payinfo);
 %
 %  my $disabled = 'DISABLED style="background-color: #dddddd"';
@@ -189,10 +181,13 @@
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Account number </TD>!.
-%          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=12 NAME="payinfo1" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $account : '' ). '"></TD></TR>'.
+%          qq!<TD><INPUT TYPE="text" SIZE=12 NAME="payinfo1" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $account : '' ). '"></TD>'.
+%          qq!<TD ALIGN="right">Type</TD><TD><SELECT NAME="paytype">!.
+%            join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes).
+%          qq!</SELECT></TD></TR>!.
 %
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}ABA/Routing number </TD>!.
-%          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
+%          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
 %          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
 %          qq!</TD></TR>!.
 %
@@ -200,9 +195,22 @@
 %        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
 %
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Bank name </TD>!.
-%          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
+%          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
+%      ( $conf->exists('show_bankstate') ?
+%          qq!<TR><TD ALIGN="right" WIDTH="200">$paystate_label</TD>!.
+%          qq!<TD COLSPAN="3" WIDTH="408">!.
+%          include('select-state.html',
+%                    'empty'   => '(choose)',
+%                    'state'   => $cust_main->paystate,
+%                    'country' => $cust_main->country,
+%                    'prefix' => 'pay',
+%                 ). "</TD></TR>"
+%         : '<INPUT TYPE="hidden" NAME="paystate" VALUE="'.
+%            $cust_main->paystate. '">'
+%       ).
+%
 %
-%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="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="payauto" !. ( $payby eq 'DCHK' ? '' : 'CHECKED' ). '> Charge future payments to this electronic check automatically</TD></TR>'.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
 %        '<TR><TD>&nbsp;</TD></TR>'.
@@ -379,6 +387,8 @@
       <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="tax" VALUE="Y" <% $cust_main->tax eq "Y" ? 'CHECKED' : '' %>> Tax Exempt</TD>
     </TR>
 
+% unless ( $conf->exists('emailinvoiceonly') ) {
+
     <TR>
       <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST" <%
 
@@ -404,8 +414,12 @@
       </TD>
     </TR>
 
+% }
+
     <TR>
-      <TD ALIGN="right" WIDTH="200">Email invoice </TD>
+      <TD ALIGN="right" WIDTH="200">
+        <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es)
+      </TD>
       <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
     </TR>
 
@@ -432,6 +446,15 @@
       <INPUT TYPE="hidden" NAME="spool_cdr" VALUE="<% $cust_main->spool_cdr %>">
 % } 
 
+% if ( $conf->exists('voip-cust_cdr_squelch') ) { 
+      <TR>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="squelch_cdr" VALUE="Y" <% $cust_main->squelch_cdr eq "Y" ? 'CHECKED' : '' %>> Omit CDRs from invoices</TD>
+      </TR>
+% } else { 
+
+      <INPUT TYPE="hidden" NAME="squelch_cdr" VALUE="<% $cust_main->squelch_cdr %>">
+% } 
+
   </TABLE>
 
   </FORM>
@@ -439,6 +462,12 @@
   <% $r %> required fields
 % } 
 
+<%once>
+
+my $paystate_label = FS::Msgcat::_gettext('paystate');
+$paystate_label = 'Bank state' if $paystate_label =~/^paystate$/;
+
+</%once>
 <%init>
 
 my( $cust_main, %options ) = @_;