diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/part_fee.html | 71 | ||||
| -rw-r--r-- | httemplate/edit/credit-cust_bill_pkg.html | 3 | ||||
| -rw-r--r-- | httemplate/edit/part_fee.html | 141 | ||||
| -rw-r--r-- | httemplate/edit/process/part_fee.html | 20 | ||||
| -rw-r--r-- | httemplate/elements/menu.html | 4 | ||||
| -rw-r--r-- | httemplate/misc/xmlhttp-calculate_taxes.html | 9 | ||||
| -rw-r--r-- | httemplate/misc/xmlhttp-cust_bill_pkg-calculate_taxes.html | 15 | ||||
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 21 |
8 files changed, 257 insertions, 27 deletions
diff --git a/httemplate/browse/part_fee.html b/httemplate/browse/part_fee.html new file mode 100644 index 000000000..482c692d7 --- /dev/null +++ b/httemplate/browse/part_fee.html @@ -0,0 +1,71 @@ +<& elements/browse.html, + title => 'Fee definitions', + name_singular => 'fee definition', + query => $query, + count_query => $count_query, + header => [ '#', + 'Description', + 'Comment', + 'Class', + 'Amount', + 'Tax status', + ], + fields => [ 'feepart', + 'itemdesc', + 'comment', + 'classname', + $sub_amount, + $sub_tax, + ], + disableable => 1, + disabled_statuspos => 3, + agent_pos => 6, + agent_virt => 1, + agent_null_right=> 'Edit global fee definitions', + links => [ '', + $link, + $link, + ], + align => 'cllccc', + menubar => \@menubar, +&> +<%init> +my $curuser = $FS::CurrentUser::CurrentUser; +my $acl_edit = $curuser->access_right('Edit fee definitions'); +my $acl_edit_global = $curuser->access_right('Edit global fee definitions'); +die "access denied" + unless $acl_edit or $acl_edit_global; + +my $query = { + 'select' => 'part_fee.*,'. + '(select classname from pkg_class '. + 'where pkg_class.classnum = part_fee.classnum) AS classname', + 'table' => 'part_fee', +}; +my $count_query = "SELECT COUNT(*) FROM part_fee"; + +my $sub_amount = sub { + my $obj = shift; + my $string = $obj->explanation; + $string =~ s/\n/<br>/sg; + $string; +}; + +my $sub_tax = sub { + my $obj = shift; + if ( $obj->taxable ) { + return $obj->taxclass || 'taxable'; + } elsif ( $obj->taxproductnum ) { + return join('<br>', + split(/\s*:\s*/, $obj->part_pkg_taxproduct->description) + ); + } else { + return 'exempt'; + } +}; + +my $link = [ $p.'edit/part_fee.html?', 'feepart' ]; + +my @menubar = ( 'Add a new fee definition', + $p.'edit/part_fee.html' ); +</%init> diff --git a/httemplate/edit/credit-cust_bill_pkg.html b/httemplate/edit/credit-cust_bill_pkg.html index a5ecb69e3..40faddc46 100644 --- a/httemplate/edit/credit-cust_bill_pkg.html +++ b/httemplate/edit/credit-cust_bill_pkg.html @@ -269,7 +269,8 @@ my @cust_bill_pkg = qsearch({ 'select' => 'cust_bill_pkg.*', 'table' => 'cust_bill_pkg', 'addl_from' => 'LEFT JOIN cust_bill USING (invnum)', - 'extra_sql' => "WHERE custnum = $custnum AND pkgnum != 0", + 'extra_sql' => "WHERE custnum = $custnum ". + "AND (pkgnum != 0 or feepart IS NOT NULL)", 'order_by' => 'ORDER BY invnum ASC, billpkgnum ASC', }); diff --git a/httemplate/edit/part_fee.html b/httemplate/edit/part_fee.html new file mode 100644 index 000000000..dada23360 --- /dev/null +++ b/httemplate/edit/part_fee.html @@ -0,0 +1,141 @@ +<& elements/edit.html, + 'name_singular' => 'fee definition', + 'table' => 'part_fee', + 'labels' => { + 'feepart' => 'Fee definition', + 'itemdesc' => 'Description', + 'comment' => 'Comment (customer-hidden)', + 'classnum' => 'Package class', + 'taxable' => 'This fee is taxable', + 'disabled' => 'Disable this fee', + 'taxclass' => 'Tax class name', + 'taxproductnum' => 'Tax product', + 'pay_weight' => 'Payment weight', + 'credit_weight' => 'Credit weight', + 'agentnum' => 'Agent', + 'amount' => 'Flat fee amount', + 'percent' => 'Percentage of invoice amount', + 'basis' => 'Based on', + 'setuprecur' => 'Report this fee as', + 'minimum' => 'Minimum fee', + 'maximum' => 'Maximum fee', + 'limit_credit' => 'Limit to customer credit balance', + %locale_labels + }, + 'fields' => \@fields, + 'edit_callback' => $edit_callback, + 'error_callback' => $error_callback, +&> +<%init> +my $curuser = $FS::CurrentUser::CurrentUser; +my $acl_edit = $curuser->access_right('Edit fee definitions'); +my $acl_edit_global = $curuser->access_right('Edit global fee definitions'); +die "access denied" + unless $acl_edit or $acl_edit_global; + +my $conf = FS::Conf->new; +my @tax_fields; +if ( $conf->exists('enable_taxproducts') ) { + @tax_fields = ( + { field => 'taxproductnum', type => 'select-taxproduct' } + ); +} else { + @tax_fields = ( + { field => 'taxable', type => 'checkbox', value => 'Y' }, + ); + push ( + { field => 'taxclass', type => 'select-taxclass' }, + ) if $conf->exists('enable_taxclasses'); +} + +my $default_locale = $conf->config('locale') || 'en_US'; +my @locales = grep {$_ ne $default_locale} $conf->config('available-locales'); +# duplicates edit/part_pkg.cgi, yuck +my $n = 0; +my (@locale_fields, %locale_labels); +foreach (@locales) { + push @locale_fields, + { field => 'feepartmsgnum'. $n, type => 'hidden' }, + { field => 'feepartmsgnum'. $n. '_locale', type => 'hidden' }, + { field => 'feepartmsgnum'. $n. '_itemdesc', type => 'text', size => 40 }, + ; + $locale_labels{ 'feepartmsgnum'.$n.'_itemdesc' } = + 'Description—' . FS::Locales->description($_); + $n++; +} + +my @fields = ( + + { field => 'itemdesc', type => 'text', size => 40, }, + @locale_fields, + + { field => 'comment', type => 'text', size => 40, }, + + { field => 'agentnum', + type => 'select-agent', + disable_empty => !$acl_edit_global, + empty_label => '(global)', + }, + + { field => 'classnum', + type => 'select-pkg_class', + }, + + { field => 'disabled', + type => 'checkbox', + value => 'Y', + }, + + { field => 'setuprecur', + type => 'select', + options => [ 'setup', 'recur' ], + labels => { 'setup' => 'a setup fee', + 'recur' => 'a recurring charge' }, + }, + + { type => 'justtitle', value => 'Fee calculation' }, + { field => 'amount', type => 'money', }, + { field => 'percent', type => 'percentage', }, + + { field => 'basis', + type => 'select', + options => [ 'charged', 'owed' ], + labels => { 'charged' => 'amount charged', + 'owed' => 'balance due', }, + }, + + { field => 'minimum', type => 'money', }, + { field => 'maximum', type => 'money', }, + { field => 'limit_credit', + type => 'checkbox', + value => 'Y' }, + + { type => 'justtitle', value => 'Taxation' }, + + @tax_fields, +); + +my $edit_callback = sub { + my ($cgi, $obj, $fields, $opt) = @_; + my %existing_locales; + if ( $obj->feepart ) { + %existing_locales = map { $_->locale => $_ } $obj->part_fee_msgcat; + } + my $n = 0; + foreach (@locales) { + $obj->set('feepartmsgnum'.$n.'_locale', $_); + # load the existing itemdescs + if ( my $msgcat = $existing_locales{$_} ) { + $obj->set('feepartmsgnum'.$n, $msgcat->feepartmsgnum); + $obj->set('feepartmsgnum'.$n.'_itemdesc', $msgcat->itemdesc); + } + # then override that with the CGI param if there is one + if ( my $itemdesc = $cgi->param('feepartmsgnum'.$n.'_itemdesc') ) { + $obj->set('feepartmsgnum'.$n.'_itemdesc', $itemdesc); + } + $n++; + } +}; + +my $error_callback = $edit_callback; +</%init> diff --git a/httemplate/edit/process/part_fee.html b/httemplate/edit/process/part_fee.html new file mode 100644 index 000000000..25656e9b0 --- /dev/null +++ b/httemplate/edit/process/part_fee.html @@ -0,0 +1,20 @@ +<& elements/process.html, + 'debug' => 1, + 'table' => 'part_fee', + 'agent_virt' => 1, + 'agent_null_right' => 'Edit global fee definitions', + 'viewall_dir' => 'browse', + 'process_o2m' => { + 'table' => 'part_fee_msgcat', + 'fields' => [ 'locale', 'itemdesc' ], + }, +&> +<%init> + +my $curuser = $FS::CurrentUser::CurrentUser; +my $acl_edit = $curuser->access_right('Edit fee definitions'); +my $acl_edit_global = $curuser->access_right('Edit global fee definitions'); +die "access denied" + unless $acl_edit or $acl_edit_global; + +</%init> diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index cfc262ee5..9f1e105db 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -572,6 +572,10 @@ if ( $curuser->access_right('Configuration') ) { $config_pkg{'Package report classes'} = [ $fsurl.'browse/part_pkg_report_option.html', 'Package classes define optional groups of packages for reporting only.' ]; #eo package grouping sub-menu + if ( $curuser->access_right([ 'Edit fee definitions', + 'Edit global fee definitions' ]) ) { + $config_pkg{'Fees'} = [ $fsurl.'browse/part_fee.html', '' ]; + } $config_pkg{'Discounts'} = [ $fsurl.'browse/discount.html', '' ]; $config_pkg{'Discount classes'} = [ $fsurl.'browse/discount_class.html', '' ]; $config_pkg{'Cancel/Suspend Reasons'} = [ \%config_pkg_reason, '' ]; diff --git a/httemplate/misc/xmlhttp-calculate_taxes.html b/httemplate/misc/xmlhttp-calculate_taxes.html index ed7bd0173..2bb1f4cce 100644 --- a/httemplate/misc/xmlhttp-calculate_taxes.html +++ b/httemplate/misc/xmlhttp-calculate_taxes.html @@ -62,14 +62,7 @@ if ( $sub eq 'calculate_taxes' ) { my $taxlisthash = {}; foreach my $cust_bill_pkg (values %cust_bill_pkg) { - my $part_pkg = $cust_bill_pkg->part_pkg; - $cust_main->_handle_taxes( $part_pkg, - $taxlisthash, - $cust_bill_pkg, - $cust_bill_pkg->cust_pkg, - $cust_bill_pkg->cust_bill->_date, - $cust_bill_pkg->cust_pkg->pkgpart, - ); + $cust_main->_handle_taxes( $taxlisthash, $cust_bill_pkg ); } my $listref_or_error = $cust_main->calculate_taxes( [ values %cust_bill_pkg ], $taxlisthash, [ values %cust_bill_pkg ]->[0]->cust_bill->_date ); diff --git a/httemplate/misc/xmlhttp-cust_bill_pkg-calculate_taxes.html b/httemplate/misc/xmlhttp-cust_bill_pkg-calculate_taxes.html index c0db3e2c4..4558682bd 100644 --- a/httemplate/misc/xmlhttp-cust_bill_pkg-calculate_taxes.html +++ b/httemplate/misc/xmlhttp-cust_bill_pkg-calculate_taxes.html @@ -62,15 +62,7 @@ if ( $sub eq 'calculate_taxes' ) { push @cust_bill_pkg, $cust_bill_pkg; - my $part_pkg = $cust_bill_pkg->part_pkg; - $cust_main->_handle_taxes( $part_pkg, - $taxlisthash, - $cust_bill_pkg, - $cust_bill_pkg->cust_pkg, - $cust_bill_pkg->cust_bill->_date, - $cust_bill_pkg->cust_pkg->pkgpart, - ); - + $cust_main->_handle_taxes( $taxlisthash, $cust_bill_pkg ); } if ( @cust_bill_pkg ) { @@ -89,7 +81,10 @@ if ( $sub eq 'calculate_taxes' ) { foreach my $taxline ( @$listref_or_error ) { my $amount = $taxline->setup; my $desc = $taxline->desc; - foreach my $location ( @{$taxline->cust_bill_pkg_tax_location}, @{$taxline->cust_bill_pkg_tax_rate_location} ) { + foreach my $location ( + @{$taxline->get('cust_bill_pkg_tax_location')}, + @{$taxline->get('cust_bill_pkg_tax_rate_location')} ) + { my $taxlocnum = $location->locationnum || ''; my $taxratelocnum = $location->taxratelocationnum || ''; $location->cust_bill_pkg_desc($taxline->desc); #ugh @ that kludge diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 0b6147170..ccc00460a 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -130,9 +130,9 @@ Filtering parameters: - use_override: Apply "classnum" and "taxclass" filtering based on the override (bundle) pkgpart, rather than always using the true pkgpart. -- nottax: Limit to items that are not taxes (pkgnum > 0). +- nottax: Limit to items that are not taxes (pkgnum > 0 or feepart > 0). -- istax: Limit to items that are taxes (pkgnum == 0). +- istax: Limit to items that are taxes (pkgnum == 0 and feepart = null). - taxnum: Limit to items whose tax definition matches this taxnum. With "nottax" that means items that are subject to that tax; @@ -281,7 +281,8 @@ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) { # we want the package and its definition if available my $join_pkg = ' LEFT JOIN cust_pkg USING (pkgnum) - LEFT JOIN part_pkg USING (pkgpart)'; + LEFT JOIN part_pkg USING (pkgpart) + LEFT JOIN part_fee USING (feepart)'; my $part_pkg = 'part_pkg'; # "Separate sub-packages from parents" @@ -295,12 +296,16 @@ if ( $use_override ) { $part_pkg = 'override'; } push @select, "$part_pkg.pkgpart", "$part_pkg.pkg"; -push @select, "$part_pkg.taxclass" if $conf->exists('enable_taxclasses'); +push @select, "COALESCE($part_pkg.taxclass, part_fee.taxclass) AS taxclass" + if $conf->exists('enable_taxclasses'); # the non-tax case if ( $cgi->param('nottax') ) { - push @where, 'cust_bill_pkg.pkgnum > 0'; + push @select, "part_fee.itemdesc"; + + push @where, + '(cust_bill_pkg.pkgnum > 0 OR cust_bill_pkg.feepart IS NOT NULL)'; my @tax_where; # will go into a subquery my @exempt_where; # will also go into a subquery @@ -311,7 +316,7 @@ if ( $cgi->param('nottax') ) { # N: classnum if ( grep { $_ eq 'classnum' } $cgi->param ) { my @classnums = grep /^\d+$/, $cgi->param('classnum'); - push @where, "COALESCE($part_pkg.classnum, 0) IN ( ". + push @where, "COALESCE(part_fee.classnum, $part_pkg.classnum, 0) IN ( ". join(',', @classnums ). ' )' if @classnums; @@ -336,7 +341,7 @@ if ( $cgi->param('nottax') ) { # effective taxclass, not the real one push @tax_where, 'cust_main_county.taxclass IS NULL' } elsif ( $cgi->param('taxclass') ) { - push @tax_where, "$part_pkg.taxclass IN (" . + push @tax_where, "COALESCE(part_fee.taxclass, $part_pkg.taxclass) IN (" . join(', ', map {dbh->quote($_)} $cgi->param('taxclass') ). ')'; } @@ -678,7 +683,7 @@ if ( $cgi->param('salesnum') =~ /^(\d+)$/ ) { 'paid' => ($cgi->param('paid') ? 1 : 0), 'classnum' => scalar($cgi->param('classnum')) ); - $join_pkg .= " JOIN sales_pkg_class ON ( COALESCE(sales_pkg_class.classnum, 0) = COALESCE( part_pkg.classnum, 0) )"; + $join_pkg .= " JOIN sales_pkg_class ON ( COALESCE(sales_pkg_class.classnum, 0) = COALESCE( part_fee.classnum, part_pkg.classnum, 0) )"; my $extra_sql = $subsearch->{extra_sql}; $extra_sql =~ s/^WHERE//; |