X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fcust_main_county.cgi;h=58ae5501b209a2adc098b260997a06ae6bd736aa;hb=9390236b83a34eec816ce73e155517339806187a;hp=1e969aa8f53310b30bd7e704b3c76180e58b0b46;hpb=1e98f77fc7f64c40f4541acd2719bc229569dec1;p=freeside.git
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 1e969aa8f..58ae5501b 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -10,7 +10,7 @@
'table' => 'cust_main_county',
'hashref' => $hashref,
'order_by' =>
- 'ORDER BY country, state, county, taxclass',
+ 'ORDER BY country, state, county, city, taxclass',
},
'count_query' => $count_query,
'header' => \@header,
@@ -23,27 +23,11 @@
'link_onclicks' => \@link_onclicks,
)
%>
-%
-% # collapse state
-% # % }
-%
<%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;
@@ -61,22 +45,24 @@ my $exempt_sub = sub {
[ map [ {'data'=>$_} ], @exempt ];
};
-my $oldrow;
+my $cs_oldrow;
my $cell_style;
my $cell_style_sub = sub {
my $row = shift;
- if ( $oldrow ne $row ) {
- if ( $oldrow ) {
- if ( $oldrow->country ne $row->country ) {
- $cell_style = 'border-top:1px solid #000000';
- } elsif ( $oldrow->state ne $row->state ) {
- $cell_style = 'border-top:1px solid #cccccc'; #default?
- } elsif ( $oldrow->state eq $row->state ) {
+ if ( $cs_oldrow ne $row ) {
+ if ( $cs_oldrow ) {
+ if ( $cs_oldrow->country ne $row->country ) {
+ $cell_style = 'border-top:2px solid #000000';
+ } elsif ( $cs_oldrow->state ne $row->state ) {
+ #$cell_style = 'border-top:1px solid #cccccc'; #default?
+ $cell_style = 'border-top:1px solid #bbbbbb';
+ } elsif ( $cs_oldrow->state eq $row->state ) {
#$cell_style = 'border-top:dashed 1px dark gray';
- $cell_style = 'border-top:1px dashed #cccccc';
+ #$cell_style = 'border-top:1px dashed #cccccc';
+ $cell_style = '';
}
}
- $oldrow = $row;
+ $cs_oldrow = $row;
}
return $cell_style;
};
@@ -96,9 +82,16 @@ my $edit_onclick = sub {
);
};
+my $ex_oldrow;
sub expand_link {
my %param = @_;
+ if ( $ex_oldrow eq $param{'row'} ) {
+ return '';
+ } else {
+ $ex_oldrow = $param{'row'};
+ }
+
my $taxnum = $param{'row'}->taxnum;
my $url = "${p}edit/cust_main_county-expand.cgi?$taxnum";
@@ -114,6 +107,86 @@ sub expand_link {
'';
}
+sub add_link {
+ my %param = @_;
+
+ #if ( $ex_oldrow eq $param{'row'} ) {
+ # return '';
+ #} else {
+ # $ex_oldrow = $param{'row'};
+ #}
+
+ my %below = ( 'county' => 'city',
+ 'state' => 'county',
+ );
+ my $what = $below{ $param{'col' } };
+
+ my $taxnum = $param{'row'}->taxnum;
+ my $url = "${p}edit/cust_main_county-add.cgi?taxnum=$taxnum;what=$what";
+
+ ''.
+ include( '/elements/popup_link.html',
+ 'label' => $param{'label'},
+ 'action' => $url,
+ 'actionlabel' => $param{'desc'},
+ 'height' => 420,
+ #default# 'width' => 540,
+ #default# 'color' => '#333399',
+ ).
+ '';
+}
+
+sub collapse_link {
+ my %param = @_;
+
+ my $row = $param{'row'};
+ my $col = $param{'col'};
+# return ''
+# if $col eq 'state' and $row->city
+# || qsearch({
+# 'table' => 'cust_main_county',
+# 'hashref' => {
+# 'country' => $row->country,
+# 'state' => $row->state,
+# 'city' => { op=>'!=', value=>'' },
+# },
+# 'order_by' => 'LIMIT 1',
+# });
+
+ my %below = ( 'county' => 'city',
+ 'state' => 'county',
+ );
+
+ #XXX can still show the link when you have some counties broken down into
+ #cities and others not :/
+
+ my $taxnum = $param{'row'}->taxnum;
+ my $url = "${p}edit/process/cust_main_county-collapse.cgi?taxnum=$taxnum;".
+ 'country='. uri_escape($cgi->param('country')). ';'.
+ 'state='. uri_escape($cgi->param('state')). ';'.
+ 'county='. uri_escape($cgi->param('county'));
+ $url = "javascript:collapse_areyousure('$url', '$below{$col}', '$col')";
+
+ qq($param{'label'});
+}
+
+sub remove_link {
+ my %param = @_;
+
+ my $row = $param{'row'};
+ my $col = $param{'col'};
+
+ my $taxnum = $param{'row'}->taxnum;
+ my $url = "${p}edit/process/cust_main_county-remove.cgi?taxnum=$taxnum;".
+ 'country='. uri_escape($cgi->param('country')). ';'.
+ 'state='. uri_escape($cgi->param('state')). ';'.
+ 'county='. uri_escape($cgi->param('county'));
+ $url = "javascript:remove_areyousure('$url', '$col')";
+
+ qq($param{'label'});
+
+}
+
sub separate_taxclasses_link {
my( $row ) = @_;
my $taxnum = $row->taxnum;
@@ -122,6 +195,8 @@ sub separate_taxclasses_link {
qq!!;
}
+#un-separate taxclasses too
+
%once>
<%init>
@@ -134,9 +209,19 @@ my $enable_taxclasses = $conf->exists('enable_taxclasses');
my @menubar;
-my $html_init =
- "Click on add states to specify a country's tax rates by state or province.
-
Click on add counties to specify a state's tax rates by county.";
+my $html_init = <
+ function collapse_areyousure(href,col,above) {
+ if (confirm('Are you sure you want to remove all ' + col + ' tax rates for this ' + above + '?') == true)
+ window.location.href = href;
+ }
+ function remove_areyousure(href,col) {
+ if (confirm('Are you sure you want to remove this ' + col + '?') == true)
+ window.location.href = href;
+ }
+
+END
+
$html_init .= "
Click on separate taxclasses to specify taxes per taxclass."
if $enable_taxclasses;
$html_init .= '
';
@@ -153,16 +238,24 @@ if ( $cgi->param('country') =~ /^(\w\w)$/ ) {
$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');
@@ -181,9 +274,11 @@ if ( $country || $taxclass ) {
$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;
@@ -192,19 +287,61 @@ $cgi->param('county', $county ) if $county;
$cgi->param('taxclass', $county ) if $taxclass;
my $html_posttotal =
- '(show country: '.
- qq()';
+ '
( 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 .=
+ '';
+}
+
+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_cityupdate' => 1,
+ );
+} else {
+ $html_posttotal .=
+ '';
+}
+
+$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?taxnum=MAGIC_taxnum_MAGIC",
'actionlabel' => 'Bulk add new tax',
'nofalse' => 1,
'height' => 420,
@@ -237,7 +374,7 @@ my $html_foot = < 1920 ) { // IE 2083 URL limit
alert('Too many selections'); // should do some session thing...
return false;
@@ -269,7 +407,9 @@ my $html_foot = <unselect all |
toggle all
-Add new tax to selected
+Add new tax to selected
+|
+Bulk edit selected
END
@@ -281,11 +421,16 @@ if ( $country ) {
}
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;
@@ -296,30 +441,104 @@ if ( $taxclass ) {
$cell_style = '';
-my @header = ( 'Country', 'State/Province', 'County',);
-my @header2 = ( '', '', '', );
-my @links = ( '', '', '', );
-my @link_onclicks = ( '', '', '', );
-my $align = 'lll';
+my @header = ( 'Country', 'State/Province', 'County', 'City' );
+my @header2 = ( '', '', '', '', );
+my @links = ( '', '', '', '', );
+my @link_onclicks = ( '', '', '', '', );
+my $align = 'llll';
+
+my %seen_country = ();
+my %seen_state = ();
+my %seen_county = ();
my @fields = (
sub { my $country = shift->country;
- code2country($country). " ($country)";
+ return '' if $seen_country{$country}++;
+ code2country($country). " ($country)";
},
- sub { state_label($_[0]->state, $_[0]->country).
- ( $_[0]->state
- ? ''
- : ' '. expand_link( desc => 'Add States',
- row => $_[0],
- label => 'add states',
- )
- )
+
+ sub { my $label = $seen_state{$_[0]->country}->{$_[0]->state}++
+ ? '' : state_label($_[0]->state, $_[0]->country);
+
+ my $countylinks = ( $_[0]->county && $label )
+ ? ' '. add_link(
+ desc => 'Add more counties',
+ col => 'state',
+ label=> 'add more counties',
+ row => $_[0],
+ cgi => $cgi,
+ ).
+ ' '. collapse_link(
+ col => 'state',
+ label=> 'remove all counties',
+ row => $_[0],
+ cgi => $cgi,
+ )
+ : '';
+
+ my $addlink =
+ ( $_[0]->state
+ ? ''
+ : ' '. expand_link( desc => 'Add States',
+ row => $_[0],
+ label => 'add states',
+ cgi => $cgi,
+ )
+ );
+
+ $label.$countylinks.$addlink;
},
- sub { $_[0]->county || '(all) '.
- expand_link( desc => 'Add Counties',
- row => $_[0],
- label => 'add counties',
- )
+
+ sub { my $label =
+ $seen_county{$_[0]->country}->{$_[0]->state}->{$_[0]->county}++
+ ? '' : $_[0]->county;
+
+ my $citylinks = '';
+ if ( $label ) {
+ $citylinks = $_[0]->city
+ ? ' '. add_link(
+ desc => 'Add more cities',
+ col => 'county',
+ label=> 'add more cities',
+ row => $_[0],
+ cgi => $cgi,
+ ).
+ ' '. collapse_link(
+ col => 'county',
+ label=> 'remove all cities',
+ row => $_[0],
+ cgi => $cgi,
+ )
+ : ' '. remove_link( col => 'county',
+ label=> 'remove county',
+ row => $_[0],
+ cgi => $cgi,
+ );
+ }
+
+ $_[0]->county
+ ? $label.$citylinks
+ : '(all) '.
+ expand_link( desc => 'Add Counties',
+ row => $_[0],
+ label => 'add counties',
+ cgi => $cgi,
+ );
+ },
+
+ sub { $_[0]->city
+ ? $_[0]->city. ' '.
+ remove_link( col => 'city',
+ label=> 'remove city',
+ row => $_[0],
+ cgi => $cgi,
+ )
+ : '(all) '.
+ expand_link( desc => 'Add Cities',
+ row => $_[0],
+ label => 'add cities',
+ cgi => $cgi,
+ );
},
);
@@ -327,12 +546,13 @@ my @color = (
'000000',
sub { shift->state ? '000000' : '999999' },
sub { shift->county ? '000000' : '999999' },
+ sub { shift->city ? '000000' : '999999' },
);
if ( $conf->exists('enable_taxclasses') ) {
push @header, qq!Tax class (add new)!;
push @header2, '(per-package classification)';
- push @fields, sub { $_[0]->taxclass || '(all) '.
+ push @fields, sub { $_[0]->taxclass || '(all) '.
separate_taxclasses_link($_[0], 'Separate Taxclasses').
'separate taxclasses'
};
@@ -362,9 +582,10 @@ my $cb_sub = sub {
my $cust_main_county = shift;
if ( $cb_oldrow ) {
- if ( $cb_oldrow->country ne $cust_main_county->country
- || $cb_oldrow->state ne $cust_main_county->state
+ if ( $cb_oldrow->city ne $cust_main_county->city
|| $cb_oldrow->county ne $cust_main_county->county
+ || $cb_oldrow->state ne $cust_main_county->state
+ || $cb_oldrow->country ne $cust_main_county->country
|| $cb_oldrow->taxclass ne $cust_main_county->taxclass )
{
$newregion = 1;