diff options
| -rw-r--r-- | config/pikul_cost.tag | 6 | ||||
| -rw-r--r-- | products/ship/shipping.asc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/config/pikul_cost.tag b/config/pikul_cost.tag index f8e656c..7d9fd0e 100644 --- a/config/pikul_cost.tag +++ b/config/pikul_cost.tag @@ -1,9 +1,8 @@ -UserTag pikul_cost Order company district city province weight service +UserTag pikul_cost Order company origin district city province weight service UserTag pikul_cost Routine <<EOR sub { - my ($company, $district, $city, $province, $weight, $service) = @_; + my ($company, $origin, $district, $city, $province, $weight, $service) = @_; my @provisions; - my $origin; my $table; if ($company == 0) { @provisions = ( @@ -11,7 +10,6 @@ sub { "$Global::Variable->{ANTERAJA_ACCESS_KEY_ID}", "$Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}" ); - $origin = "$Global::Variable->{ANTERAJA_ORIGIN}"; $table = 'anteraja'; } elsif ($company == 1) { @provisions = ( diff --git a/products/ship/shipping.asc b/products/ship/shipping.asc index e58e215..fab032e 100644 --- a/products/ship/shipping.asc +++ b/products/ship/shipping.asc @@ -1,3 +1,3 @@ anteraja: Anteraja Regular crit weight - cost f [pikul_cost company=0 district='[evalue address3]' city='[evalue city]' province='[evalue state]' weight=@@TOTAL@@ service='REG'] + cost f [pikul_cost company=0 origin='@_ANTERAJA_ORIGIN_@' district='[evalue address3]' city='[evalue city]' province='[evalue state]' weight=@@TOTAL@@ service='REG'] |