X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=0c9f74a7c72c28d5fb942217dfa0c3ce7e6758fd;hb=5e6bfa1548ac370d2cf316e0db44785d83baa453;hp=e286305f4a8a770810df4ac080dc83f13ed90898;hpb=b7a2175dd9b386441f4ab66869d73083e5e8beb1;p=freeside.git diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index e286305f4..0c9f74a7c 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -1,201 +1,134 @@ <% mt('Billing information') |h %> -%# If we can't see the unencrypted card, then bill now is an exercise in -%# frustration (without some sort of job queue magic to send it to a secure -%# machine, anyway) -%if ( $FS::CurrentUser::CurrentUser->access_right('Bill customer now') -% && ! $cust_main->is_encrypted($cust_main->payinfo) -% ) { -%# (<% mt('Bill now') |h %>) - <& /elements/bill.html, - custnum => $cust_main->custnum, - label => emt('Bill now'), - url => $p.'view/cust_main.cgi?'.$cust_main->custnum, - &> -% } +% my $yes = emt('yes'); +% my $no = emt('no');
<% mt('Complimentary') |h %> | +<% $yes %> | +||
---|---|---|---|
<% mt('Balance due') |h %> | -<% $balance %> | -||
<% mt('Prorate day of month') |h %> | -<% $cust_main->prorate_day %> - | -||
<% mt('Billing day of month') |h %> | -<% $cust_main->billday %> - | +<% mt('Balance due') |h %> | +<% $balance %> |
<% mt('Billing type') |h %> | --% if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) { - -% my $autodemand = $cust_main->payby eq 'CARD' ? 'automatic' : 'on-demand'; - <% mt("Credit card ([_1])",$autodemand) |h %> - | -||
<% mt('Card number') |h %> | -<% $cust_main->paymask %> | -||
<% emt( ucfirst($freq_pretty). ' recurring' ) %> | +<% $money_char. sprintf('%.2f', $amount) %> | + +||
<% mt('Expiration') |h %> | -<% "$mon/$year" %> | -||
<% mt('Start date') |h %> | -<% $cust_main->paystart_month. '/'. $cust_main->paystart_year %> - | ||
<% mt('Issue #') |h %> | -<% $cust_main->payissue %> - | ||
<% mt('Name on card') |h %> | -<% $cust_main->payname %> | -<% mt('Prorate day of month') |h %> | +<% $cust_main->prorate_day %> | - -% #false laziness w/edit/cust_main/billing.html and misc/payment.cgi -% my $routing_label = $conf->config('echeck-country') eq 'US' -% ? 'ABA/Routing number' -% : 'Routing number'; - -
<% mt($routing_label) |h %> | -<% $aba %> | -||
<% mt('Branch number') |h %> | -<% $branch %> | -||
<% mt('Account number') |h %> | -<% $account %> | -||
<% mt('Account type') |h %> | -<% $cust_main->paytype %> | -||
<% mt('Bank name') |h %> | -<% $cust_main->payname %> | -||
<% $paystate_label %> | -<% $cust_main->paystate || ' ' %> | -||
<% mt('Payment day of month') |h %> | +<% $cust_main->billday %> + | +||
<% mt('Phone number') |h %> | -<% $payinfo %> | -||
<% mt('P.O.') |h %> | -<% $cust_main->payinfo %> | -||
<% mt('Attention') |h %> | -<% $cust_main->payname |h %> | -||
<% mt('Authorized by') |h %> | -<% $cust_main->payinfo %> | -||
<% mt('Expiration') |h %> | -<% "$mon/$year" %> | -||
<% mt('Purchase Order #') |h %> | +<% $cust_main->po_number %> | +||
<% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %> | -<% $cust_main->tax ? $yes : $no %> | +<% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %> | +<% $cust_main->tax ? $yes : $no %> |
<% mt('Tax exempt') |h %> (<% $exempt_group %> taxes) | -<% $cust_main_exemption ? $yes : $no %> + | <% mt('Tax exempt') |h %> (<% $exempt_group %> taxes) | +<% $cust_main_exemption ? $yes : $no %> <% $cust_main_exemption ? $cust_main_exemption->exempt_number : '' |h %> |
<% mt('Tax location') |h %> | -<% $cust_main->geocode('cch') %> | +<% mt('Tax location') |h %> | +% my $tax_location = $conf->exists('tax-ship_address') +% ? $cust_main->ship_location +% : $cust_main->bill_location; +<% $tax_location->geocode('cch') %> |
<% mt('Postal mail invoices') |h %> | -- <% ( grep { $_ eq 'POST' } @invoicing_list ) ? $yes : $no %> + | <% mt('Postal mail invoices') |h %> | ++ <% ( grep { $_ eq 'POST' } @invoicing_list ) + ? $yes. ( $cust_main->invoice_attn + ? ', attn: '. $cust_main->invoice_attn + : '' + ) + : $no + %> |
<% mt('Fax invoices') |h %> | -- <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %> - | -||
<% mt('Email invoices') |h %> | -+ | <% mt('Email invoices') |h %> | +<% $cust_main->invoice_noemail ? $no : $yes %> |
<% mt('Email address(es)') |h %> | -+ | <% mt('Email address(es)') |h %> | +
<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
% if ( $cust_main->message_noemail ) {
@@ -255,78 +191,84 @@ |
<% mt('Invoice terms') |h %> | -- <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms') || emt('Payable upon receipt') ). ')' %> + | <% mt('Invoice terms') |h %> | ++ <% $cust_main->invoice_terms + || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum) + || emt('Payable upon receipt') + ). + ')' + %> |
<% mt('Credit limit') |h %> | -- <% length($cust_main->credit_limit) ? - $money_char.sprintf("%.2f", $cust_main->credit_limit) : - emt('Unlimited') %> + | <% mt('Credit limit') |h %> | ++% my $default_credit_limit = $conf->config('default_credit_limit'); + <% length($cust_main->credit_limit) + ? $money_char. sprintf("%.2f", $cust_main->credit_limit) + : $default_credit_limit + ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")" + : emt('Unlimited') + %> +% if ( $cust_main->num_cust_main_credit_limit ) { + (incidents) +% } |
<% mt('Spool CDRs') |h %> | -<% $cust_main->spool_cdr ? $yes : $no %> | +<% mt('Spool CDRs') |h %> | +<% $cust_main->spool_cdr ? $yes : $no %> |
<% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %> | -<% $cust_main->squelch_cdr ? $no : $yes %> | +<% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %> | +<% $cust_main->squelch_cdr ? $no : $yes %> |
<% mt('Breakdown CDRs by accountcode') |h %> | -<% $cust_main->accountcode_cdr ? $yes : $no %> | +<% mt('Breakdown CDRs by accountcode') |h %> | +<% $cust_main->accountcode_cdr ? $yes : $no %> |
<% mt('Email CDRs as CSV') |h %> | -<% $cust_main->email_csv_cdr ? $yes : $no %> | +<% mt('Email CDRs as CSV') |h %> | +<% $cust_main->email_csv_cdr ? $yes : $no %> |
<% mt('CDR termination settlement') |h %> | -<% $cust_main->cdr_termination_percentage %><% $cust_main->cdr_termination_percentage =~ /\d/ ? '%' : '' %> | +<% mt('CDR termination settlement') |h %> | +<% $cust_main->cdr_termination_percentage %><% $cust_main->cdr_termination_percentage =~ /\d/ ? '%' : '' %> |
<% mt('Invoicing currency') |h %> | -<% $cust_main->currency. ': '. code2currency($cust_main->currency) %> | +<% mt('Invoicing currency') |h %> | +<% $cust_main->currency. ': '. code2currency($cust_main->currency) %> |
<% mt('Invoicing locale') |h %> | -<% $locale_info{name} . " (" . $locale_info{country} .")" %> | +<% mt('Invoicing locale') |h %> | +<% $locale_info{name} . " (" . $locale_info{country} .")" %> |