X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fcust_main%2Fbilling.html;h=ddc6cc2a7194aafb1bb38d4082aeabff5370bae2;hb=a7ec3dcd42e7f15b2bce2abfb5dc9ea07c964cd4;hp=7f7a232840abb7766ecca6831c76bb3dded4c116;hpb=c6fb9a26030c82d4c25618046230db463ff95950;p=freeside.git

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 7f7a23284..ddc6cc2a7 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -6,7 +6,7 @@
 
   <INPUT TYPE="hidden" NAME="<%$payby%>_payinfo" VALUE="<% $cust_main->paymask %>">
 
-% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip paytype paystate )) { 
+% foreach my $field (qw( payname paycvv paystart_month paystart_year payissue payip paytype paystate billday )) { 
 
     <INPUT TYPE="hidden" NAME="<% $payby.'_'.$field %>" VALUE="<% $cust_main->get($field) %>">
 
@@ -103,9 +103,9 @@
     }
 
     function payauto_changed(payauto_field){
-        var span = (payauto_field.name == 'CARD_payauto') ? 'card_billday' : 'chek_billday';
-        var select = document.getElementById('select_'+span);
-        span = document.getElementById(span);
+        var select = (payauto_field.name == 'CARD_payauto') ? 'CARD_billday' : 'CHEK_billday';
+        var span = document.getElementById('td_'+select);
+        select = document.getElementById(select);
         if (span == null || select == null) return;
         if(payauto_field.checked) {
             span.style.color = '#000000';
@@ -114,7 +114,7 @@
         else {
             span.style.color = '#999999';
             select.disabled = true;
-            select.selectedIndex = 0;
+            //why? select.selectedIndex = 0;
         }
     }
     
@@ -126,7 +126,8 @@
 %  my $paytype = $cust_main->paytype;
 %  my( $account, $aba ) = split('@', $payinfo);
 %  my $branch = '';
-%  ($branch,$aba) = split('\.',$aba) if $conf->exists('cust_main-require-bank-branch');
+%  ($branch,$aba) = split('\.',$aba)
+%    if $conf->config('echeck-country') eq 'CA';
 %
 %  my $disabled = 'DISABLED style="background-color: #dddddd"';
 %  my $text_disabled = 'style="color: #999999"';
@@ -160,6 +161,14 @@
 %  my $card_billday_select_disabled = $payby eq 'CARD' ? '' : 'DISABLED';
 %  my $chek_billday_select_disabled = $payby eq 'CHEK' ? '' : 'DISABLED';
 %
+%  #false laziness w/view/cust_main/billing.html and misc/payment.cgi
+%  my $routing_label = $conf->config('echeck-country') eq 'US'
+%                        ? 'ABA/Routing number'
+%                        : 'Routing number';
+%  my $routing_size      = $conf->config('echeck-country') eq 'CA' ? 4 : 10;
+%  my $routing_maxlength = $conf->config('echeck-country') eq 'CA' ? 3 : 9;
+%
+%
 %  my %payby = (
 %
 %    'CARD' =>
@@ -215,9 +224,9 @@
 %           emt('Charge future payments to this [_1] automatically','credit card').'</TD></TR>'.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
-%        qq!<TR><TD ALIGN="RIGHT" id="card_billday" $card_billday_style>
+%        qq!<TR><TD ALIGN="RIGHT" id="td_CARD_billday" $card_billday_style>
 %                    Charge on this day of each month</TD><TD> &nbsp; 
-%                   <SELECT id="select_card_billday" $card_billday_select_disabled NAME="billday">!
+%                   <SELECT id="CARD_billday" $card_billday_select_disabled NAME="CARD_billday">!
 %                . billday_options($cust_main->billday) . qq!</SELECT> </TD></TR>!
 %        : ''
 %      ).
@@ -234,17 +243,17 @@
 %            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}!.emt('ABA/Routing number').qq! </TD>!.
-%          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt($routing_label).qq! </TD>!.
+%          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=$routing_size MAXLENGTH=$routing_maxlength NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!"> !.
 %          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;">!.emt('help').qq!</A>)!.
 %          qq!</TD></TR>!.
 %
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_month" VALUE="12">!.
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_year" VALUE="2037">!.
 %
-%        ( $conf->exists('cust_main-require-bank-branch') ? 
+%        ( $conf->config('echeck-country') eq 'CA' ? 
 %               qq!<TR><TD ALIGN="right">$r !.emt('Branch number').qq!</TD><TD COLSPAN="3">
-%                   <INPUT TYPE="text" name="CHEK_payinfo3" VALUE=$branch></TD></TR>! : '' ).
+%                   <INPUT TYPE="text" name="CHEK_payinfo3" VALUE="$branch" SIZE=6 MAXLENGTH=5></TD></TR>! : '' ).
 %   
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Bank name').qq! </TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" NAME="CHEK_payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
@@ -267,9 +276,9 @@
 %           emt('Charge future payments to this [_1] automatically','electronic check').'</TD></TR>'.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
-%        qq!<TR><TD ALIGN="RIGHT" id="chek_billday" $chek_billday_style>
+%        qq!<TR><TD ALIGN="RIGHT" id="td_CHEK_billday" $chek_billday_style>
 %                    Charge on this day of each month</TD><TD> &nbsp;
-%                   <SELECT id="select_chek_billday" $chek_billday_select_disabled NAME="billday">!
+%                   <SELECT id="CHEK_billday" $chek_billday_select_disabled NAME="CHEK_billday">!
 %                . billday_options($cust_main->billday) . qq!</SELECT> </TD></TR>!
 %        : ''
 %      ).
