X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=08b4323a869c76c1caa26d33c733b632620e5074;hb=6e33e8af0974d49c1c0cf65b1963846d35f6c156;hp=6be9545ac72d280bd5d6f60a6fe1a8a7bda406b0;hpb=bba2d3e97b173983eebc9ade920ac0a0468c16d7;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 6be9545ac..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');
@@ -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->base_recur;
+% $pkg_amount += $l_part_pkg->base_recur($cust_pkg);
% }
%
% #subtract amounts for any active discounts
@@ -67,11 +82,13 @@
% 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;
% }
%
-% $amount *= ( $cust_pkg->quantity || 1 );
+% $pkg_amount *= ( $cust_pkg->quantity || 1 );
+%
+% $amount += $pkg_amount;
%
% }
@@ -147,34 +164,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 %> |
@@ -223,9 +242,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 %> |
% }
@@ -257,7 +276,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') || '$';