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

Application/views/blocks/checkout_s1.tpl

@@ -11,7 +11,7 @@
         'ecommerce': {
             'actionField': "step: 1",
             'currency': "[{$currency->name}]",
-            'value': [{$oxcmp_basket->getBruttoSum()}],
+            'value': [{oxprice price=$oxcmp_basket->getPrice()}],
             'items': [
                 [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
                 [{assign var='_price' value=$basketitem->getUnitPrice()}]

Application/views/ga4/add_to_cart.tpl

@@ -3,6 +3,7 @@
 [{*$gtmProduct|get_class_methods|dumpvar*}]
 
 [{capture assign=d3_ga4_add_to_cart}]
+[{block name="d3_ga4_add_to_basket"}]
   $("#toBasket").click(function(event) {
     [{*event.preventDefault();*}]
 
@@ -38,7 +39,7 @@
       }
     });
   });
-
+[{/block}]
 [{/capture}]
 [{oxscript add=$d3_ga4_add_to_cart}]
 

CHANGELOG.md

@@ -5,8 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...2.0) - 2023-01-20
-### Changed
 - using of ContainerFactory in ViewConfig
+## [1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.1) - 2023-01-27
+### Added
+- block section for add_to_basket js
+- template block order positions
 
 ## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.0) - 2023-01-20
 ### Added

Modules/Core/ViewConfig.php

@@ -1,24 +1,19 @@
 <?php
-
 /**
- * This Software is the property of Data Development and is protected
- * by copyright law - it is NOT Freeware.
- * Any unauthorized use of this software without a valid license
- * is a violation of the license agreement and will be prosecuted by
- * civil and criminal law.
- * http://www.shopmodule.com
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link          http://www.oxidmodule.com
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
  */
 
 namespace D3\GoogleAnalytics4\Modules\Core;
 
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Core\Registry;
-use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 
 class ViewConfig extends ViewConfig_parent
 {

README.md

@@ -20,17 +20,8 @@ Weiterführende Informationen: https://developers.google.com/analytics/devguides
 
 Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in der [composer.json](composer.json) definierten Version.
 
-Bitte tragen Sie den folgenden Abschnitt in die `composer.json` Ihres Projektes ein:
-
-```
-  "extra": {
-    optionale Anweisungen von 3rd-Party-Packages (z.B. Patch- oder Symlink-Anweisungen)
-  }
-```
-
 Öffnen Sie eine Kommandozeile und navigieren Sie zum Stammverzeichnis des Shops (Elternverzeichnis von source und vendor). Führen Sie den folgenden Befehl aus. Passen Sie die Pfadangaben an Ihre Installationsumgebung an.
 
-
 ```bash
 php composer require d3/google-analytics4:^1
 ```

metadata.php

@@ -111,13 +111,15 @@ $aModule          = [
         [
             'template' => 'widget/product/list.tpl',
             'block'    => 'd3Ga4_view_item_list',
-            'file'     => '/Application/views/ga4/view_item_list.tpl'
+            'file'     => '/Application/views/ga4/view_item_list.tpl',
+            'position' => 150
         ],
         // view_search_result
         [
             'template' => 'page/search/search.tpl',
             'block'    => 'search_results',
-            'file'     => '/Application/views/ga4/search.tpl'
+            'file'     => '/Application/views/ga4/search.tpl',
+            'position' => 150
         ],
         // add_to_cart
         [