From 4dd0770783a04fa650d07bffd1230598e76611c4 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?= Date: Sat, 17 Jul 2021 10:53:27 +0800 Subject: Strap's receipt + order tag --- etc/receipt.html | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 etc/receipt.html (limited to 'etc') diff --git a/etc/receipt.html b/etc/receipt.html new file mode 100644 index 0000000..2949186 --- /dev/null +++ b/etc/receipt.html @@ -0,0 +1,205 @@ +[tmp page_title]__COMPANY__ -- [L]Receipt[/L][/tmp] +[tmpn display_class]noleft[/tmpn] + +@_TOP_@ + + +

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

+

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

+ +

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+ +

[L]Your order is being electronically processed and will be shipped soon.[/L]

+ + + +[L]Continue Shopping[/L] + +
+ +

[L]Order Details[/L]

+ + + + + + + + + + + + + + + + + + +[if value mv_handling] + + + + +[/if] + + + + + + +
[L]Order Date[/L]:[time]%b %e, %Y[/time]
[L]Order #[/L]:[value mv_order_number]
[L]Payment Method[/L]:[value mv_payment]
[L]Shipping Method[/L]: + [shipping_desc] +
[L]Handling Charge[/L]: + [loop list="[value mv_handling]"] + [loop-change 1] + [condition]1[/condition] + [else]
[/else] + [/loop-change 1] + [either][shipping_desc mode="[loop-code]"][or][L]CHARGED[/L][/either] + [/loop] +
[L]Shipping Address[/L]: + [value fname] [value lname]
+ [if value company][value company]
[/if] + [value address1]
+ [if value address2][value address2]
[/if] + [value city], [value state] [value zip]
+ [value country]
+ [value phone_day]
+ [value email] + 		[L]Billing Address[/L]: + [if value mv_same_billing] + ([L]same as shipping[/L]) + [else] + [value b_fname] [value b_lname]
+ [value b_address1]
+ [if value b_address2][value b_address2]
[/if] + [value b_city], [value b_state] [value b_zip]
+ [value b_country]
+ [value phone_day]
+ [value email] + [/else] + [/if] +
+ +[comment] Handle downloadables [/comment] +[perl products] + sub get_download { + if (! $Scratch->{download_present}) { + return '(Must pay by credit card to download now.)'; + } + my $sku = shift; + return '' unless tag_data('products', 'download', $sku); + my $loc = tag_data('products', 'dl_location', $sku); + my $save = delete $Scratch->{mv_add_dot_html}; + my $url = $Tag->area( { + href => "deliver/$loc", + no_session_id => 1, + no_count => 1, + arg => $sku, + form => $Scratch->{mv_autocreate}, + } ); + $Scratch->{mv_add_dot_html} = $save if $save; + return qq{
}; + } + return; +[/perl] + +
+ + + + + + + +[item-list] + + + + + + + + [if-item-param pay_cert_code] + + + + [/if-item-param] + [if-item-field download] + + + + [/if-item-field] +[/item-list] + + + + + + + + + +[if value mv_shipmode] + + + + +[/if] +[if value mv_handling] + + + + +[/if] + + + + +[if scratch pay_cert_total] + + + + + + + + +[/if] +
[L]Item Description[/L][L]Each[/L] [L]Quantity[/L][L]Total[/L]  
+ [image sku="[item-code]" makesize="75x75" default="../thumb.gif" imagesubdir=items] + +
[item-description]
+ [item-sku] + [if-modifier size]
SIZE-->[item-modifier size][/if-modifier][if-modifier color] COLOR-->[item-modifier color][/if-modifier] + [if-item-field option_type] +
[item-options label=1 bold=1 price=1 type=display] + [/if-item-field] + [if-item-modifier mv_ad] +
+ SHIP TO: + 
[item-modifier mv_ad]
+ [/if-item-modifier] + 		[item-discount-price][item-quantity][item-discount-subtotal]
+ [tmp pc][area href="cert/[item-param pay_cert_code]/[item-param pay_cert_check]" no-session=1][/tmp] + Give this URL to pass on the gift certificate: [scratch pc] +
+ [calc]get_download('[item-code]')[/calc] +
SUBTOTAL[subtotal]
SALES TAX[salestax]
SHIPPING[shipping]
HANDLING[handling]
TOTAL[total-cost]
GIFT CERTIFICATE[currency][scratch pay_cert_total][/currency]
CHARGED[currency][scratch tmp_remaining][/currency]
+ +[if value gift_note] +

