'link_onclicks' => \@link_onclicks,
)
%>
-%
-% # <FONT SIZE=-1><A HREF="<% $p %>edit/process/cust_main_county-collapse.cgi?<% $hashref->{taxnum} %>">collapse state</A></FONT>
-% # % }
-%
<%once>
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-my @manual_countries = ( 'US', 'CA', 'AU', 'NZ', 'GB' ); #some manual ordering
-my @all_countries = ( @manual_countries,
- grep { my $c = $_; ! grep { $c eq $_ } @manual_countries }
- map { $_->country }
- qsearch({
- 'select' => 'country',
- 'table' => 'cust_main_county',
- 'hashref' => {},
- 'extra_sql' => 'GROUP BY country',
- })
- );
-
my $exempt_sub = sub {
my $cust_main_county = shift;
'</FONT>';
}
+sub collapse_link {
+ my %param = @_;
+
+ my $taxnum = $param{'row'}->taxnum;
+ my $url = "${p}edit/process/cust_main_county-collapse.cgi?$taxnum";
+ $url = "javascript:collapse_areyousure('$url')";
+
+ qq(<FONT SIZE="-1"><A HREF="$url">$param{'label'}</A></FONT>);
+}
+
+
sub separate_taxclasses_link {
my( $row ) = @_;
my $taxnum = $row->taxnum;
qq!<FONT SIZE="-1"><A HREF="$url">!;
}
+#un-separate taxclasses too
+
</%once>
<%init>
my @menubar;
-my $html_init =
- "Click on <u>add states</u> to specify a country's tax rates by state or province.
- <BR>Click on <u>add counties</u> to specify a state's tax rates by county.";
+my $html_init = <<END;
+ <SCRIPT>
+ function collapse_areyousure(href) {
+ if (confirm("Are you sure you want to remove all county tax rates for this state?") == true)
+ window.location.href = href;
+ }
+ </SCRIPT>
+
+ Click on <u>add states</u> to specify a country's tax rates by state or province.
+ <BR>Click on <u>add counties</u> to specify a state's tax rates by county, or <u>remove counties</u> to remove per-county tax rates.
+END
+
$html_init .= "<BR>Click on <u>separate taxclasses</u> to specify taxes per taxclass."
if $enable_taxclasses;
$html_init .= '<BR><BR>';
$cgi->delete('country');
my $state = '';
-if ( $cgi->param('state') =~ /^([\w \-\'\[\]]+)$/ ) {
+if ( $country && $cgi->param('state') =~ /^([\w \-\'\[\]]+)$/ ) {
$state = $1;
$title = "$state, $title";
}
$cgi->delete('state');
my $county = '';
-if ( $cgi->param('county') =~ /^([\w \-\'\[\]]+)$/ ) {
+if ( $country && $state &&
+ $cgi->param('county') =~
+ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)$/
+ )
+{
$county = $1;
- $title = "$county county, $title";
+ if ( $county eq '__NONE__' ) {
+ $title = "No county, $title";
+ } else {
+ $title = "$county county, $title";
+ }
}
$cgi->delete('county');
$cgi->param('dummy', 1);
-my $country_filter_change =
- "window.location = '".
- $cgi->self_url. ";country=' + this.options[this.selectedIndex].value;";
+my $filter_change =
+ "window.location = '". $cgi->self_url.
+ ";country=' + encodeURIComponent( document.getElementById('country').options[document.getElementById('country').selectedIndex].value ) + ".
+ "';state=' + encodeURIComponent( document.getElementById('state').options[document.getElementById('state').selectedIndex].value ) +".
+ "';county=' + encodeURIComponent( document.getElementById('county').options[document.getElementById('county').selectedIndex].value );";
#restore this so pagination works
$cgi->param('country', $country) if $country;
$cgi->param('taxclass', $county ) if $taxclass;
my $html_posttotal =
- '(show country: '.
- qq(<SELECT NAME="country" onChange="$country_filter_change">).
- qq(<OPTION VALUE="">(all)\n).
- join("\n", map qq[<OPTION VALUE="$_"].
- ( $_ eq $country ? 'SELECTED' : '' ).
- '>'. code2country($_). " ($_)",
- @all_countries
- ).
- '</SELECT>)';
+ '<BR>( show country: '.
+ include('/elements/select-country.html',
+ 'country' => $country,
+ 'onchange' => $filter_change,
+ 'empty_label' => '(all)',
+ 'disable_empty' => 0,
+ 'disable_stateupdate' => 1,
+ );
+
+my %states_hash = $country ? states_hash($country) : ();
+if ( scalar(keys(%states_hash)) > 1 ) {
+ $html_posttotal .=
+ ' show state: '.
+ include('/elements/select-state.html',
+ 'country' => $country,
+ 'state' => $state,
+ 'onchange' => $filter_change,
+ 'empty_label' => '(all)',
+ 'disable_empty' => 0,
+ 'disable_countyupdate' => 1,
+ );
+} else {
+ $html_posttotal .=
+ '<SELECT NAME="state" ID="state" STYLE="display:none">'.
+ ' <OPTION VALUE="" SELECTED>'.
+ '</SELECT>';
+}
+
+my @counties = ( $country && $state ) ? counties($state, $country) : ();
+if ( scalar(@counties) > 1 ) {
+ $html_posttotal .=
+ ' show county: '.
+ include('/elements/select-county.html',
+ 'country' => $country,
+ 'state' => $state,
+ 'county' => $county,
+ 'onchange' => $filter_change,
+ 'empty_label' => '(all)',
+ 'empty_data_label' => '(none)',
+ 'empty_data_value' => '__NONE__',
+ 'disable_empty' => 0,
+ 'disable_countyupdate' => 1,
+ );
+} else {
+ $html_posttotal .=
+ '<SELECT NAME="county" ID="county" STYLE="display:none">'.
+ ' <OPTION VALUE="" SELECTED>'.
+ '</SELECT>';
+}
+
+$html_posttotal .= ' )';
my $bulk_popup_link =
include( '/elements/popup_link_onclick.html',
- 'action' => "${p}edit/bulk_cust_main_county.html?MAGIC_taxnum_MAGIC",
+ 'action' => "${p}edit/bulk-cust_main_county.html?MAGIC_taxnum_MAGIC",
'actionlabel' => 'Bulk add new tax',
'nofalse' => 1,
'height' => 420,
}
if ( $state ) {
$hashref->{'state'} = $state;
- $count_query .= ' AND state = '. dbh->quote($state);
+ $count_query .= ' AND state = '. dbh->quote($state);
}
if ( $county ) {
- $hashref->{'country'} = $country;
- $count_query .= ' AND county = '. dbh->quote($county);
+ if ( $county eq '__NONE__' ) {
+ $hashref->{'county'} = '';
+ $count_query .= " AND ( county = '' OR county IS NULL ) ";
+ } else {
+ $hashref->{'county'} = $county;
+ $count_query .= ' AND county = '. dbh->quote($county);
+ }
}
if ( $taxclass ) {
$hashref->{'taxclass'} = $taxclass;
)
)
},
- sub { $_[0]->county || '(all) '.
- expand_link( desc => 'Add Counties',
- row => $_[0],
- label => 'add counties',
- )
+ sub { $_[0]->county
+ ? $_[0]->county. ' '.
+ collapse_link( label=> 'remove counties',
+ row => $_[0],
+ )
+ : '(all) '.
+ expand_link( desc => 'Add Counties',
+ row => $_[0],
+ label => 'add counties',
+ );
},
);