diff options
| -rw-r--r-- | config/pikul_cost.tag | 10 | ||||
| -rw-r--r-- | config/pikul_order.tag | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/config/pikul_cost.tag b/config/pikul_cost.tag index 3316ef9..2cea3f2 100644 --- a/config/pikul_cost.tag +++ b/config/pikul_cost.tag @@ -1,13 +1,13 @@ -UserTag pikul_cost Order company service district city province weight -UserTag pikul_cost Routine <<EOR +UserTag pikul-cost Order company service district city province weight +UserTag pikul-cost Routine <<EOR sub { my ($company, $service, $district, $city, $province, $weight) = @_; my (@provisions, $origin, $table); if ($company == $::Variable->{PIKUL_ANTERAJA}) { @provisions = ( - "$Global::Variable->{ANTERAJA_ACCESS_KEY_ID}", - "$Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}", - "$Global::Variable->{ANTERAJA_BASE_PATH}" + $Global::Variable->{ANTERAJA_ACCESS_KEY_ID}, + $Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}, + $Global::Variable->{ANTERAJA_BASE_PATH} ); $origin = $::Variable->{ANTERAJA_ORIGIN}; $table = 'anteraja'; diff --git a/config/pikul_order.tag b/config/pikul_order.tag index e159028..e5541f1 100644 --- a/config/pikul_order.tag +++ b/config/pikul_order.tag @@ -1,5 +1,5 @@ -UserTag pikul_order Order order_number -UserTag pikul_order Routine <<EOR +UserTag pikul-order Order order_number +UserTag pikul-order Routine <<EOR sub { my $order_number = shift; my ($shipmode, $nitems, $subtotal, $fname, $lname, $address1, $address2, $city, $state, $zip, @@ -15,12 +15,12 @@ sub { if (substr($table, 0, 8) eq 'anteraja') { $company = $::Variable->{PIKUL_ANTERAJA}; @provisions = ( - "$Global::Variable->{ANTERAJA_ACCESS_KEY_ID}", - "$Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}", - "$Global::Variable->{ANTERAJA_BASE_PATH}", - "$Global::Variable->{ANTERAJA_PREFIX}" + $Global::Variable->{ANTERAJA_ACCESS_KEY_ID}, + $Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}, + $Global::Variable->{ANTERAJA_BASE_PATH}, + $Global::Variable->{ANTERAJA_PREFIX} ); - $origin = "$::Variable->{ANTERAJA_ORIGIN}"; + $origin = $::Variable->{ANTERAJA_ORIGIN}; } my @items = @{$Tag->query({sql => "SELECT sku,quantity FROM orderline WHERE \ order_number='$order_number'", @@ -37,11 +37,11 @@ sub { my $tracking_number = Pikul::order( $order_number, $service, - "$::Variable->{COMPANY}", - "$::Variable->{PHONE}", + $::Variable->{COMPANY}, + $::Variable->{PHONE}, $origin, - "$::Variable->{ADDRESS}", - "$::Variable->{POSTAL_CODE}", + $::Variable->{ADDRESS}, + $::Variable->{POSTAL_CODE}, "$fname $lname", $phone_day, $Tag->query({sql => "SELECT code FROM $table WHERE district='$address2' AND city='$city' \ |