X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=f7ea68a6567d3f5b6a2df8879b642780c820a173;hb=62bfe13409a16e04599f52edb3ce00ee3031a0f9;hp=4f4b7458741a934625251dec062a13d9a3969157;hpb=0870a4c1fb02be43ea5524f58650d99c81477681;p=freeside.git diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 4f4b74587..f7ea68a65 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -1,18 +1,4 @@ <% 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'); @@ -20,8 +6,8 @@ % if ( $cust_main->complimentary ) { - <% mt('Complimentary') |h %> - <% $yes %> + <% mt('Complimentary') |h %> + <% $yes %> % } @@ -29,14 +15,94 @@ % =~ s/^(\-?)(.*)$/$1<\/FONT>$money_char$2/; - <% mt('Balance due') |h %> - <% $balance %> + <% mt('Balance due') |h %> + <% $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; + +% #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) %> + + +% } + +% } + % if ( $conf->exists('cust_main-select-prorate_day') ) { - <% mt('Prorate day of month') |h %> - <% $cust_main->prorate_day %> + <% mt('Prorate day of month') |h %> + <% $cust_main->prorate_day %> % } @@ -50,16 +116,16 @@ % ) % { - <% mt('Payment day of month') |h %> - <% $cust_main->billday %> + <% mt('Payment day of month') |h %> + <% $cust_main->billday %> % } % if ( $cust_main->po_number ) { - <% mt('Purchase Order #') |h %> - <% $cust_main->po_number %> + <% mt('Purchase Order #') |h %> + <% $cust_main->po_number %> % } @@ -70,33 +136,33 @@ % ) % { - <% 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 %> % } % foreach my $exempt_group ( @exempt_groups ) { % my $cust_main_exemption = $cust_main->tax_exemption($exempt_group); - <% 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 %> % } -% if ( $conf->exists('enable_taxproducts') ) { +% if ( $conf->config('tax_data_vendor') eq 'cch' ) { - <% mt('Tax location') |h %> + <% mt('Tax location') |h %> % my $tax_location = $conf->exists('tax-ship_address') % ? $cust_main->ship_location % : $cust_main->bill_location; - <% $tax_location->geocode('cch') %> + <% $tax_location->geocode('cch') %> % } - <% mt('Postal mail invoices') |h %> - + <% mt('Postal mail invoices') |h %> + <% ( grep { $_ eq 'POST' } @invoicing_list ) ? $yes. ( $cust_main->invoice_attn ? ', attn: '. $cust_main->invoice_attn @@ -107,15 +173,15 @@ - <% mt('Email invoices') |h %> - + <% mt('Email invoices') |h %> + <% $cust_main->invoice_noemail ? $no : $yes %> % unless ( $conf->exists('cust-email-high-visibility')) { - <% mt('Email address(es)') |h %> - + <% mt('Email address(es)') |h %> + <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %> % if ( $cust_main->message_noemail ) {
@@ -125,8 +191,8 @@ % } - <% mt('Invoice terms') |h %> - + <% mt('Invoice terms') |h %> + <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum) || emt('Payable upon receipt') @@ -136,8 +202,8 @@ - <% mt('Credit limit') |h %> - + <% 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) @@ -153,51 +219,51 @@ % if ( $conf->exists('voip-cust_cdr_spools') ) { - <% mt('Spool CDRs') |h %> - <% $cust_main->spool_cdr ? $yes : $no %> + <% mt('Spool CDRs') |h %> + <% $cust_main->spool_cdr ? $yes : $no %> % } % if ( $conf->exists('voip-cust_cdr_squelch') ) { - <% 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 %> % } % if ( $conf->exists('voip-cust_accountcode_cdr') ) { - <% mt('Breakdown CDRs by accountcode') |h %> - <% $cust_main->accountcode_cdr ? $yes : $no %> + <% mt('Breakdown CDRs by accountcode') |h %> + <% $cust_main->accountcode_cdr ? $yes : $no %> % } % if ( $conf->exists('voip-cust_email_csv_cdr') ) { - <% 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 %> % } % if ( $show_term || $cust_main->cdr_termination_percentage ) { - <% 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/ ? '%' : '' %> % } % if ( $cust_main->currency ) { - <% mt('Invoicing currency') |h %> - <% $cust_main->currency. ': '. code2currency($cust_main->currency) %> + <% mt('Invoicing currency') |h %> + <% $cust_main->currency. ': '. code2currency($cust_main->currency) %> % } % if ( $cust_main->locale ) { % my %locale_info = FS::Locales->locale_info($cust_main->locale); - <% mt('Invoicing locale') |h %> - <% $locale_info{name} . " (" . $locale_info{country} .")" %> + <% mt('Invoicing locale') |h %> + <% $locale_info{name} . " (" . $locale_info{country} .")" %> % }