From d388c3edd8642c2128ce7f066a2a8fc6b58535e4 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 13:34:32 +0800
Subject: Turn off uppercase filter

---
 etc/log_transaction | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index 5cb8294..a78a07a 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -376,7 +376,7 @@ company: [value filter=strip name=company]
 address1: [value filter=strip name=address1]
 address2: [value filter=strip name=address2]
 city: [value filter=strip name=city]
-state: [value name=state filter="strip uc"]
+state: [value name=state filter=strip]
 zip: [value name=zip filter=word]
 country: [value country]
 email: [value name=email filter=strip]
-- 
cgit v1.3


From 1b8c8e4e870fe33668f956ea0e1e75cf9cd311d3 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:19:33 +0800
Subject: Move the order call to transaction log

---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index a78a07a..fe0999c 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number:
+tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index 2949186..b5cc5b5 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3


From 643de43dba1101d48e4da92210eb7df31bfd6d9f Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:22:44 +0800
Subject: Revert "Move the order call to transaction log"

This reverts commit 1b8c8e4e870fe33668f956ea0e1e75cf9cd311d3.
---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index fe0999c..a78a07a 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
+tracking_number:
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index b5cc5b5..2949186 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3


From 7856d713c97aad78b1f21fec3f3bc3f7419313e1 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:30:35 +0800
Subject: Revert "Revert "Move the order call to transaction log""

This reverts commit 643de43dba1101d48e4da92210eb7df31bfd6d9f.
---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index a78a07a..fe0999c 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number:
+tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index 2949186..b5cc5b5 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3


From 0523796a93081f27a70ef2f6f61f3d11ab5471f2 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:31:45 +0800
Subject: Revert "Revert "Revert "Move the order call to transaction log"""

This reverts commit 7856d713c97aad78b1f21fec3f3bc3f7419313e1.
---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index fe0999c..a78a07a 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
+tracking_number:
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index b5cc5b5..2949186 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3