@@ -471,7 +480,8 @@
 % unless ( $conf->exists('cust-email-high-visibility')) {
     <TR>
       <TD ALIGN="right" WIDTH="200">
-        <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es)
+        <% $conf->exists('cust_main-require_invoicing_list_email', $agentnum) 
+            ? $r : '' %>Email address(es)
       </TD>
       <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
     </TR>
@@ -552,20 +562,25 @@ function toggle(obj) {
 
 %my @available_locales = $conf->config('available-locales');
 %if ( scalar(@available_locales) ) {
-%   push @available_locales, '';
-%    my %locale_labels = map { 
-%        my %ll;
-%        my %info = FS::Locales->locale_info($_);
-%        $ll{$_} = $info{name} . " (" . $info{country} . ")";
-%        %ll;
-%    } FS::Locales->locales;
-  <& /elements/tr-select.html, 
-        'label'         => emt('Invoicing locale'),
-        'field'         => 'locale',
-        'options'       => \@available_locales,
-        'labels'        => \%locale_labels,
-        'curr_value'    => $cust_main->locale,
-  &>
+%  push @available_locales, ''
+%    unless $cust_main->locale && $conf->exists('cust_main-require_locale');
+%  my %locale_labels = map { 
+%    my %ll;
+%    my %info = FS::Locales->locale_info($_);
+%    $ll{$_} = $info{name} . " (" . $info{country} . ")";
+%    %ll;
+%  } FS::Locales->locales;
+%    
+%  my $label = ( $conf->exists('cust_main-require_locale') ? $r : '' ).
+%              emt('Invoicing locale');
+
+    <& /elements/tr-select.html, 
+         'label'         => $label,
+         'field'         => 'locale',
+         'options'       => \@available_locales,
+         'labels'        => \%locale_labels,
+         'curr_value'    => $cust_main->locale,
+    &>
 % }
 
   </TABLE>
@@ -605,4 +620,6 @@ if ( $cust_main->custnum ) {
   $show_term = $term_sth->fetchrow_arrayref->[0];
 }
 
+my $agentnum = $cust_main->agentnum if $cust_main->custnum;
+
 </%init>