Merge remote-tracking branch 'remotes/origin/rel_2.x'

2024-09-19 16:29:08 +02:00 · 2024-08-10 13:56:00 +02:00 · 2024-03-08 10:10:27 +01:00 · 2024-03-08 09:49:12 +01:00 · 2024-01-25 14:50:44 +01:00 · 2024-01-25 14:49:32 +01:00
--- a/Application/Model/ManagerTypes.php
+++ b/Application/Model/ManagerTypes.php
@ -7,25 +7,19 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics;
 class ManagerTypes
 {
    const EXTERNAL_SERVICE          = "eigener Service";
-    const INTERNAL_EXTERNAL_SERVICE          = "externalService";
    const NET_COOKIE_MANAGER        = "Netensio Cookie Manager";
-    const INTERNAL_NET_COOKIE_MANAGER        = "net_cookie_manager";

    /**
     * Further information's:
     * https://github.com/aggrosoft/oxid-cookie-compliance
     */
    const AGCOOKIECOMPLIANCE        = "Aggrosoft Cookie Compliance";
-    const INTERNAL_AGCOOKIECOMPLIANCE        = "agcookiecompliance";

    const CONSENTMANAGER            = "Consentmanager";
-    const INTERNAL_CONSENTMANAGER            = "cmconsentmanager";

    const COOKIEFIRST               = "Cookiefirst";
-    const INTERNAL_COOKIEFIRST               = "cookiefirst";

    const COOKIEBOT                 = "Cookiebot";
-    const INTERNAL_COOKIEBOT                 = "cookiebot";

    /**
     * @return array
@ -33,14 +27,14 @@ class ManagerTypes
    public function getManagerList(): array
    {
        return [
-            self::INTERNAL_EXTERNAL_SERVICE       => self::EXTERNAL_SERVICE,
-            self::INTERNAL_AGCOOKIECOMPLIANCE    => self::AGCOOKIECOMPLIANCE,
-            self::INTERNAL_NET_COOKIE_MANAGER    => self::NET_COOKIE_MANAGER,
+            "externalService"       => self::EXTERNAL_SERVICE,
+            "agcookiecompliance"    => self::AGCOOKIECOMPLIANCE,
+            "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
            Usercentrics::sModuleIncludationInternalName    => Usercentrics::sModuleIncludationPublicName,
            Usercentrics::sExternalIncludationInternalName  => Usercentrics::sExternalIncludationPublicName,
-            self::INTERNAL_CONSENTMANAGER      => self::CONSENTMANAGER,
-            self::INTERNAL_COOKIEFIRST           => self::COOKIEFIRST,
-            self::INTERNAL_COOKIEBOT             => self::COOKIEBOT,
+            "cmconsentmanager"      => self::CONSENTMANAGER,
+            "cookiefirst"           => self::COOKIEFIRST,
+            "cookiebot"             => self::COOKIEBOT,
        ];
    }

@ -52,21 +46,4 @@ class ManagerTypes
    {
        return in_array($sManager, array_keys($this->getManagerList()), true);
    }
-	
-	/**
-	 * @return array
-	 *
-	 * the CMP from this method always needs the script tag delivered to the dom.
-	 */
-	public function scriptTagDeliveredByDefaultArray() :array
-	{
-		return [
-			Usercentrics::sModuleIncludationInternalName,
-			Usercentrics::sExternalIncludationInternalName,
-			ManagerTypes::INTERNAL_CONSENTMANAGER,
-			ManagerTypes::INTERNAL_COOKIEFIRST,
-			ManagerTypes::INTERNAL_COOKIEBOT,
-			ManagerTypes::INTERNAL_EXTERNAL_SERVICE
-		];
-	}
 }
--- a/Application/views/admin/tpl/d3googleanalytics4_main.tpl
+++ b/Application/views/admin/tpl/d3googleanalytics4_main.tpl
@ -80,6 +80,7 @@
                                            [{oxmultilang ident="D3CMP"}]
                                        </label>
                                        <select class="form-select w-50" name="editval[select][_HAS_STD_MANAGER]" aria-label="Default select example">
+                                            <option value="NONE" selected>[{oxmultilang ident="D3NONE"}]</option>
                                            [{foreach from=$d3ManagerTypeArray key="sInternalName" item="sPublicName" name="editval[aCmpNameArray]"}]
                                            <option value="[{$sInternalName}]" [{if $sInternalName === $d3CurrentCMP}]SELECTED[{/if}]>[{$sPublicName}]</option>
                                            [{/foreach}]
--- a/Application/views/blocks/purchase.tpl
+++ b/Application/views/blocks/purchase.tpl
@ -1,3 +1,3 @@
 [{$smarty.block.parent}]

