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