From 5638731b0464e5b12f7c04fba3e0010ca1f5fca6 Mon Sep 17 00:00:00 2001 From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ Date: Fri, 16 Jul 2021 15:37:59 +0800 Subject: Default shipping Anteraja Regular --- products/ship/shipping.asc | 2 +- products/variable.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'products') diff --git a/products/ship/shipping.asc b/products/ship/shipping.asc index fab032e..9af6f2e 100644 --- a/products/ship/shipping.asc +++ b/products/ship/shipping.asc @@ -1,3 +1,3 @@ -anteraja: Anteraja Regular +anteraja_reg: Anteraja Regular crit weight cost f [pikul_cost company=0 origin='@_ANTERAJA_ORIGIN_@' district='[evalue address3]' city='[evalue city]' province='[evalue state]' weight=@@TOTAL@@ service='REG'] diff --git a/products/variable.txt b/products/variable.txt index 1e7e3b0..c5281be 100644 --- a/products/variable.txt +++ b/products/variable.txt @@ -78,7 +78,7 @@ SECURE_SERVER https://__MVC_SERVERNAME__ Directories and Paths SERVER_NAME __MVC_SERVERNAME__ Directories and Paths SETTLE_TRANSACTION Payment SHIP_DEFAULT_COUNTRY ID Shipping -SHIP_DEFAULT_MODE anteraja Shipping +SHIP_DEFAULT_MODE anteraja_reg Shipping SHIP_FLAT_DOM_RATE 5 Shipping SHIP_FLAT_INTL_RATE 10 Shipping SQLDSN __MVC_SQLDSN__ Database -- cgit v1.3 From 8e597aa6979cc414c64224ef1f8c452a4ee78ad5 Mon Sep 17 00:00:00 2001 From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ Date: Fri, 16 Jul 2021 15:39:11 +0800 Subject: Origin is set in the template tag --- config/pikul_cost.tag | 19 +++++++++++++------ products/ship/shipping.asc | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'products') diff --git a/config/pikul_cost.tag b/config/pikul_cost.tag index 75e84b9..eb99dde 100644 --- a/config/pikul_cost.tag +++ b/config/pikul_cost.tag @@ -1,21 +1,28 @@ -UserTag pikul_cost Order company origin district city province weight service +UserTag pikul_cost Order company service district city province weight UserTag pikul_cost Routine <{PIKUL_ANTERAJA}) { @provisions = ( "$Global::Variable->{ANTERAJA_BASE_PATH}", "$Global::Variable->{ANTERAJA_ACCESS_KEY_ID}", "$Global::Variable->{ANTERAJA_SECRET_ACCESS_KEY}" ); + $origin = $::Variable->{ANTERAJA_ORIGIN}; $table = 'anteraja'; } use Pikul; Pikul::init($company, \@provisions); - my $cost = Pikul::cost($origin, $Tag->query({sql => "SELECT code FROM $table WHERE \ - district='$district' AND city='$city' AND province='$province'", - wantarray => 1})->[0]->[0] || '', $weight, $service); + my $cost = Pikul::cost( + $origin, + $Tag->query({ + sql => "SELECT code FROM $table WHERE district='$district' AND \ + city='$city' AND province='$province'", + wantarray => 1 + })->[0]->[0] || '', + $weight, + $service); Pikul::cleanup(); return $cost; } diff --git a/products/ship/shipping.asc b/products/ship/shipping.asc index 9af6f2e..cf98af7 100644 --- a/products/ship/shipping.asc +++ b/products/ship/shipping.asc @@ -1,3 +1,3 @@ anteraja_reg: Anteraja Regular crit weight - cost f [pikul_cost company=0 origin='@_ANTERAJA_ORIGIN_@' district='[evalue address3]' city='[evalue city]' province='[evalue state]' weight=@@TOTAL@@ service='REG'] + cost f [pikul_cost company=__PIKUL_ANTERAJA__ service='REG' district='[evalue address2]' city='[evalue city]' province='[evalue state]' weight=@@TOTAL@@] -- cgit v1.3 From ef97980def513ed45831a607b56aa304af637dbd Mon Sep 17 00:00:00 2001 From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ Date: Sat, 17 Jul 2021 10:42:45 +0800 Subject: Use a name scheme that's easy to split lowercasetablename_PreservedCaseServiceName --- pages/ord/checkout.html | 2 +- products/ship/shipping.asc | 2 +- products/variable.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'products') diff --git a/pages/ord/checkout.html b/pages/ord/checkout.html index 27d3ebf..cfcab31 100644 --- a/pages/ord/checkout.html +++ b/pages/ord/checkout.html @@ -85,7 +85,7 @@
- +