-[{include file="event/purchase.tpl"}]
+[{include file="event/purchase.tpl"}]
--- a/Application/views/event/add_to_cart.tpl
+++ b/Application/views/event/add_to_cart.tpl
@ -1,5 +1,5 @@

-[{if $d3CmpBasket && $d3CmpBasket->d3GtmRequestedArticleLoadedByAnid() !== null}]
+[{if $d3CmpBasket && $d3CmpBasket->getAddToBasketDecision() && $d3CmpBasket->d3GtmRequestedArticleLoadedByAnid() !== null}]
  [{assign var="oGtmProduct"              value=$d3CmpBasket->d3GtmRequestedArticleLoadedByAnid()}]
  [{assign var="oGtmAmountArticlesAdded"  value=$d3CmpBasket->getD3GtmAddToCartAmountArticles()}]
  [{*$smarty.block.parent*}]
@ -12,50 +12,50 @@
  [{block name="d3_ga4_add_to_cart_list_block"}]
    [{capture name="d3_ga4_add_to_cart_listtpl"}]
      [{strip}]
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

-      $(document).ready(function() {
-        $('#toBasket').on('click', function() {
-          dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      [{*** Debug cases ***}]
+      [{*event.preventDefault();*}]

-          [{*** Debug cases ***}]
-          [{*event.preventDefault();*}]
+      let iArtQuantity = $("[{$htmlIdAmountOfArticles}]").val();
+      let iArtQuantityAdded = [{$oGtmAmountArticlesAdded}];

-          let iArtQuantity = $("[{$htmlIdAmountOfArticles}]").val();
-          let iPriceValue = [{$d3PriceObject->getPrice()}];
-          let iSumPrice = iArtQuantity*iPriceValue;
+      if(!iArtQuantity && (iArtQuantityAdded === 1)){
+        iArtQuantity = 1;
+      }else{
+        iArtQuantity = iArtQuantityAdded;
+      }

-          dataLayer.push({
-            'isAddToBasket': true,
-            'event':'add_to_cart',
-            'eventLabel': 'add_to_cart',
-            'ecommerce': {
-            'currency':   "[{$currency->name}]",
-            'value':      parseInt(iSumPrice.toFixed(2)),
-            'items':      [
-              {
-                'item_id':        '[{$oGtmProduct->getFieldData('oxartnum')}]',
-                'item_name':      '[{$oGtmProduct->getFieldData('oxtitle')}]',
-                'price':          [{$d3PriceObject->getPrice()}],
-                'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                'item_variant':   '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': iArtQuantity
-              }
-            ]
-            }[{if $oViewConf->isDebugModeOn()}],
-            'debug_mode': 'true'
-            [{/if}]
-          });
-        });
+      dataLayer.push({
+        'isAddToBasket': true,
+        'event':'add_to_cart',
+        'eventLabel': 'add_to_cart',
+        'ecommerce': {
+          'currency':   "[{$currency->name}]",
+          'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+          'items':      [
+            {
+              'item_id':        '[{$oGtmProduct->getFieldData('oxartnum')}]',
+              'item_name':      '[{$oGtmProduct->getFieldData('oxtitle')}]',
+              'price':          [{$d3PriceObject->getPrice()}],
+              'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_variant':   '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
+              [{if $gtmCategory}]
+              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
+              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+              [{/if}]
+              'quantity': iArtQuantity
+            }
+          ]
+        }[{if $oViewConf->isDebugModeOn()}],
+        'debug_mode': 'true'
+        [{/if}]
      });
      [{/strip}]
    [{/capture}]
-      [{oxscript add=$smarty.capture.d3_ga4_add_to_cart_listtpl}]
-    [{/block}]
-  [{/if}]
+    [{oxscript add=$smarty.capture.d3_ga4_add_to_cart_listtpl}]
+  [{/block}]
+[{/if}]
--- a/Application/views/event/view_item.tpl
+++ b/Application/views/event/view_item.tpl
@ -5,10 +5,8 @@
 [{block name="d3_ga4_view_item_block"}]
    [{capture name="d3_ga4_view_item"}]
        [{strip}]
-
-    (function checkGTM() {
-        if (window.google_tag_manager && window.google_tag_manager.dataLayer && window.google_tag_manager.dataLayer.gtmDom === true) {
            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+
            dataLayer.push({
                'event': 'view_item',
                'eventLabel':'Product View',
@ -18,29 +16,25 @@
                    'items':
                        [
                            {
-                            'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                            'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                            'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                            'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
-                            [{if $gtmCategory}]
-                            'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                            'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                            'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                            'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                            'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-                            'price': [{$d3PriceObject->getPrice()}]
+                                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                                'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
+                                [{if $gtmCategory}]
+                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
+                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
+                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
+                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
+                                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+                                [{/if}]
+                                [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+                                'price': [{$d3PriceObject->getPrice()}]
                            }
                        ]
                }[{if $oViewConf->isDebugModeOn()}],
                'debug_mode': 'true'
                [{/if}]
            });
-        } else {
-        setTimeout(checkGTM, 100);
-        }
-    })();
        [{/strip}]
    [{/capture}]
    [{oxscript add=$smarty.capture.d3_ga4_view_item}]
--- a/Application/views/ga4/remove_from_cart.tpl
+++ b/Application/views/ga4/remove_from_cart.tpl
@ -1,48 +0,0 @@
-[{$smarty.block.parent}]
-
-[{block name="d3_ga4_remove_from_cart_block"}]
-    [{if $hasBeenReloaded}]
-        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture assign=d3_ga4_remove_from_cart}]
-            [{strip}]
-                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-                dataLayer.push({
-                    'isRemoveFromCart': true,
-                    'event': 'remove_from_cart',
-                    'eventLabel':'remove_from_cart',
-                    'ecommerce': {
-                        'actionField': "step: 1",
-                        'currency': "[{$currency->name}]",
-                        'value': [{$d3BasketPrice->getPrice()}],
-                        'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$toRemoveArticles->getArray() name=gtmRemovedItems item=rmItem  key=rmItemindex}]
-                            [{assign var="d3oItemPrice" value=$rmItem->getPrice()}]
-                            [{assign var="gtmBasketItemCategory" value=$rmItem->getCategory()}]
-                            {
-                            'item_id':          '[{$rmItem->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$rmItem->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$rmItem->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
-                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$d3oItemPrice->getPrice()}],
-                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                            'quantity':         '[{$rmItem->getFieldData('d3AmountThatGotRemoved')}]',
-                            'position':         [{$smarty.foreach.gtmRemovedItems.index}]
-                            }[{if !$smarty.foreach.gtmRemovedItems.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$d3_ga4_remove_from_cart}]
-    [{/if}]
-[{/block}]
--- a/Application/views/ga4/view_search_result.tpl
+++ b/Application/views/ga4/view_search_result.tpl
@ -1,44 +0,0 @@
-[{$smarty.block.parent}]
-
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts}]
-    [{capture assign=d3_ga4_view_search_result}]
-      [{strip}]
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-          'event': 'view_search_result',
-          'eventLabel':'view_search_result[{if $oViewConf->isDebugModeOn()}]_test[{/if}]',
-          'ecommerce': {
-            'search_term': '[{$searchparamforhtml}]',
-            'items': [
-              [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-              [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-              {
-                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                'price': [{$d3PriceObject->getPrice()}],
-                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': 1
-              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-              [{/foreach}]
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$d3_ga4_view_search_result}]
-  [{/if}]
-[{/block}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,12 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [unreleased](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.17.2...rel_2.x) - 2024-x

-## [2.22.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.21.0...2.22.0) - 2024-09-21
-### Fixed
- Consentmanager didn't get delivered
-### Changed
- write "internal_names" of CMP to constants
-
 ## [2.21.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.20.1...2.21.0) - 2024-09-19
 ### Fixed
 - missing parameters for widget.php call
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -17,8 +17,9 @@ use D3\GoogleAnalytics4\Application\Model\Constants;
 use D3\GoogleAnalytics4\Application\Model\ManagerHandler;
 use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
+use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\Eshop\Core\Config;
-use OxidEsales\Eshop\Application\Model\User;use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 use Psr\Container\ContainerExceptionInterface;
@ -57,7 +58,6 @@ class ViewConfig extends ViewConfig_parent
            $this->sCookieManagerType = $oManagerHandler->getCurrManager();
        }
    }
-
    /**
     * @return bool
     */
@ -88,7 +88,7 @@ class ViewConfig extends ViewConfig_parent
        $sCookieID = trim($this->d3GetModuleConfigParam('_sControlParameter'));

        // Netensio Cookie Manager
-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_NET_COOKIE_MANAGER) {
+        if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
            $oSession = Registry::getSession();
            $aCookies = $oSession->getVariable("aCookieSel");

@ -96,25 +96,26 @@ class ViewConfig extends ViewConfig_parent
        }

        // Aggrosoft Cookie Consent
-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_AGCOOKIECOMPLIANCE) {
+        if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) {
            if (method_exists($this, "isCookieCategoryEnabled")) {
                return $this->isCookieCategoryEnabled($sCookieID);
            }
        }
