Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mediacode und Shopgate rausgenommen. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,6 @@ class blatm_events extends oxI18n
{
public static function onActivate()
{
/** @var oxLegacyDb $oDb */
$oDb = oxDb::getDB();
$aColumns = $oDb->getAssoc("SHOW COLUMNS FROM oxorder");

// rename BLAREFERRER column -> BLAHTTPREF or create new
if( array_key_exists( "BLAREFERRER", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAREFERRER` `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla/tag-manager http ref'");
else if(!array_key_exists( "BLAHTTPREF", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla/tag-manager http ref'");

// rename BLAMEDIACODE column -> BLAREF or create new
if( array_key_exists( "BLAMEDIACODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAMEDIACODE` `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager ref'");
else if(!array_key_exists( "BLAREF", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager ref'");

// rename BLASUBCODE column -> BLASUBREF or create new
if( array_key_exists( "BLASUBCODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLASUBCODE` `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager subref'");
else if(!array_key_exists( "BLASUBREF", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager subref'");

// regenerating DB views
$oMetaData = oxNew('oxDbMetaDataHandler');
$oMetaData->updateViews();

//clear tmp
foreach (glob(oxRegistry::getConfig()->getConfigParam("sCompileDir") . "smarty/*") as $item) if (!is_dir($item)) unlink($item);
}
Expand All @@ -45,4 +25,4 @@ public static function onActivate()
public static function onDeactivate() {
}
*/
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
'name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
'variant':'[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
'price': [{$_price->getPrice()}],
'item_price': [{$_price->getPrice()}],
'quantity':[{$basketitem->getAmount()}],
'position':[{$smarty.foreach.gtmCartContents.index}]
}[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
Expand Down Expand Up @@ -58,4 +59,4 @@
[{oxscript add=$smarty.capture.removeFromBasket}]
</script>
[{/strip}]
[{$smarty.block.parent}]
[{$smarty.block.parent}]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[{*
dataLayer.push({
'event': 'ee.checkout',
'eventLabel':'Checkout 5',
'eventLabel':'Checkout 5',
'ecommerce': {'checkout': {'actionField': {'step': 5}}}
});
*}]
Expand Down

This file was deleted.

76 changes: 22 additions & 54 deletions copy_this/modules/bla/tag-manager/metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,26 @@

$sMetadataVersion = '1.1';
$aModule = [
'id' => 'tag-manager',
'title' => '<strong style="color:#95b900;font-size:125%;">best</strong><strong style="color:#c4ca77;font-size:125%;">life</strong> <strong>Tag Manager</strong>',
'description' => 'Tag Manager integration for OXID eShop: Google, Matomo and Yandex',
'thumbnail' => '../bestlife.png',
'version' => '0.2.0 ( 2018-12-04 )',
'author' => 'Marat Bedoev, bestlife AG',
'email' => '[email protected]',
'url' => 'https://github.com/vanilla-thunder/oxid-module-tag-manager',
'extend' => [
// http ref & co
'oxorder' => 'bla/tag-manager/application/extend/oxorder_blatm',
'oxsession' => 'bla/tag-manager/application/extend/oxsession_blatm',
// ref Anpassung für Shopgate
'ShopgatePluginOxid' => 'bla/tag-manager/application/extend/ShopgatePluginOxid_blatm',
// ecommerce tracking
'oxviewconfig' => 'bla/tag-manager/application/extend/oxviewconf_blatm'
],
'files' => [
'blatm_events' => 'bla/tag-manager/application/files/blatm_events.php',
],
'events' => [
'onActivate' => 'blatm_events::onActivate'
],
'templates' => [],
'blocks' => [
// refs
[
'template' => 'order_overview.tpl',
'block' => 'admin_order_overview_checkout',
'file' => '/application/views/admin/blocks/admin_order_overview_checkout.tpl'
],
[
'template' => 'email/html/order_owner.tpl',
'block' => 'email_html_order_owner_orderemail',
'file' => '/application/views/blocks/email_html_order_owner_orderemail.tpl'
],
'id' => 'tag-manager',
'title' => '<strong style="color:#95b900;font-size:125%;">best</strong><strong style="color:#c4ca77;font-size:125%;">life</strong> <strong>Tag Manager</strong>',
'description' => 'Tag Manager integration for OXID eShop: Google, Matomo and Yandex',
'thumbnail' => '../bestlife.png',
'version' => '0.2.0 ( 2018-12-04 )',
'author' => 'Marat Bedoev, bestlife AG',
'email' => '[email protected]',
'url' => 'https://github.com/vanilla-thunder/oxid-module-tag-manager',
'extend' => [
// ecommerce tracking
'oxviewconfig' => 'bla/tag-manager/application/extend/oxviewconf_blatm'
],
'files' => [
'blatm_events' => 'bla/tag-manager/application/files/blatm_events.php',
],
'events' => [
'onActivate' => 'blatm_events::onActivate'
],
'templates' => [],
'blocks' => [
// tag manager js
[
'template' => 'layout/base.tpl',
Expand Down Expand Up @@ -153,29 +137,13 @@
'type' => 'str',
'value' => ''
],
[
'group' => 'bla_tm_Main',
'name' => 'bla_tm_defaultref',
'type' => 'str',
'value' => '123456'
],
[
'group' => 'bla_tm_Main',
'name' => 'bla_tm_shopgateref',
'type' => 'str',
'value' => 'SHOPGATE'
]
]
],
];


/* todo:

modified: application/translations/de/blagtm_lang.php
modified: application/views/blocks/base_head_meta_robots.tpl
modified: application/views/blocks/ee/impression.tpl
modified: application/views/blocks/ee/s5_thankyou.tpl
modified: application/views/blocks/email_html_order_owner_orderemail.tpl
modified: application/views/blocks/theme_svg_icons.tpl

*/
*/