oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow alternations in the tax data, so that it is case insensitive

Browse source 
and allows multiple definitions of an entry (like state, city or country)
This commit is contained in:
Colin Kuskie 2008-03-07 02:16:40 +00:00
parent 50fc494759
commit 52cf8b672c
4 changed files with 64 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Shop/Tax.pm
View file

@ -181,6 +181,9 @@ sub exportTaxData {
my $taxData = WebGUI::Text::joinCSV(@columns) . "\n";
while (my $taxRow = $taxIterator->hashRef() ) {
my @taxData = @{ $taxRow }{@columns};
foreach my $column (@taxData) {
$column =~ tr/,/|/; ##Convert to the alternation syntax for the text file
}
$taxData .= WebGUI::Text::joinCSV(@taxData) . "\n";
}
my $storage = WebGUI::Storage->createTemp($self->session);
@ -222,10 +225,10 @@ sub getTaxRates {
my $code = $address->get('code');
my $result = $self->session->db->buildArrayRef(
q{
select taxRate from tax where country=?
and (state='' or state=?)
and (city='' or city=?)
and (code='' or code=?)
select taxRate from tax where find_in_set(?, country)
and (state='' or find_in_set(?, lower(state)))
and (city='' or find_in_set(?, lower(city)))
and (code='' or find_in_set(?, lower(code)))
},
[ $country, $state, $city, $code, ]);
return $result;
@ -273,7 +276,8 @@ sub importTaxData {
chomp $taxRow;
$taxRow =~ s/\s*#.+$//;
next unless $taxRow;
my @taxRow = WebGUI::Text::splitCSV($taxRow);
local $_;
my @taxRow = map { tr/|/,/; $_; } WebGUI::Text::splitCSV($taxRow);
WebGUI::Error::InvalidFile->throw(error => qq{Error found in the CSV file}, brokenFile => $filePath, brokenLine => $line)
unless scalar @taxRow == 5;
push @taxData, [ @taxRow ];