Note for Gift: [value gift_note]

+[/if] + +
+

[L RECEIPT_PRINT]Please print this receipt for your records. Thank you for your order![/L]

+ + +@_BOTTOM_@ -- cgit v1.2.3 From d388c3edd8642c2128ce7f066a2a8fc6b58535e4 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?= 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') 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.2.3 From 0b21c42c19800edc1539ba5e9732a1d9fe4f3454 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?= Date: Sat, 17 Jul 2021 13:38:07 +0800 Subject: Comment out order tag for now --- etc/receipt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/receipt.html b/etc/receipt.html index 2949186..18fd425 100644 --- a/etc/receipt.html +++ b/etc/receipt.html @@ -7,7 +7,7 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+

[msg arg="[comment][pikul_order order_number='[value mv_order_number]' insurance=0][/comment]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 9e8128b8dbb2fc7e226e43b20df4742f7580afe9 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?= Date: Sat, 17 Jul 2021 15:43:46 +0800 Subject: Enable order --- etc/receipt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/receipt.html b/etc/receipt.html index 18fd425..2949186 100644 --- a/etc/receipt.html +++ b/etc/receipt.html @@ -7,7 +7,7 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[comment][pikul_order order_number='[value mv_order_number]' insurance=0][/comment]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 1b8c8e4e870fe33668f956ea0e1e75cf9cd311d3 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 643de43dba1101d48e4da92210eb7df31bfd6d9f 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 7856d713c97aad78b1f21fec3f3bc3f7419313e1 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 0523796a93081f27a70ef2f6f61f3d11ab5471f2 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 189eb5ec8c5073b5db549a8f29413e1155383c86 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 3f7029884a03c9b58f850b08ba80113e43d4e329 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?= 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. --- etc/log_transaction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') 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.2.3 From 4252d35ad7bf4013464fc9a4d0ccf054ad7da626 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?= Date: Sat, 17 Jul 2021 20:41:25 +0800 Subject: Revert "Programatically set tracking_number" This reverts commit 3f7029884a03c9b58f850b08ba80113e43d4e329. --- etc/log_transaction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') 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.2.3 From 19b166f0271900128bb19e588fb3e9928153d87f 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?= 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') 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 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[value tracking_number]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From 3fe050402dc2afbee8ecc5d3f67576790f7c5d62 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?= Date: Sun, 18 Jul 2021 12:07:14 +0800 Subject: Insurance isn't user's decision --- etc/receipt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/receipt.html b/etc/receipt.html index 2949186..6e853f9 100644 --- a/etc/receipt.html +++ b/etc/receipt.html @@ -7,7 +7,7 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order order_number='[value mv_order_number]' insurance=0]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order [value mv_order_number]]"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3 From c10cde30d86bddd720480bd535582151a816d1cc 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?= Date: Sun, 18 Jul 2021 12:26:32 +0800 Subject: The correct syntax The quotes and parameter name must be retained. I guess it takes some more effort to make some parameter default, or to enable arguments without quotes. --- etc/receipt.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/receipt.html b/etc/receipt.html index 6e853f9..e94b584 100644 --- a/etc/receipt.html +++ b/etc/receipt.html @@ -7,7 +7,7 @@

[msg arg="__COMPANY__"]Thank you for shopping at %s[/msg]

[msg arg="[value mv_order_number]"]Your Order Number is %s[/msg]

-

[msg arg="[pikul_order [value mv_order_number]]"]Your Tracking Number is %s[/msg]

+

[msg arg="[pikul_order order_number='[value mv_order_number]']"]Your Tracking Number is %s[/msg]

[L]Your order is being electronically processed and will be shipped soon.[/L]

-- cgit v1.2.3