diff options
| -rw-r--r-- | config/pikul.tag | 6 | ||||
| -rw-r--r-- | config/pikul_cost.tag | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/pikul.tag b/config/pikul.tag index 5f49ff0..398cef0 100644 --- a/config/pikul.tag +++ b/config/pikul.tag @@ -3,6 +3,8 @@ UserTag pikul Routine <<EOR sub { my ($widget, $extra) = @_; my $district = $Tag->value('address2'); + my $city = $Tag->value('city'); + my $province = $Tag->value('state'); my $weight = 0.0; for my $item (@{$Carts->{main}}) { $weight += $Tag->data('products', 'weight', $item->{code}) * $item->{quantity}; @@ -36,8 +38,8 @@ sub { ]); $origins[$company] = $::Variable->{ANTERAJA_ORIGIN} || $Global::Variable->{ANTERAJA_ORIGIN}; - $destinations[$company] = $Tag->query({sql => "SELECT code FROM anteraja WHERE\ - district LIKE '%$district%'", + $destinations[$company] = $Tag->query({sql => "SELECT code FROM anteraja WHERE \ + district='$district' AND city='$city' AND province='$province'", wantarray => 1})->[0]->[0] || ''; $code_prefixes[$company] = 'anteraja_'; $name_prefixes[$company] = 'Anteraja '; diff --git a/config/pikul_cost.tag b/config/pikul_cost.tag index 24dd9a1..199e503 100644 --- a/config/pikul_cost.tag +++ b/config/pikul_cost.tag @@ -25,7 +25,8 @@ sub { $service, $origin, $Tag->query({ - sql => "SELECT code FROM $table WHERE district LIKE '%$district%'", + sql => "SELECT code FROM $table WHERE district='$district' AND \ + city='$city' AND province='$province'", wantarray => 1 })->[0]->[0] || '', $weight); |