X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_pkg.cgi;h=91fe4e028e0eaa416a84b52f7f0dad60aa00fe58;hb=f539cfd607d3812b189e3473a15d4f55bb91844c;hp=67f618cdbd6c00cb322ac1e337775a7ba7af5122;hpb=bee4494248009b7b998391bc68c5d10a31220057;p=freeside.git diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 67f618cdb..91fe4e028 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -106,11 +106,7 @@ Output control parameters: range of the report. Line items will be limited to those for which this portion is > 0. This disables filtering on invoice date. -- usage: Separate usage (cust_bill_pkg_detail records) from - recurring charges. If set to "usage", will show usage instead of - recurring charges. If set to "recurring", will deduct usage and only - show the flat rate charge. If not passed, the "recurring charge" column - will include usage charges also. +- charges: 'S'etup, 'R'ecur, 'U'sage, or any string combination of those. Filtering parameters: - begin, end: Date range. Applies to invoice date, not necessarily package @@ -201,7 +197,7 @@ my @total = ( 'COUNT(*)', 'SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)'); my @total_desc = ( $money_char.'%.2f total' ); # sprintf strings my @peritem = ( 'setup', 'recur' ); -my @peritem_desc = ( 'Setup charge', 'Recurring charge' ); +my @peritem_desc = ( 'Setup charges', 'Recurring charges' ); my @currency_desc = (); my @currency_sub = (); @@ -338,7 +334,7 @@ if ( $cgi->param('nottax') ) { # 0: empty class # N: classnum if ( grep { $_ eq 'classnum' } $cgi->param ) { - my @classnums = grep /^\d*$/, $cgi->param('classnum'); + my @classnums = grep /^\d+$/, $cgi->param('classnum'); push @where, "COALESCE(part_fee.classnum, $part_pkg.classnum, 0) IN ( ". join(',', @classnums ). ' )' @@ -422,7 +418,8 @@ if ( $cgi->param('nottax') ) { # If we're showing 'out' (items that aren't region/class taxable), # then we need the set of all items minus the union of those. - + # Always exclude cust_tax_exempt_pkg records with non-NULL creditbillpkgnum. + if ( $cgi->param('out') ) { # separate from the rest, in that we're not going to join cust_main_county # in the outer query @@ -447,74 +444,101 @@ if ( $cgi->param('nottax') ) { } else { # everything that returns things joined to a tax definition - my $exempt_sub; if ( @exempt_where or @tax_where or $cgi->param('taxable') ) { + push @exempt_where, "cust_tax_exempt_pkg.creditbillpkgnum IS NULL"; + # process exemption restrictions, including @tax_where my $exempt_sub = 'SELECT SUM(amount) as exempt_amount, billpkgnum FROM cust_tax_exempt_pkg JOIN cust_main_county USING (taxnum)'; - $exempt_sub .= ' WHERE '.join(' AND ', @tax_where, @exempt_where) - if (@tax_where or @exempt_where); + $exempt_sub .= ' WHERE '.join(' AND ', @tax_where, @exempt_where); $exempt_sub .= ' GROUP BY billpkgnum'; $join_pkg .= " LEFT JOIN ($exempt_sub) AS item_exempt - USING (billpkgnum)"; + ON (cust_bill_pkg.billpkgnum = item_exempt.billpkgnum)"; + + } + + my $credit_sub = 'SELECT SUM(amount) AS credit_amount, billpkgnum + FROM cust_credit_bill_pkg GROUP BY billpkgnum'; + + $join_pkg .= " LEFT JOIN ($credit_sub) AS item_credit + ON (cust_bill_pkg.billpkgnum = item_credit.billpkgnum)"; + if ( @tax_where or $cgi->param('taxable') ) { # process tax restrictions unshift @tax_where, - 'cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum', 'cust_main_county.tax > 0'; - } - my $tax_sub = "SELECT 1 + my $tax_sub = "SELECT taxable_billpkgnum FROM cust_bill_pkg_tax_location - JOIN cust_bill_pkg AS tax_item USING (billpkgnum) JOIN cust_main_county USING (taxnum) - WHERE ". join(' AND ', @tax_where); - - # now do something with that - if ( @exempt_where ) { - - push @where, 'item_exempt.billpkgnum IS NOT NULL'; - push @select, 'item_exempt.exempt_amount'; - push @peritem, 'exempt_amount'; - push @peritem_desc, 'Exempt'; - push @total, 'SUM(exempt_amount)'; - push @total_desc, "$money_char%.2f tax-exempt"; + WHERE ". join(' AND ', @tax_where). + " GROUP BY taxable_billpkgnum"; - } elsif ( $cgi->param('taxable') ) { + $join_pkg .= " LEFT JOIN ($tax_sub) AS item_tax + ON (cust_bill_pkg.billpkgnum = item_tax.taxable_billpkgnum)" + } + # now do something with that + if ( $cgi->param('taxable') ) { + # taxable query: needs sale amount - exempt amount my $taxable = 'cust_bill_pkg.setup + cust_bill_pkg.recur '. '- COALESCE(item_exempt.exempt_amount, 0)'; + push @where, "item_tax.taxable_billpkgnum IS NOT NULL"; push @select, "($taxable) AS taxable_amount"; - push @where, "EXISTS($tax_sub)"; push @peritem, 'taxable_amount'; push @peritem_desc, 'Taxable'; push @total, "SUM($taxable)"; push @total_desc, "$money_char%.2f taxable"; - } elsif ( @tax_where ) { + } elsif ( $cgi->param('exempt_cust') or $cgi->param('exempt_pkg') ) { + + push @where, 'item_exempt.billpkgnum IS NOT NULL'; + push @select, 'item_exempt.exempt_amount'; + push @peritem, 'exempt_amount'; + push @peritem_desc, 'Exempt'; + push @total, 'SUM(exempt_amount)'; + push @total_desc, "$money_char%.2f tax-exempt"; + } elsif ( @tax_where ) { # union of taxable + all exempt_ cases - push @where, "(EXISTS($tax_sub) OR item_exempt.billpkgnum IS NOT NULL)"; + push @where, + '(item_tax.taxable_billpkgnum IS NOT NULL OR item_exempt.billpkgnum IS NOT NULL)'; } } # handle all joins to cust_main_county - # recur/usage separation - if ( $cgi->param('usage') eq 'recurring' ) { + # setup/recur/usage separation + my %charges = map { $_ => 1 } split('', $cgi->param('charges') || 'SRU'); + + if ( $charges{R} and $charges{U} ) { + + # default, don't change @peritem or @total + if ( !$charges{S} ) { + push @where, 'cust_bill_pkg.recur > 0'; + $total[1] = "SUM(cust_bill_pkg.recur)"; + $total_desc[0] = "$money_char%.2f recurring"; + } + + } elsif ( $charges{R} and !$charges{U} ) { - my $recur_no_usage = FS::cust_bill_pkg->charged_sql('', '', no_usage => 1); + my $recur_no_usage = FS::cust_bill_pkg->charged_sql('', '', + setuprecur => 'recur', no_usage => 1); push @select, "($recur_no_usage) AS recur_no_usage"; $peritem[1] = 'recur_no_usage'; - $total[1] = "SUM(cust_bill_pkg.setup + $recur_no_usage)"; - $total_desc[0] .= ' (excluding usage)'; + $peritem_desc[1] = 'Recurring charges (excluding usage)'; + $total[1] = "SUM($recur_no_usage)"; + $total_desc[0] = "$money_char%.2f recurring"; + if ( !$charges{S} ) { + push @where, "($recur_no_usage) > 0"; + } - } elsif ( $cgi->param('usage') eq 'usage' ) { + } elsif ( !$charges{R} and $charges{U} ) { my $usage = FS::cust_bill_pkg->usage_sql(); push @select, "($usage) AS _usage"; @@ -522,8 +546,18 @@ if ( $cgi->param('nottax') ) { $peritem[1] = '_usage'; $peritem_desc[1] = 'Usage charge'; $total[1] = "SUM($usage)"; - $total_desc[0] .= ' usage charges'; - } + $total_desc[0] = "$money_char%.2f usage charges"; + if ( !$charges{S} ) { + push @where, "($usage) > 0"; + } + + } elsif ( $charges{S} ) { + + push @where, "cust_bill_pkg.setup > 0"; + $total[1] = "SUM(cust_bill_pkg.setup)"; + $total_desc[0] = "$money_char%.2f setup"; + + } # else huh? you have to have SOME charges } elsif ( $cgi->param('istax') ) { @@ -605,6 +639,18 @@ if ( $cgi->param('nottax') ) { } #end of "normal case" + # classnum (of underlying package) + # not specified: all classes + # 0: empty class + # N: classnum + if ( grep { $_ eq 'classnum' } $cgi->param ) { + my @classnums = grep /^\d+$/, $cgi->param('classnum'); + push @where, "COALESCE(part_fee.classnum, $part_pkg.classnum, 0) IN ( ". + join(',', @classnums ). + ' )' + if @classnums; + } + } # nottax / istax