[ 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 ) {
+ if ( $cs_oldrow ne $row ) {
+ if ( $cs_oldrow ) {
+ if ( $cs_oldrow->country ne $row->country ) {
$cell_style = 'border-top:1px solid #000000';
- } elsif ( $oldrow->state ne $row->state ) {
+ } elsif ( $cs_oldrow->state ne $row->state ) {
$cell_style = 'border-top:1px solid #cccccc'; #default?
- } elsif ( $oldrow->state eq $row->state ) {
+ } elsif ( $cs_oldrow->state eq $row->state ) {
#$cell_style = 'border-top:dashed 1px dark gray';
$cell_style = 'border-top:1px dashed #cccccc';
}
}
- $oldrow = $row;
+ $cs_oldrow = $row;
}
return $cell_style;
};
);
};
+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";
sub collapse_link {
my %param = @_;
+ my $row = $param{'row'};
+ my $col = $param{'col'};
+ return ''
+ if $col eq 'county' and $row->city
+ || qsearch({
+ 'table' => 'cust_main_county',
+ 'hashref' => {
+ 'country' => $row->country,
+ 'state' => $row->state,
+ 'city' => { op=>'!=', value=>'' },
+ },
+ 'order_by' => 'LIMIT 1',
+ });
+
+ my %above = ( 'city' => 'county',
+ 'county' => 'state',
+ );
+
+ #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";
- $url = "javascript:collapse_areyousure('$url')";
+ $url = "javascript:collapse_areyousure('$url', '$col', '$above{$col}')";
qq(<FONT SIZE="-1"><A HREF="$url">$param{'label'}</A></FONT>);
}
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)
+ 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;
}
</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.
+ <BR>Click on <u>add cities</u> to specify a county's tax rates by city, or <u>remove cities</u> to remove per-city tax rates.
END
$html_init .= "<BR>Click on <u>separate taxclasses</u> to specify taxes per taxclass."
'empty_data_label' => '(none)',
'empty_data_value' => '__NONE__',
'disable_empty' => 0,
- 'disable_countyupdate' => 1,
+ 'disable_cityupdate' => 1,
);
} else {
$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,
}
}
- function bulkPopup() {
+ function bulkPopup(action) {
var bulk_popup_link = "$bulk_popup_link";
var bulkstring = '';
theForm = document.taxesForm;
}
}
+ bulkstring = bulkstring + ';action=' + action;
if ( bulk_popup_link.length > 1920 ) { // IE 2083 URL limit
alert('Too many selections'); // should do some session thing...
return false;
<A HREF="javascript:setAll(false)">unselect all</A> |
<A HREF="javascript:toggleAll()">toggle all</A>
<BR><BR>
-<A HREF="javascript:void(0);" onClick="bulkPopup();">Add new tax to selected</A>
+<A HREF="javascript:void(0);" onClick="bulkPopup('add');">Add new tax to selected</A>
+|
+<A HREF="javascript:void(0);" onClick="bulkPopup('edit');">Bulk edit selected</A>
END
$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 @fields = (
sub { my $country = shift->country;
},
sub { $_[0]->county
? $_[0]->county. ' '.
- collapse_link( label=> 'remove counties',
+ collapse_link( col => 'county',
+ label=> 'remove counties',
row => $_[0],
)
: '(all) '.
label => 'add counties',
);
},
+ sub { $_[0]->city
+ ? $_[0]->city. ' '.
+ collapse_link( col => 'city',
+ label=> 'remove cities',
+ row => $_[0],
+ )
+ : '(all) '.
+ expand_link( desc => 'Add Cities',
+ row => $_[0],
+ label => 'add cities',
+ );
+ },
);
my @color = (
'000000',
sub { shift->state ? '000000' : '999999' },
sub { shift->county ? '000000' : '999999' },
+ sub { shift->city ? '000000' : '999999' },
);
if ( $conf->exists('enable_taxclasses') ) {
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;