D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

add tax calculation, restore net price changes

Browse Source
This commit is contained in:
Daniel Seifert 2013-02-21 13:55:39 +00:00
parent e09ce9efe6
commit 571ba05eb2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
View File

@ -132,13 +132,11 @@
'[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}]
'[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}]
[{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{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->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 *}]
[{else}] [{else}]
'[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}]
[{/if}] [{/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 *}] '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}]
'[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}]
'[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}]

2
setup+doku/changelog.txt
View File

@ -1,7 +1,7 @@
=== 2.4.1 => 3.0.0.0 === === 2.4.1 => 3.0.0.0 ===
- Umstellung auf Struktur des OXID 4.7 / 5.0 - Umstellung auf Struktur des OXID 4.7 / 5.0
- benutzerdefinierte Variablen um "Neukunde" ergänzt - benutzerdefinierte Variablen um "Neukunde" ergänzt
- Tackingcode in <head> verschoben - Trackingcode in <head> verschoben
- optionales Logging integriert - optionales Logging integriert
=== 2.4.0 => 2.4.1 === === 2.4.0 => 2.4.1 ===