From eed1ca92362c67ee80f015c17d4e0eb17f240611 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Fri, 16 Jul 2021 15:35:33 +0800
Subject: address2 is the one used for district

---
 include/checkout/shipping_address | 4 ++--
 include/profiles/profiles.order   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/checkout/shipping_address b/include/checkout/shipping_address
index 2a6c2d1..1b23086 100644
--- a/include/checkout/shipping_address
+++ b/include/checkout/shipping_address
@@ -43,12 +43,12 @@ return $options;
 										</div>
 										<div class="form-group col-md-8">
 											<label class="form-label" for="district_shipping">[L]District[/L]</label>
-											<select name="address3" id="district_shipping" class="form-control" onchange="this.form.submit()">
+											<select name="address2" id="district_shipping" class="form-control" onchange="this.form.submit()">
 												<option value="-- [L]Please select[/L] --">-- [L]Please select[/L] --</option>[perl products]
 my $options = '';
 for my $district (@{$Tag->query({sql => "SELECT district FROM anteraja WHERE city='" . $Tag->value({keep => 1, filter => encode_entities, name => 'city'}) . "' GROUP BY district ORDER BY district"})}) {
 				$options .= qq(
-												<option value="$district->[0]") . ($district->[0] eq $Tag->value({keep => 1, filter => encode_entities, name => 'address3'}) ? ' selected' : '') . ">$district->[0]</option>";
+												<option value="$district->[0]") . ($district->[0] eq $Tag->value({keep => 1, filter => encode_entities, name => 'address2'}) ? ' selected' : '') . ">$district->[0]</option>";
 }
 return $options;
 [/perl]
diff --git a/include/profiles/profiles.order b/include/profiles/profiles.order
index 10c9726..fa02037 100644
--- a/include/profiles/profiles.order
+++ b/include/profiles/profiles.order
@@ -2,7 +2,7 @@ __NAME__ bank_transfer
 
 fname=required
 address1=required
-address3=required
+address2=required
 city=required
 state=required
 &fatal=yes
-- 
cgit v1.3


From 7075a6c4130e8eaf48a05b0d8567887b3693c3b3 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <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(-)

(limited to 'include')

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.3