Destination code relies on district only

2 files changed, 3 insertions, 6 deletions

diff --git a/config/pikul.tag b/config/pikul.tag
index db2d8ea..7a447e7 100644
--- a/config/pikul.tag
+++ b/config/pikul.tag
@@ -3,8 +3,6 @@ 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};
@@ -38,8 +36,8 @@ sub {
 				]);
 			$origins[$company] = $::Variable->{ANTERAJA_ORIGIN}
 			|| $Global::Variable->{ANTERAJA_ORIGIN};
-			$destinations[$company] = $Tag->query({sql => "SELECT code FROM anteraja WHERE \
-					district='$district' AND city='$city' AND province='$province'",
+			$destinations[$company] = $Tag->query({sql => "SELECT code FROM anteraja WHERE\
+					district LIKE '%$district%'",
 					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 4b8aad0..2b2e5e1 100644
--- a/config/pikul_cost.tag
+++ b/config/pikul_cost.tag
@@ -19,8 +19,7 @@ sub {
 		$service,
 		$origin,
 		$Tag->query({
-				sql => "SELECT code FROM $table WHERE district='$district' AND \
-				city='$city' AND province='$province'",
+				sql => "SELECT code FROM $table WHERE district LIKE '%$district%'",
 				wantarray => 1
 			})->[0]->[0] || '',
 		$weight);