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. --- config/pikul_order.tag | 12 +++++++++--- etc/log_transaction | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) 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 <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.2.3