From 7075a6c4130e8eaf48a05b0d8567887b3693c3b3 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?=
 <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 15:40:25 +0800
Subject: Postal codes for both sender & receiver

---
 config/pikul_order.tag          | 9 ++++++---
 include/profiles/profiles.order | 1 +
 products/variable.txt           | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/pikul_order.tag b/config/pikul_order.tag
index 6f22e1d..181923e 100644
--- a/config/pikul_order.tag
+++ b/config/pikul_order.tag
@@ -2,10 +2,11 @@ UserTag pikul_order Order order_number insurance
 UserTag pikul_order Routine <<EOR
 sub {
 	my ($order_number, $insurance) = @_;
-	my ($shipmode, $nitems, $subtotal, $fname, $lname, $address1, $address2, $city, $state, $phone_day)
+	my ($shipmode, $nitems, $subtotal, $fname, $lname, $address1, $address2, $city, $state, $zip,
+		$phone_day)
 	= @{$Tag->query({
-		sql => "SELECT shipmode,nitems,subtotal,fname,lname,address1,address2,city,state,phone_day \
-		FROM transactions WHERE code='$order_number'",
+		sql => "SELECT shipmode,nitems,subtotal,fname,lname,address1,address2,city,state,zip,\
+		phone_day FROM transactions WHERE code='$order_number'",
 		wantarray => 1
 	})->[0]};
 	my @parts = split(/ /, $shipmode, 2);
@@ -40,6 +41,7 @@ sub {
 		"$::Variable->{PHONE}",
 		$origin,
 		"$::Variable->{ADDRESS}",
+		"$::Variable->{POSTAL_CODE}",
 		"$fname $lname",
 		$phone_day,
 		$Tag->query({sql => "SELECT code FROM $table WHERE district='$address2' AND city='$city' \
@@ -47,6 +49,7 @@ sub {
 				wantarray => 1
 			})->[0]->[0],
 		$address1,
+		$zip,
 		$nitems,
 		\@items,
 		$insurance,
diff --git a/include/profiles/profiles.order b/include/profiles/profiles.order
index fa02037..aff4db9 100644
--- a/include/profiles/profiles.order
+++ b/include/profiles/profiles.order
@@ -5,6 +5,7 @@ address1=required
 address2=required
 city=required
 state=required
+zip=required
 &fatal=yes
 &final=yes
 &set = mv_payment Bank transfer
diff --git a/products/variable.txt b/products/variable.txt
index ac684c1..078c31b 100644
--- a/products/variable.txt
+++ b/products/variable.txt
@@ -64,6 +64,7 @@ PGP_KEY		Encryption
 PGSQL	__MVC_PGSQL__	Database
 PHONE	(765) 555-1212	Company
 POSTAL_ACCEPTED	0	Payment
+POSTAL_CODE	12720	Company
 PO_ACCEPTED	1	Payment
 PUBLISH_DO_RCS	0	Admin Control
 PUBLISH_NO_PAGE_ROOT	0	Admin Control
-- 
cgit v1.2.3