X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=dd195236a7b642511f4f3adce8b66ce3186be697;hp=d1be8936fb5c2de82bea8fe750e5afa30aa8a697;hb=74a3083375ccc3a0dc8b74f9b39392989d088656;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index d1be8936f..dd195236a 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,19 +1,22 @@
-%
-% my( $cust_main ) = @_;
-% my @invoicing_list = $cust_main->invoicing_list;
-% my $conf = new FS::Conf;
-% my $money_char = $conf->config('money_char') || '$';
-%
-
-
Billing information
-(Bill now)
+%# 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)
+% ) {
+%# (Bill now)
+ (<% include('/elements/bill.html',
+ custnum => $cust_main->custnum,
+ label => 'Bill now',
+ url => $p.'view/cust_main.cgi?'.$cust_main->custnum,
+ ) %>)
+% }
+
<% ntable("#cccccc") %><% ntable("#cccccc",2) %>
-%
+
%( my $balance = $cust_main->balance )
% =~ s/^(\-?)(.*)$/$1<\/FONT>$money_char$2/;
-%
-
| Balance due |
@@ -31,7 +34,7 @@ Billing information
| Card number |
- <% $cust_main->payinfo_masked %> |
+ <% $cust_main->paymask %> |
%
%#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
@@ -71,8 +74,7 @@ Billing information
| <% $cust_main->payname %> |
% } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
-% my( $account, $aba ) = split('@', $cust_main->payinfo );
-%
+% my( $account, $aba ) = split('@', $cust_main->paymask );
Electronic check <% $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' %>
@@ -84,12 +86,22 @@ Billing information
| Account number |
- <% 'x'x(length($account)-2). substr($account,(length($account)-2)) %> |
+ <% $account %> |
+
+
+ | Account type |
+ <% $cust_main->paytype %> |
| Bank name |
<% $cust_main->payname %> |
+% if ( $conf->exists('show_bankstate') ) {
+
+ | <% $paystate_label %> |
+ <% $cust_main->paystate || ' ' %> |
+
+% }
% } elsif ( $cust_main->payby eq 'LECB' ) {
% $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
% my $payinfo = "$1-$2-$3";
@@ -152,11 +164,24 @@ Billing information
% }
-
+% my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
- | Tax exempt |
+ Tax exempt<% @exempt_groups ? ' (all taxes)' : '' %> |
<% $cust_main->tax ? 'yes' : 'no' %> |
+% foreach my $exempt_group ( @exempt_groups ) {
+
+ | Tax exempt (<% $exempt_group %> taxes) |
+ <% $cust_main->tax_exemption($exempt_group) ? 'yes' : 'no' %> |
+
+% }
+
+% if ( $conf->exists('enable_taxproducts') ) {
+
+ | Tax location |
+ <% $cust_main->geocode('cch') %> |
+
+% }
| Postal invoices |
@@ -175,14 +200,67 @@ Billing information
<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
|
-% if ( $conf->exists('voip-cust_cdr_spools') ) {
+
+ | Invoice terms |
+
+ <% $cust_main->invoice_terms || 'Default ('. ( $conf->config('invoice_default_terms') || 'Payable upon receipt' ). ')' %>
+ |
+
+
+ | Credit limit |
+
+ <% length($cust_main->credit_limit) ?
+ $money_char.sprintf("%.2f", $cust_main->credit_limit) :
+ 'Unlimited' %>
+ |
+
+% if ( $conf->exists('voip-cust_cdr_spools') ) {
| Spool CDRs |
<% $cust_main->spool_cdr ? 'yes' : 'no' %> |
% }
+% if ( $conf->exists('voip-cust_cdr_squelch') ) {
+
+ | Print CDRs |
+ <% $cust_main->squelch_cdr ? 'no' : 'yes' %> |
+
+% }
+
+% if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+
+ | Email CDRs as CSV |
+ <% $cust_main->email_csv_cdr ? 'yes' : 'no' %> |
+
+% }
+
+% if ( $show_term || $cust_main->cdr_termination_percentage ) {
+
+ | CDR termination settlement |
+ <% $cust_main->cdr_termination_percentage %><% $cust_main->cdr_termination_percentage =~ /\d/ ? '%' : '' %> |
+
+% }
+<%once>
+
+my $paystate_label = FS::Msgcat::_gettext('paystate');
+$paystate_label = 'Bank state' if $paystate_label =~/^paystate$/;
+
+
+<%init>
+
+my( $cust_main ) = @_;
+my @invoicing_list = $cust_main->invoicing_list;
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+#false laziness w/edit/cust_main/billing.html
+my $term_sql = "SELECT COUNT(*) FROM cust_pkg LEFT JOIN part_pkg USING ( pkgpart ) WHERE custnum = ? AND plan = 'cdr_termination' LIMIT 1";
+my $term_sth = dbh->prepare($term_sql) or die dbh->errstr;
+$term_sth->execute($cust_main->custnum) or die $term_sth->errstr;
+my $show_term = $term_sth->fetchrow_arrayref->[0];
+