#4509: changed_full entfernen
This commit is contained in:
RayEhrhardt
parent
7de297e12b
commit
17c0f2231e
@ -1,8 +1,8 @@
|
|||||||
[{strip}]
|
[{strip}]
|
||||||
[{if $oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode') &&
|
[{if $oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode') &&
|
||||||
(false == $oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou')}]
|
(false == $oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou')}]
|
||||||
|
|
||||||
[{$oD3GASettings->getValue('sD3GACampaignCode')}]
|
[{$oD3GASettings->getValue('sD3GACampaignCode')}]
|
||||||
|
|
||||||
[{/if}]
|
[{/if}]
|
||||||
[{/strip}]
|
[{/strip}]
|
||||||
@ -1,87 +1,87 @@
|
|||||||
[{block name="UniversalTrustedStoreBadge"}]
|
[{block name="UniversalTrustedStoreBadge"}]
|
||||||
[{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}]
|
[{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}]
|
||||||
<!-- BEGIN: Google Certified Shops -->
|
<!-- BEGIN: Google Certified Shops -->
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var gts = gts || [];
|
var gts = gts || [];
|
||||||
|
|
||||||
[{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
|
[{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
|
||||||
gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]);
|
gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]);
|
||||||
gts.push(["badge_position", "BOTTOM_RIGHT"]);
|
gts.push(["badge_position", "BOTTOM_RIGHT"]);
|
||||||
gts.push(["locale", "[{$sD3CurrentGTSLang}]"]);
|
gts.push(["locale", "[{$sD3CurrentGTSLang}]"]);
|
||||||
[{if $sD3GATSProdId}]
|
[{if $sD3GATSProdId}]
|
||||||
gts.push(["google_base_offer_id", "[{$sD3GATSProdId}]"]);
|
gts.push(["google_base_offer_id", "[{$sD3GATSProdId}]"]);
|
||||||
[{/if}]
|
[{/if}]
|
||||||
gts.push(["google_base_subaccount_id", "[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]"]);
|
gts.push(["google_base_subaccount_id", "[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]"]);
|
||||||
gts.push(["google_base_country", "[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]"]);
|
gts.push(["google_base_country", "[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]"]);
|
||||||
gts.push(["google_base_language", "[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]"]);
|
gts.push(["google_base_language", "[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]"]);
|
||||||
[{/if}]
|
[{/if}]
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var gts = document.createElement("script");
|
var gts = document.createElement("script");
|
||||||
gts.type = "text/javascript";
|
gts.type = "text/javascript";
|
||||||
gts.async = true;
|
gts.async = true;
|
||||||
gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
|
gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
|
||||||
var s = document.getElementsByTagName("script")[0];
|
var s = document.getElementsByTagName("script")[0];
|
||||||
s.parentNode.insertBefore(gts, s);
|
s.parentNode.insertBefore(gts, s);
|
||||||
})();
|
})();
|
||||||
</script>
|
</script>
|
||||||
<!-- END: Google Certified Shops -->
|
<!-- END: Google Certified Shops -->
|
||||||
[{/block}]
|
[{/block}]
|
||||||
|
|
||||||
[{if $oViewConf->getActiveClassName() == 'thankyou'}]
|
[{if $oViewConf->getActiveClassName() == 'thankyou'}]
|
||||||
[{block name="UniversalTrustedStoreOrderInfo"}]
|
[{block name="UniversalTrustedStoreOrderInfo"}]
|
||||||
[{* https://support.google.com/trustedstoresmerchant/answer/6063087?hl=de&ref_topic=6063044 *}]
|
[{* https://support.google.com/trustedstoresmerchant/answer/6063087?hl=de&ref_topic=6063044 *}]
|
||||||
|
|
||||||
[{assign var="oOrder" value=$oView->getOrder()}]
|
[{assign var="oOrder" value=$oView->getOrder()}]
|
||||||
[{assign var="oOrderCurrency" value=$oOrder->getOrderCurrency()}]
|
[{assign var="oOrderCurrency" value=$oOrder->getOrderCurrency()}]
|
||||||
[{assign var="oUser" value=$oOrder->getOrderUser()}]
|
[{assign var="oUser" value=$oOrder->getOrderUser()}]
|
||||||
[{assign var="oUserCountry" value=$oView->d3GAGetUserCountry()}]
|
[{assign var="oUserCountry" value=$oView->d3GAGetUserCountry()}]
|
||||||
[{if $oD3GASettings->getValue('blD3GAUseNetto')}]
|
[{if $oD3GASettings->getValue('blD3GAUseNetto')}]
|
||||||
[{assign var="sTotal" value=$oOrder->getOrderNetSum()}] [{* // total - required - has to be gross sum *}]
|
[{assign var="sTotal" value=$oOrder->getOrderNetSum()}] [{* // total - required - has to be gross sum *}]
|
||||||
[{else}]
|
[{else}]
|
||||||
[{assign var="sTotal" value=$oOrder->getTotalOrderSum()}] [{* // total - required *}]
|
[{assign var="sTotal" value=$oOrder->getTotalOrderSum()}] [{* // total - required *}]
|
||||||
[{/if}]
|
[{/if}]
|
||||||
|
|
||||||
<!-- START Google Trusted Stores Order -->
|
<!-- START Google Trusted Stores Order -->
|
||||||
<div id="gts-order" style="display:none;" translate="no">
|
<div id="gts-order" style="display:none;" translate="no">
|
||||||
<!-- start order and merchant information -->
|
<!-- start order and merchant information -->
|
||||||
<span id="gts-o-id">[{$oOrder->getFieldData('oxordernr')}]</span>
|
<span id="gts-o-id">[{$oOrder->getFieldData('oxordernr')}]</span>
|
||||||
<span id="gts-o-domain">[{$oxcmp_shop->oxshops__oxurl->value}]</span>
|
<span id="gts-o-domain">[{$oxcmp_shop->oxshops__oxurl->value}]</span>
|
||||||
<span id="gts-o-email">[{$oUser->getFieldData('oxusername')}]</span>
|
<span id="gts-o-email">[{$oUser->getFieldData('oxusername')}]</span>
|
||||||
<span id="gts-o-country">[{$oUserCountry->getFieldData('oxisoalpha2')}]</span>
|
<span id="gts-o-country">[{$oUserCountry->getFieldData('oxisoalpha2')}]</span>
|
||||||
<span id="gts-o-currency">[{$oOrderCurrency->name}]</span>
|
<span id="gts-o-currency">[{$oOrderCurrency->name}]</span>
|
||||||
<span id="gts-o-total">[{$sTotal|string_format:"%.2f"}]</span>
|
<span id="gts-o-total">[{$sTotal|string_format:"%.2f"}]</span>
|
||||||
<span id="gts-o-discounts">-[{$oOrder->getFieldData('oxdiscount')|string_format:"%.2f"}]</span>
|
<span id="gts-o-discounts">-[{$oOrder->getFieldData('oxdiscount')|string_format:"%.2f"}]</span>
|
||||||
<span id="gts-o-shipping-total">[{$oOrder->getFieldData('oxdelcost')|string_format:"%.2f"}]</span>
|
<span id="gts-o-shipping-total">[{$oOrder->getFieldData('oxdelcost')|string_format:"%.2f"}]</span>
|
||||||
<span id="gts-o-tax-total">[{$oOrder->d3GetTaxTotal()}]</span>
|
<span id="gts-o-tax-total">[{$oOrder->d3GetTaxTotal()}]</span>
|
||||||
<span id="gts-o-est-delivery-date">[{$oView->d3GAgetEstimatedDeliveryDate()|date_format:"%Y-%m-%d"}]</span>
|
<span id="gts-o-est-delivery-date">[{$oView->d3GAgetEstimatedDeliveryDate()|date_format:"%Y-%m-%d"}]</span>
|
||||||
<span id="gts-o-est-ship-date">[{$oView->d3GAgetEstimatedShippingDate()|date_format:"%Y-%m-%d"}]</span>
|
<span id="gts-o-est-ship-date">[{$oView->d3GAgetEstimatedShippingDate()|date_format:"%Y-%m-%d"}]</span>
|
||||||
<span id="gts-o-has-preorder">[{$oView->d3GAhasBackorderPreorder()}]</span>
|
<span id="gts-o-has-preorder">[{$oView->d3GAhasBackorderPreorder()}]</span>
|
||||||
<span id="gts-o-has-digital">[{$oView->d3GAhasDigitalGoods()}]</span>
|
<span id="gts-o-has-digital">[{$oView->d3GAhasDigitalGoods()}]</span>
|
||||||
<!-- end order and merchant information -->
|
<!-- end order and merchant information -->
|
||||||
|
|
||||||
<!-- start repeated item specific information -->
|
<!-- start repeated item specific information -->
|
||||||
[{foreach from=$order->getOrderArticles() item=oOrderArticle}]
|
[{foreach from=$order->getOrderArticles() item=oOrderArticle}]
|
||||||
[{if $oD3GASettings->getValue('blD3GAUseNetto')}]
|
[{if $oD3GASettings->getValue('blD3GAUseNetto')}]
|
||||||
[{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxnprice->value}]
|
[{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxnprice->value}]
|
||||||
[{else}]
|
[{else}]
|
||||||
[{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxprice->value}]
|
[{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxprice->value}]
|
||||||
[{/if}]
|
[{/if}]
|
||||||
|
|
||||||
<span class="gts-item">
|
<span class="gts-item">
|
||||||
<span class="gts-i-name">[{$oOrderArticle->oxorderarticles__oxtitle->value|escape:"quotes"}]</span>
|
<span class="gts-i-name">[{$oOrderArticle->oxorderarticles__oxtitle->value|escape:"quotes"}]</span>
|
||||||
<span class="gts-i-price">[{$sPrice|string_format:"%.2f"}]</span>
|
<span class="gts-i-price">[{$sPrice|string_format:"%.2f"}]</span>
|
||||||
<span class="gts-i-quantity">[{$oOrderArticle->getFieldData('oxamount')}]</span>
|
<span class="gts-i-quantity">[{$oOrderArticle->getFieldData('oxamount')}]</span>
|
||||||
[{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
|
[{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
|
||||||
<span class="gts-i-prodsearch-id">[{$oView->d3GAgetProductId($oOrderArticle)}]</span>
|
<span class="gts-i-prodsearch-id">[{$oView->d3GAgetProductId($oOrderArticle)}]</span>
|
||||||
<span class="gts-i-prodsearch-store-id">[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]</span>
|
<span class="gts-i-prodsearch-store-id">[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]</span>
|
||||||
<span class="gts-i-prodsearch-country">[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]</span>
|
<span class="gts-i-prodsearch-country">[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]</span>
|
||||||
<span class="gts-i-prodsearch-language">[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]</span>
|
<span class="gts-i-prodsearch-language">[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]</span>
|
||||||
[{/if}]
|
[{/if}]
|
||||||
</span>
|
</span>
|
||||||
[{/foreach}]
|
[{/foreach}]
|
||||||
<!-- end repeated item specific informations -->
|
<!-- end repeated item specific informations -->
|
||||||
</div>
|
</div>
|
||||||
<!-- END Google Trusted Stores Order -->
|
<!-- END Google Trusted Stores Order -->
|
||||||
[{/block}]
|
[{/block}]
|
||||||
[{/if}]
|
[{/if}]
|
||||||
@ -1,6 +1,7 @@
|
|||||||
=> 3.4.0.1
|
=> 3.4.0.1
|
||||||
- #5078: ecomm_totalvalue darf nicht in Apostrophen stehen
|
- #5078: ecomm_totalvalue darf nicht in Apostrophen stehen
|
||||||
- #4814: Remarketing: Werte für ecomm_pagetype anpassen
|
- #4814: Remarketing: Werte für ecomm_pagetype anpassen
|
||||||
|
- #4509: changed_full entfernen
|
||||||
|
|
||||||
=> 3.4.0.0
|
=> 3.4.0.0
|
||||||
- Remarketing (via Analytics) eingefügt
|
- Remarketing (via Analytics) eingefügt
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user