From f6204deab03d98ff78a999463879a0f9063ff61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 24 Jul 2021 18:13:56 +0800 Subject: Destination code relies on district only --- config/pikul.tag | 6 ++---- config/pikul_cost.tag | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'config') 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 <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); -- cgit v1.2.3