-		
+
+        // UserCentrics or consentmanager
        if (
-	        in_array
-	        (
-				$this->sCookieManagerType,
-				(oxNew(ManagerTypes::class)->scriptTagDeliveredByDefaultArray())
-	        )
+            $this->sCookieManagerType       === Usercentrics::sModuleIncludationInternalName
+            or $this->sCookieManagerType    === Usercentrics::sExternalIncludationInternalName
+            or $this->sCookieManagerType    === ManagerTypes::CONSENTMANAGER
+            or $this->sCookieManagerType    === ManagerTypes::COOKIEFIRST
+            or $this->sCookieManagerType    === ManagerTypes::COOKIEBOT
+            or $this->sCookieManagerType    === ManagerTypes::EXTERNAL_SERVICE
        )
        {
            // Always needs the script-tags delivered to the DOM.
            return true;
        }

-        // Cookie Manager not (yet) supported
        return false;
    }

@ -139,16 +140,16 @@ class ViewConfig extends ViewConfig_parent
            return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_CONSENTMANAGER)
+        if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
        {
            return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEFIRST){
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
            return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEBOT){
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){
            return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"';
        }

--- a/metadata.php
+++ b/metadata.php
@ -52,7 +52,7 @@ $aModule = [
                      Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
                      ",
    'thumbnail' => 'thumbnail.png',
-    'version' => '2.22.0',
+    'version' => '2.21.0',
    'author' => 'Data Development (Inh.: Thomas Dartsch)',
    'email' => 'support@shopmodule.com',
    'url' => 'https://www.oxidmodule.com/',
Autor	SHA1	Nachricht	Datum
MaxBuhe01	8097ed01c6	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2024-09-19 16:29:08 +02:00
MaxBuhe01	96e5adbece	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2024-08-10 13:56:00 +02:00
MaxBUhe	8a643a0b8a	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2024-03-08 10:10:27 +01:00
MaxBUhe	7d23204841	Merge remote-tracking branch 'remotes/origin/rel_1.x'	2024-03-08 09:49:12 +01:00
MaxBUhe	c7d3671265	[Bump] Changelog && Metadata	2024-01-25 14:50:44 +01:00
MaxBUhe	3621ca606a	[Fix] missing Component-ArticleDetails extension; missing ManufacturerList-Extension	2024-01-25 14:49:32 +01:00
MaxBUhe	e3f4bd16c9	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2024-01-03 13:49:08 +01:00
MaxBUhe	42618fef79	Merge remote-tracking branch 'remotes/origin/rel_2.x' # Conflicts: # Modules/Core/ViewConfig.php	2023-09-13 16:18:43 +02:00
MaxBUhe	f02c40cfb7	Merge remote-tracking branch 'remotes/origin/rel_1.x' # Conflicts: # Application/views/admin/de/module_options.php # Application/views/ga4/view_item_list.tpl # CHANGELOG.md # Docs/README.md # IntelliSenseHelper.php # Modules/Core/ViewConfig.php # metadata.php	2023-09-13 16:13:03 +02:00
MaxBUhe	154147b8d8	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-09-07 15:22:13 +02:00
MaxBUhe	43cdc7e8ae	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-08-02 11:57:26 +02:00
MaxBUhe	461f7f15da	Merge remote-tracking branch 'remotes/origin/rel_1.x' # Conflicts: # Application/views/admin/de/module_options.php # Application/views/ga4/view_item_list.tpl # CHANGELOG.md # Modules/Core/ViewConfig.php # composer.json # metadata.php	2023-06-27 10:03:51 +02:00
MaxBUhe	4f8fa7cdc9	Merge remote-tracking branch 'remotes/origin/rel_2.x' # Conflicts: # CHANGELOG.md	2023-06-27 09:59:00 +02:00
MaxBUhe	7266416fe4	Merge remote-tracking branch 'remotes/origin/rel_2.x' # Conflicts: # metadata.php	2023-06-19 15:25:00 +02:00
MaxBUhe	389d4f44ed	Merge remote-tracking branch 'remotes/origin/rel_1.x' # Conflicts: # CHANGELOG.md # metadata.php	2023-06-19 15:23:42 +02:00
MaxBUhe	41d6e94fa7	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-05-31 14:55:26 +02:00
MaxBUhe	b8e2aeaa58	Merge remote-tracking branch 'remotes/origin/rel_1.x' # Conflicts: # Application/views/admin/de/module_options.php # Application/views/ga4/view_item_list.tpl # CHANGELOG.md # Modules/Core/ViewConfig.php # metadata.php	2023-05-31 14:51:07 +02:00