X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=08b4323a869c76c1caa26d33c733b632620e5074;hb=da9ab0af53220f6f1cb0e4d31ce7de81dd591783;hp=2f164dfe99023e4dbc983d34c91d96df202d6b56;hpb=b43d0bcba176dd04e052b583d4d9c6f540c33b43;p=freeside.git diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 2f164dfe9..08b4323a8 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');
<% $balance %> | -% #54: just an arbitrary number i pulled out of my goober. in reality we'd want +% #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) @@ -44,11 +46,13 @@ % 'hashref' => { 'custnum' => $cust_main->custnum, }, % 'extra_sql' => 'AND ( cancel IS NULL OR cancel = 0 ) % AND freq = '. dbh->quote($freq), +% 'order_by' => 'ORDER BY COALESCE(start_date,0), 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 @@ -57,9 +61,20 @@ % || $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 ) { -% $amount += $l_part_pkg->option('recur_fee'); +% $pkg_amount += $l_part_pkg->base_recur($cust_pkg); % } % % #subtract amounts for any active discounts @@ -67,10 +82,14 @@ % foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) { % my $discount = $cust_pkg_discount->discount; % #and only one of these for each -% $amount -= $discount->amount; -% $amount -= $amount * $discount->percent/100; +% $pkg_amount -= $discount->amount; +% $pkg_amount -= $amount * $discount->percent/100; % } % +% $pkg_amount *= ( $cust_pkg->quantity || 1 ); +% +% $amount += $pkg_amount; +% % }||||
<% 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 %> | +% }|
<% 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 %> | @@ -221,9 +242,9 @@ | |||
<% mt('Email CDRs as CSV') |h %> | +<% mt('Email CDRs as '.uc($attach)) |h %> | <% $cust_main->email_csv_cdr ? $yes : $no %> |