From d2ef663dd30951815adca763573ebb696416b80a Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Thu, 22 Jun 2023 10:37:09 +0200
Subject: [PATCH] add paymentType to puchase-event

extend Basket-Model to add method to get payment-desc
---
 Application/views/blocks/purchase.tpl |  6 +++---
 IntelliSenseHelper.php                |  1 +
 Modules/Application/Model/Basket.php  | 23 +++++++++++++++++++++++
 metadata.php                          |  5 ++++-
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 Modules/Application/Model/Basket.php

diff --git a/Application/views/blocks/purchase.tpl b/Application/views/blocks/purchase.tpl
index 4d26b29..b97219e 100644
--- a/Application/views/blocks/purchase.tpl
+++ b/Application/views/blocks/purchase.tpl
@@ -4,8 +4,8 @@
 <script>
     dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
     [{assign var="gtmOrder"         value=$oView->getOrder()}]
+    [{assign var="gtmBasket"         value=$oView->getBasket()}]
     [{assign var="gtmArticles"      value=$gtmOrder->getOrderArticles()}]
-    [{assign var="gtmOrderPayment"  value=$gtmOrder->getPayment()}]
     [{assign var="gtmOrderVouchers"  value=$gtmOrder->getVoucherNrList()}]
 
     dataLayer.push({
@@ -18,8 +18,8 @@
             'tax':            [{math equation="x+y" x=$gtmOrder->getFieldData("oxartvatprice1") y=$gtmOrder->getFieldData("oxartvatprice2") }],
             'shipping':       [{$gtmOrder->getFieldData("oxdelcost")}],
             'currency':       '[{$gtmOrder->getFieldData('oxcurrency')}]',
-            'coupon':           '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
-            'paymentType':    '[{*$gtmOrderPayment->getFieldData('oxdesc')*}]',
+            'coupon':         '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
+            'paymentType':    '[{$gtmBasket->getPaymentOnPaymentId()}]',
             'items': [
                 [{foreach from=$gtmArticles item="gtmBasketItem" name="gtmArticles"}]
                     [{assign var="gtmPurchaseItemPriceObject"   value=$gtmBasketItem->getPrice()}]
diff --git a/IntelliSenseHelper.php b/IntelliSenseHelper.php
index 2f818cd..2291ade 100644
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@@ -19,4 +19,5 @@ namespace D3\GoogleAnalytics4\Modules\Core{
 
 namespace D3\GoogleAnalytics4\Modules\Application\Model{
     class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
+    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
 }
\ No newline at end of file
diff --git a/Modules/Application/Model/Basket.php b/Modules/Application/Model/Basket.php
new file mode 100644
index 0000000..9c7fa61
--- /dev/null
+++ b/Modules/Application/Model/Basket.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace D3\GoogleAnalytics4\Modules\Application\Model;
+
+use OxidEsales\Eshop\Application\Model\Payment;
+
+class Basket extends Basket_parent
+{
+    /**
+     * @return void
+     */
+    public function getPaymentOnPaymentId() :string
+    {
+        if ($this->getPaymentId()){
+            $oPayment = oxNew(Payment::class);
+            if ($oPayment->load($this->getPaymentId())){
+                return $oPayment->getFieldData('oxdesc');
+            }
+        }
+
+        return "couldn't load payment!";
+    }
+}
\ No newline at end of file
diff --git a/metadata.php b/metadata.php
index 5189199..917c04e 100755
--- a/metadata.php
+++ b/metadata.php
@@ -1,7 +1,9 @@
 <?php
 
+use D3\GoogleAnalytics4\Modules\Application\Model\Basket as Basket;
 use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
+use OxidEsales\Eshop\Application\Model\Basket as OEBasket;
 use OxidEsales\Eshop\Application\Model\Category as OECategory;
 use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;
 
@@ -26,7 +28,8 @@ $aModule          = [
     'url'         => 'https://www.oxidmodule.com/',
     'extend'      => [
         OEViewConfig::class => ViewConfig::class,
-        OECategory::class => Category::class
+        OECategory::class => Category::class,
+        OEBasket::class => Basket::class
     ],
     'templates'   => [
         // GA4 events