X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Fbilling.html;h=0194d31a624b5459a4e157c9d3f0860490ac8651;hp=a1927fa6e0dbf04acc5ff064c951dd9ee7f6f65c;hb=5e8073ffe5707504751b8df36f645b325a895f87;hpb=fdc247b504359ca9e74f63daa771f49393fd70ed diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index a1927fa6e..0194d31a6 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -6,7 +6,7 @@ -% 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 )) { @@ -34,7 +34,7 @@ % % my $r = qq!* !; -
<% mt('Billing information') |h %> +
<% mt('Billing information') |h %> <% &ntable("#cccccc") %> @@ -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; } } @@ -125,6 +125,9 @@ % my $payby = $cust_main->payby; % my $paytype = $cust_main->paytype; % my( $account, $aba ) = split('@', $payinfo); +% my $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"'; @@ -158,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' => @@ -213,9 +224,9 @@ % emt('Charge future payments to this [_1] automatically','credit card').''. % % ( $conf->exists('cust_main-select-billday') ? -% qq! +% qq! % Charge on this day of each month   -% ! % . billday_options($cust_main->billday) . qq! ! % : '' % ). @@ -232,14 +243,18 @@ % join('', map { qq!" } @FS::cust_main::paytypes). % qq!!. % -% qq!${r}!.emt('ABA/Routing number').qq! !. -% qq! !. +% qq!${r}!.emt($routing_label).qq! !. +% qq! !. % qq!(!.emt('help').qq!)!. % qq!!. % % qq!!. % qq!!. % +% ( $conf->config('echeck-country') eq 'CA' ? +% qq!$r !.emt('Branch number').qq! +% ! : '' ). +% % qq!${r}!.emt('Bank name').qq! !. % qq!!. % ( $conf->exists('show_bankstate') ? @@ -261,9 +276,9 @@ % emt('Charge future payments to this [_1] automatically','electronic check').''. % % ( $conf->exists('cust_main-select-billday') ? -% qq! +% qq! % Charge on this day of each month   -% ! % . billday_options($cust_main->billday) . qq! ! % : '' % ). @@ -422,9 +437,17 @@ % my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups'); - - tax eq "Y" ? 'CHECKED' : '' %>> Tax Exempt<% @exempt_groups ? ' (all taxes)' : '' %> - +% if ( $conf->exists('cust_class-tax_exempt') ) { + + + +% } else { + + + tax eq "Y" ? 'CHECKED' : '' %>> Tax Exempt<% @exempt_groups ? ' (all taxes)' : '' %> + + +% } % foreach my $exempt_group ( @exempt_groups ) { % #escape $exempt_group for NAME @@ -465,7 +488,8 @@ % unless ( $conf->exists('cust-email-high-visibility')) { - <% $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) @@ -503,7 +527,7 @@ function toggle(obj) { % if ( $conf->exists('voip-cust_cdr_squelch') ) { - squelch_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Omit CDRs from printed invoices') |h %> + squelch_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt($conf->exists('voip-cdr_email') ? 'Omit CDRs from printed invoices' : 'Omit CDRs from invoices') |h %> % } else { @@ -544,11 +568,38 @@ function toggle(obj) { % } +%my @available_locales = $conf->config('available-locales'); +%if ( scalar(@available_locales) ) { +% 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, + &> +% } + - <% $r %> <% mt('required fields') |h %> + <% $r %><% mt('required fields') |h %> % } + + <%once> my $paystate_label = FS::Msgcat::_gettext('paystate'); @@ -577,4 +628,6 @@ if ( $cust_main->custnum ) { $show_term = $term_sth->fetchrow_arrayref->[0]; } +my $agentnum = $cust_main->agentnum if $cust_main->custnum; +