X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fbrowse%2Ftax_rate.cgi;h=cb997fada6842686e772e3c68b192e349a57c270;hb=69d3ce315e8d44adef35eb32f805ceaa9b91598c;hp=b401b3786b41f54d50d88c7b0610adfabb1f754e;hpb=4104f4e3d1b387296b16b4a035b4b7f42e0c5977;p=freeside.git
diff --git a/httemplate/browse/tax_rate.cgi b/httemplate/browse/tax_rate.cgi
index b401b3786..cb997fada 100755
--- a/httemplate/browse/tax_rate.cgi
+++ b/httemplate/browse/tax_rate.cgi
@@ -1,22 +1,21 @@
<% include( 'elements/browse.html',
- 'title' => "Tax Rates $title",
- 'name_singular' => 'tax rate',
- 'menubar' => \@menubar,
- 'html_init' => $html_init,
- 'query' => {
- 'table' => 'tax_rate',
- 'hashref' => $hashref,
- 'order_by' => 'ORDER BY geocode, taxclassnum',
- },
- 'count_query' => $count_query,
- 'header' => \@header,
- 'header2' => \@header2,
- 'fields' => \@fields,
- 'align' => $align,
- 'color' => \@color,
- 'cell_style' => \@cell_style,
- 'links' => \@links,
- 'link_onclicks' => \@link_onclicks,
+ 'title' => "Tax Rates $title",
+ 'name_singular' => 'tax rate',
+ 'menubar' => \@menubar,
+ 'html_init' => $html_init,
+ 'html_form' => $html_form,
+ 'disableable' => 1,
+ 'disabled_statuspos' => 5,
+ 'query' => $query,
+ 'count_query' => $count_query,
+ 'header' => \@header,
+ 'header2' => \@header2,
+ 'fields' => \@fields,
+ 'align' => $align,
+ 'color' => \@color,
+ 'cell_style' => \@cell_style,
+ 'links' => \@links,
+ 'link_onclicks' => \@link_onclicks,
)
%>
<%once>
@@ -24,21 +23,62 @@
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-my $exempt_sub = sub {
+my $rate_sub = sub {
my $tax_rate = shift;
- my @exempt = ();
- push @exempt,
- sprintf("$money_char%.2f per month", $tax_rate->exempt_amount )
- if $tax_rate->exempt_amount > 0;
+ my $units = $tax_rate->unittype_name;
+ $units =~ s/ / /g;
+
+ my @rate = ();
+ push @rate,
+ ($tax_rate->tax * 100). '% (edit)'
+ if $tax_rate->tax > 0 || $tax_rate->taxbase > 0;
+ push @rate,
+ ($tax_rate->excessrate * 100). '% (edit)'
+ if $tax_rate->excessrate > 0;
+ push @rate,
+ $money_char. $tax_rate->fee.
+ qq! per $units(edit)!
+ if $tax_rate->fee > 0 || $tax_rate->feebase > 0;
+ push @rate,
+ $money_char. $tax_rate->excessfee.
+ qq! per $units(edit)!
+ if $tax_rate->excessfee > 0;
+
+
+ [ map [ {'data'=>$_} ], @rate ];
+};
+
+my $limit_sub = sub {
+ my $tax_rate = shift;
- push @exempt, 'Setup fee'
+ my $maxtype = $tax_rate->maxtype_name;
+ $maxtype =~ s/ / /g;
+
+ my $units = $tax_rate->unittype_name;
+ $units =~ s/ / /g;
+
+ my @limit = ();
+ push @limit,
+ sprintf("$money_char%.2f %s", $tax_rate->taxbase, $maxtype )
+ if $tax_rate->taxbase > 0;
+ push @limit,
+ sprintf("$money_char%.2f tax", $tax_rate->taxmax )
+ if $tax_rate->taxmax > 0;
+ push @limit,
+ $tax_rate->feebase. " $units". ($tax_rate->feebase == 1 ? '' : 's')
+ if $tax_rate->feebase > 0;
+ push @limit,
+ $tax_rate->feemax. " $units". ($tax_rate->feebase == 1 ? '' : 's')
+ if $tax_rate->feemax > 0;
+
+ push @limit, 'Excluding setup fee'
if $tax_rate->setuptax =~ /^Y$/i;
- push @exempt, 'Recurring fee'
+ push @limit, 'Excluding recurring fee'
if $tax_rate->recurtax =~ /^Y$/i;
- [ map [ {'data'=>$_} ], @exempt ];
+ [ map [ {'data'=>$_} ], @limit ];
};
my $oldrow;
@@ -67,15 +107,7 @@ my $select_onclick = sub {
my $row = shift;
my $taxnum = $row->taxnum;
my $color = '#333399';
- qq!overlib( OLiframeContent('${p}edit/tax_rate.html?$taxnum', 540, 420, 'edit_tax_rate_popup' ), CAPTION, 'Edit tax rate', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;!;
-};
-
-my $separate_taxclasses_link = sub {
- my( $row ) = @_;
- my $taxnum = $row->taxnum;
- my $url = "${p}edit/process/tax_rate-expand.cgi?taxclassnum=1;taxnum=$taxnum";
-
- qq!!;
+ qq!overlib( OLiframeContent('${p}edit/tax_rate.html?$taxnum', 540, 620, 'edit_tax_rate_popup' ), CAPTION, 'Edit tax rate', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;!;
};
%once>
@@ -85,26 +117,19 @@ die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
my @menubar;
-
-my $html_init =
- "Click on geocodes to specify rates for a new area.";
-$html_init .= "
Click on separate taxclasses to specify taxes per taxclass.";
-$html_init .= '
';
-
-$html_init .= qq(
-
-
-
-
-);
-
my $title = '';
-my $select_word = 'edit';
+
+my $data_vendor = '';
+if ( $cgi->param('data_vendor') =~ /^(\w+)$/ ) {
+ $data_vendor = $1;
+ $title = "$data_vendor";
+}
+$cgi->delete('data_vendor');
my $geocode = '';
if ( $cgi->param('geocode') =~ /^(\w+)$/ ) {
$geocode = $1;
- $title = "$geocode";
+ $title = " geocode $geocode";
}
$cgi->delete('geocode');
@@ -123,6 +148,33 @@ if ( $cgi->param('taxclassnum') =~ /^(\d+)$/ ) {
}
$cgi->delete('taxclassnum');
+my $tax_type = $1
+ if ( $cgi->param('tax_type') =~ /^(\d+)$/ );
+my $tax_cat = $1
+ if ( $cgi->param('tax_cat') =~ /^(\d+)$/ );
+
+if ($tax_type || $tax_cat ) {
+ my $compare = "LIKE '". ( $tax_type || "%" ). ":". ( $tax_cat || "%" ). "'";
+ $compare = "= '$tax_type:$tax_cat'" if ($tax_type && $tax_cat);
+ my @tax_class =
+ qsearch({ 'table' => 'tax_class',
+ 'hashref' => {},
+ 'extra_sql' => "WHERE taxclass $compare",
+ });
+ if (@tax_class) {
+ $tax_class[0]->description =~ /^(.*):(.*)/;
+ $title .= " for";
+ $title .= " $tax_type ($1) tax type" if $tax_type;
+ $title .= " and" if ($tax_type && $tax_cat);
+ $title .= " $tax_cat ($2) tax category" if $tax_cat;
+ }else{
+ $tax_type = '';
+ $tax_cat = '';
+ }
+}
+$cgi->delete('tax_type');
+$cgi->delete('tax_cat');
+
if ( $geocode || $taxclassnum ) {
push @menubar, 'View all tax rates' => $p.'browse/tax_rate.cgi';
}
@@ -130,21 +182,28 @@ if ( $geocode || $taxclassnum ) {
$cgi->param('dummy', 1);
#restore this so pagination works
+$cgi->param('data_vendor', $data_vendor) if $data_vendor;
$cgi->param('geocode', $geocode) if $geocode;
$cgi->param('taxclassnum', $taxclassnum ) if $taxclassnum;
+$cgi->param('tax_type', $tax_type ) if $tax_type;
+$cgi->param('tax_cat', $tax_cat ) if $tax_cat;
+
+my $html_form = include('/elements/init_overlib.html'). '
'.
+ join(' ',
+ map {
+ include('/elements/popup_link.html',
+ {
+ 'action' => $p. "misc/enable_or_disable_tax.html?action=$_&".
+ $cgi->query_string,
+ 'label' => ucfirst($_). ' all these taxes',
+ 'actionlabel' => ucfirst($_). ' taxes',
+ },
+ );
+ }
+ qw(disable enable)
+ );
-my $hashref = {};
-my $count_query = 'SELECT COUNT(*) FROM tax_rate';
-if ( $geocode ) {
- $hashref->{'geocode'} = $geocode;
- $count_query .= ' WHERE geocode = '. dbh->quote($geocode);
-}
-if ( $taxclassnum ) {
- $hashref->{'taxclassnum'} = $taxclassnum;
- $count_query .= ( $count_query =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
- ' taxclassnum = '. dbh->quote($taxclassnum);
-}
-
+my ($query, $count_query) = FS::tax_rate::browse_queries(scalar($cgi->Vars));
$cell_style = '';
@@ -164,18 +223,15 @@ my @color = (
push @header, qq!Tax class (add new)!;
push @header2, '(per-tax classification)';
-push @fields, sub { $_[0]->taxclass_description || '(all) '.
- &{$separate_taxclasses_link}($_[0], 'Separate Taxclasses').
- 'separate taxclasses'
- };
-push @color, sub { shift->taxclass ? '000000' : '999999' };
+push @fields, 'taxclass_description';
+push @color, '000000';
push @links, '';
push @link_onclicks, '';
$align .= 'l';
push @header, 'Tax name',
'Rate', #'Tax',
- 'Exemptions',
+ 'Limits',
;
push @header2, '(printed on invoices)',
@@ -185,8 +241,8 @@ push @header2, '(printed on invoices)',
push @fields,
sub { shift->taxname || 'Tax' },
- sub { shift->tax. '% ('. $select_word. ')' },
- $exempt_sub,
+ $rate_sub,
+ $limit_sub,
;
push @color,
@@ -202,4 +258,91 @@ my @cell_style = map $cell_style_sub, (1..scalar(@header));
push @links, '', $select_link, '';
push @link_onclicks, '', $select_onclick, '';
+my $html_init = '';
+
+$html_init .= qq(
+
+
+
+
+
+);
+
+$html_init .= qq(
+