From 189eb5ec8c5073b5db549a8f29413e1155383c86 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:43:01 +0800
Subject: Revert "Revert "Revert "Revert "Move the order call to transaction
 log""""

This reverts commit 0523796a93081f27a70ef2f6f61f3d11ab5471f2.
---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index a78a07a..fe0999c 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number:
+tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index 2949186..b5cc5b5 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3


From 3f7029884a03c9b58f850b08ba80113e43d4e329 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 19:51:30 +0800
Subject: Programatically set tracking_number

The transaction data is only being made at this stage, that's why
it didn't work by searching it from the database.
---
 config/pikul_order.tag | 12 +++---------
 etc/log_transaction    |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/config/pikul_order.tag b/config/pikul_order.tag
index 181923e..5711c39 100644
--- a/config/pikul_order.tag
+++ b/config/pikul_order.tag
@@ -1,14 +1,8 @@
-UserTag pikul_order Order order_number insurance
+UserTag pikul_order Order order_number shipmode nitems subtotal fname lname address1 address2 city state zip phone_day insurance
 UserTag pikul_order Routine <<EOR
 sub {
-	my ($order_number, $insurance) = @_;
-	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,zip,\
-		phone_day FROM transactions WHERE code='$order_number'",
-		wantarray => 1
-	})->[0]};
+	my ($order_number, $shipmode, $nitems, $subtotal, $fname, $lname, $address1, $address2, $city,
+		$state, $zip, $phone_day, $insurance) = @_;
 	my @parts = split(/ /, $shipmode, 2);
 	my ($table, $service) = split(/_/, shift @parts);
 	my ($company, @provisions, $origin);
diff --git a/etc/log_transaction b/etc/log_transaction
index fe0999c..dc336ed 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
+tracking_number: [pikul_order order_number="[value mv_order_number]" shipmode="[value mv_shipmode]" nitems=[nitems] subtotal=[subtotal noformat=1] fname="[value filter=strip name=fname]" lname="[value filter=strip name=lname]" address1="[value filter=strip name=address1]" address2="[value filter=strip name=address2]" city="[value filter=strip name=city]" state="[value filter=strip name=state]" zip="[value filter=word name=zip]" phone_day="[value filter=strip name=phone_day]" insurance=0]
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
-- 
cgit v1.3


From 4252d35ad7bf4013464fc9a4d0ccf054ad7da626 Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 20:41:25 +0800
Subject: Revert "Programatically set tracking_number"

This reverts commit 3f7029884a03c9b58f850b08ba80113e43d4e329.
---
 config/pikul_order.tag | 12 +++++++++---
 etc/log_transaction    |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/config/pikul_order.tag b/config/pikul_order.tag
index 5711c39..181923e 100644
--- a/config/pikul_order.tag
+++ b/config/pikul_order.tag
@@ -1,8 +1,14 @@
-UserTag pikul_order Order order_number shipmode nitems subtotal fname lname address1 address2 city state zip phone_day insurance
+UserTag pikul_order Order order_number insurance
 UserTag pikul_order Routine <<EOR
 sub {
-	my ($order_number, $shipmode, $nitems, $subtotal, $fname, $lname, $address1, $address2, $city,
-		$state, $zip, $phone_day, $insurance) = @_;
+	my ($order_number, $insurance) = @_;
+	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,zip,\
+		phone_day FROM transactions WHERE code='$order_number'",
+		wantarray => 1
+	})->[0]};
 	my @parts = split(/ /, $shipmode, 2);
 	my ($table, $service) = split(/_/, shift @parts);
 	my ($company, @provisions, $origin);
diff --git a/etc/log_transaction b/etc/log_transaction
index dc336ed..fe0999c 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number: [pikul_order order_number="[value mv_order_number]" shipmode="[value mv_shipmode]" nitems=[nitems] subtotal=[subtotal noformat=1] fname="[value filter=strip name=fname]" lname="[value filter=strip name=lname]" address1="[value filter=strip name=address1]" address2="[value filter=strip name=address2]" city="[value filter=strip name=city]" state="[value filter=strip name=state]" zip="[value filter=word name=zip]" phone_day="[value filter=strip name=phone_day]" insurance=0]
+tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
-- 
cgit v1.3


From 19b166f0271900128bb19e588fb3e9928153d87f Mon Sep 17 00:00:00 2001
From: ꦌꦫꦶꦏ꧀ꦦꦿꦧꦮꦑꦩꦭ꧀ <erik@darapsa.co.id>
Date: Sat, 17 Jul 2021 20:41:37 +0800
Subject: Revert "Revert "Revert "Revert "Revert "Move the order call to
 transaction log"""""

This reverts commit 189eb5ec8c5073b5db549a8f29413e1155383c86.
---
 etc/log_transaction | 2 +-
 etc/receipt.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/log_transaction')

diff --git a/etc/log_transaction b/etc/log_transaction
index fe0999c..a78a07a 100644
--- a/etc/log_transaction
+++ b/etc/log_transaction
@@ -397,7 +397,7 @@ payment_mode: [data session payment_mode]
 avs: [calc] ($Session->{payment_result} || {})->{'pop.avs_code'}; [/calc]
 order_id: [data session payment_id]
 auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [/calc]
-tracking_number: [pikul_order order_number='[value mv_order_number]' insurance=0]
+tracking_number:
 order_date: [value name=order_date set="[tag time]%Y%m%d %H:%M:%S[/tag]"]
 order_ymd: [value name=order_date set="[tag time]%Y%m%d[/tag]"]
 order_wday: [value name=order_wday set="[tag time]%u[/tag]"]
diff --git a/etc/receipt.html b/etc/receipt.html
index b5cc5b5..2949186 100644
--- a/etc/receipt.html
+++ b/etc/receipt.html
@@ -7,7 +7,7 @@
 <h1>[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]</h1>
 <p class="well well-small lead">[msg arg="<strong>[value mv_order_number]</strong>"]Your Order Number is %s[/msg]</p>
 
-<p class="well well-small lead">[msg arg="<strong>[value tracking_number]</strong>"]Your Tracking Number is %s[/msg]</p>
+<p class="well well-small lead">[msg arg="<strong>[pikul_order order_number='[value mv_order_number]' insurance=0]</strong>"]Your Tracking Number is %s[/msg]</p>
 
 <p>[L]Your order is being electronically processed and will be shipped soon.[/L]</p>
 
-- 
cgit v1.3