From 571ba05eb2198296870eb5b284ce6c02ea27a045 Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Thu, 21 Feb 2013 13:55:39 +0000 Subject: [PATCH] add tax calculation, restore net price changes --- .../views/tpl/widget/d3_googleanalytics.tpl | 6 ++---- setup+doku/changelog.txt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl index 91a2d95..f51ee02 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl @@ -132,13 +132,11 @@ '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] - - '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', [{* // total - required - has to be gross sum *}] [{else}] '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] - '', [{* // tax *}] + '[{math equation="s - r" s=$order->getTotalOrderSum() r=$order->getOrderNetSum() format="%.2f"}]', [{* // tax *}] '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 88772dd..6b73a34 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,7 +1,7 @@ === 2.4.1 => 3.0.0.0 === - Umstellung auf Struktur des OXID 4.7 / 5.0 - benutzerdefinierte Variablen um "Neukunde" ergänzt -- Tackingcode in verschoben +- Trackingcode in verschoben - optionales Logging integriert === 2.4.0 => 2.4.1 ===