X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=8d3925a08220df59199bc2e645979de014df13c8;hp=f7ea68a6567d3f5b6a2df8879b642780c820a173;hb=fbfd9445bb00c2a1c7f4386878edead9b50c482f;hpb=62bfe13409a16e04599f52edb3ce00ee3031a0f9
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index f7ea68a65..8d3925a08 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,6 +1,8 @@
<% mt('Billing information') |h %>
% my $yes = emt('yes');
% my $no = emt('no');
+% my $allowed = emt('allowed');
+% my $refused = emt('refused');
@@ -19,90 +21,69 @@
<% $balance %> |
-% #54: just an arbitrary number i pulled out of my goober. ideally we'd like
-% # to consider e.g. a histogram of num_ncancelled_packages for the entire
-% # customer base, and compare it to a graph of the overhead for generating this
-% # information. (and optimize it better, we could get it more from SQL)
-% if ( $cust_main->num_ncancelled_pkgs < 54 ) {
-% my $sth = dbh->prepare("
-% SELECT DISTINCT freq FROM cust_pkg LEFT JOIN part_pkg USING (pkgpart)
-% WHERE freq IS NOT NULL AND freq != '0'
-% AND ( cancel IS NULL OR cancel = 0 )
-% AND custnum = ?
-% ") or die $DBI::errstr;
-%
-% $sth->execute($cust_main->custnum) or die $sth->errstr;
+
+ <% emt( 'Recurring' ) %> |
+ |
+
-% #not really a numeric sort because freqs can actually be all sorts of things
-% # but good enough for the 99% cases of ordering monthly quarterly annually
-% my @freqs = sort { $a <=> $b } map { $_->[0] } @{ $sth->fetchall_arrayref };
-%
-% foreach my $freq (@freqs) {
-% my @cust_pkg = qsearch({
-% 'table' => 'cust_pkg',
-% 'addl_from' => 'LEFT JOIN part_pkg USING (pkgpart)',
-% 'hashref' => { 'custnum' => $cust_main->custnum, },
-% 'extra_sql' => 'AND ( cancel IS NULL OR cancel = 0 )
-% AND freq = '. dbh->quote($freq),
-% 'order_by' => 'ORDER BY pkgnum', # to ensure old pkgs come before change_to_pkg
-% }) or next;
-%
-% my $freq_pretty = $cust_pkg[0]->part_pkg->freq_pretty;
-%
-% my $amount = 0;
-% my $skip_pkg = {};
-% foreach my $cust_pkg (@cust_pkg) {
-% my $part_pkg = $cust_pkg->part_pkg;
-% next if $cust_pkg->susp
-% && ! $cust_pkg->option('suspend_bill')
-% && ( ! $part_pkg->option('suspend_bill')
-% || $cust_pkg->option('no_suspend_bill')
-% );
-%
-% #pkg change handling
-% next if $skip_pkg->{$cust_pkg->pkgnum};
-% if ($cust_pkg->change_to_pkgnum) {
-% #if change is on or before next bill date, use new pkg
-% next if $cust_pkg->expire <= $cust_pkg->bill;
-% #if change is after next bill date, use old (this) pkg
-% $skip_pkg->{$cust_pkg->change_to_pkgnum} = 1;
-% }
-%
-% my $pkg_amount = 0;
-%
-% #add recurring amounts for this package and its billing add-ons
-% foreach my $l_part_pkg ( $part_pkg->self_and_bill_linked ) {
-% $pkg_amount += $l_part_pkg->base_recur($cust_pkg);
-% }
-%
-% #subtract amounts for any active discounts
-% #(there should only be one at the moment, otherwise this makes no sense)
-% foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
-% my $discount = $cust_pkg_discount->discount;
-% #and only one of these for each
-% $pkg_amount -= $discount->amount;
-% $pkg_amount -= $amount * $discount->percent/100;
-% }
-%
-% $pkg_amount *= ( $cust_pkg->quantity || 1 );
-%
-% $amount += $pkg_amount;
-%
-% }
-
-
- <% emt( ucfirst($freq_pretty). ' recurring' ) %> |
- <% $money_char. sprintf('%.2f', $amount) %> |
-
-
-% }
+<& '/elements/xmlhttp.html',
+ 'url' => $fsurl.'misc/xmlhttp-cust_main-display_recurring.html',
+ 'subs' => [ 'get_display_recurring'] &>
+
+
+% # 10 is an arbitrary number, use ajax for customers with many packages
+% if ( $cust_main->num_billing_pkgs > 10 ) {
+<& '/elements/xmlhttp.html',
+ 'url' => $fsurl.'misc/xmlhttp-cust_main-display_recurring.html',
+ 'subs' => [ 'get_display_recurring'] &>
+
+% } else {
+
% }
% if ( $conf->exists('cust_main-select-prorate_day') ) {
<% mt('Prorate day of month') |h %> |
<% $cust_main->prorate_day %>
+ <% $cust_main->force_prorate_day && (''.emt('(applies to all packages)').'') %>
|
% }
@@ -162,34 +143,36 @@
% }
<% mt('Postal mail invoices') |h %> |
-
- <% ( grep { $_ eq 'POST' } @invoicing_list )
- ? $yes. ( $cust_main->invoice_attn
+% if ( $cust_main->postal_invoice ) {
+ | <% $yes . ( $cust_main->invoice_attn
? ', attn: '. $cust_main->invoice_attn
: ''
- )
- : $no
- %>
+ ) %>
+ |
+% } elsif ( $cust_main->invoice_noemail
+% or scalar(@invoicing_list) == 0 ) {
+% # alert the user that this customer has no way to receive an invoice
+ <% $no %> |
+% } else {
+ <% $no %> |
+% }
<% mt('Email invoices') |h %> |
-
- <% $cust_main->invoice_noemail ? $no : $yes %>
- |
+% if ( $cust_main->invoice_noemail and ! $cust_main->postal_invoice ) {
+% # as above, warn if the customer refuses both email and postal invoices
+ <% $refused %> |
+% } else {
+ <% $cust_main->invoice_noemail ? $refused : $allowed %> |
+% }
-% unless ( $conf->exists('cust-email-high-visibility')) {
- <% mt('Email address(es)') |h %> |
+ <% mt('Other email notices') |h %> |
- <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
-% if ( $cust_main->message_noemail ) {
-
- <% emt('(do not send notices)') %>
-% }
+ <% $cust_main->message_noemail ? $refused : $allowed %>
|
-% }
<% mt('Invoice terms') |h %> |
@@ -238,9 +221,9 @@
|
% }
-% if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+% if ( my $attach = $conf->config('voip-cdr_email_attach') ) {
- <% mt('Email CDRs as CSV') |h %> |
+ <% mt('Email CDRs as '.uc($attach)) |h %> |
<% $cust_main->email_csv_cdr ? $yes : $no %> |
% }
@@ -272,7 +255,7 @@
<%init>
my( $cust_main ) = @_;
-my @invoicing_list = $cust_main->invoicing_list;
+my @invoicing_list = $cust_main->invoicing_list_emailonly;
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';