diff options
| -rw-r--r-- | config/pikul_order.tag | 12 | ||||
| -rw-r--r-- | etc/log_transaction | 2 |
2 files changed, 4 insertions, 10 deletions
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]"] |