From 5e652ed4c51c5fea45fc230e369c337487b6b93b Mon Sep 17 00:00:00 2001
From: Franz Holzinger <franz.holzinger@festwein.de>
Date: Fri, 12 Jul 2024 14:59:05 +0200
Subject: [PATCH 1/3] -

---
 model/class.tx_ttproducts_product.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/class.tx_ttproducts_product.php b/model/class.tx_ttproducts_product.php
index 742969533..895bf75b3 100644
--- a/model/class.tx_ttproducts_product.php
+++ b/model/class.tx_ttproducts_product.php
@@ -236,7 +236,7 @@ public function getMatchingArticleRows(
                 }
             }
             $articleCount = count($bFitArticleRowArray);
-            $articleRow = $bFitArticleRowArray[0];
+            $articleRow = $bFitArticleRowArray[0] ?? [];
 
             if ($articleCount > 1) {
                 // many articles fit here. So lets generated a merged article.

From 6230c28b93f5f0a13e5adc97fde721706efcbd9e Mon Sep 17 00:00:00 2001
From: Franz Holzinger <franz.holzinger@festwein.de>
Date: Fri, 12 Jul 2024 14:59:30 +0200
Subject: [PATCH 2/3] next version 2.15.11

---
 ext_emconf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext_emconf.php b/ext_emconf.php
index e653c4872..a792823ab 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -6,7 +6,7 @@
   'title' => 'Shop System',
   'description' => 'Advanced versions at ttproducts.de. Documented in the E-Book "Der TYPO3-Webshop" - Shop with listing in multiple languages, with order tracking, product variants, support for transactor extension, bill, creditpoint and voucher system.',
   'state' => 'stable',
-  'version' => '2.15.10',
+  'version' => '2.15.11',
   'manual' => true,
   'author' => 'Franz Holzinger',
   'author_company' => 'jambage.com',

From 61ec6ea9fb0c5e73c3dac507b6aad679da8d3d6d Mon Sep 17 00:00:00 2001
From: Franz Holzinger <franz.holzinger@festwein.de>
Date: Wed, 17 Jul 2024 17:58:18 +0200
Subject: [PATCH 3/3] -

---
 Classes/Api/PaymentShippingHandling.php | 4 ++--
 eid/class.tx_ttproducts_db.php          | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Classes/Api/PaymentShippingHandling.php b/Classes/Api/PaymentShippingHandling.php
index 3b48f61b7..6158d6cea 100644
--- a/Classes/Api/PaymentShippingHandling.php
+++ b/Classes/Api/PaymentShippingHandling.php
@@ -1815,7 +1815,7 @@ public static function useAccount($basketExtra)
         return $result;
     }
 
-    public static function getHandleLib($request, $basketExtra)
+    public static function getHandleLib($requestMode, $basketExtra)
     {
         $result = false;
         $payConf = $basketExtra['payment.'] ?? [];
@@ -1833,7 +1833,7 @@ public static function getHandleLib($request, $basketExtra)
             isset($payConf['handleLib.']) &&
             is_array($payConf['handleLib.']) &&
             isset($payConf['handleLib.']['gatewaymode']) &&
-            $payConf['handleLib.']['gatewaymode'] == $request &&
+            $payConf['handleLib.']['gatewaymode'] == $requestMode &&
             ExtensionManagementUtility::isLoaded($handleLib)
         ) {
             $result = $handleLib;
diff --git a/eid/class.tx_ttproducts_db.php b/eid/class.tx_ttproducts_db.php
index 6c858861a..98ad97252 100644
--- a/eid/class.tx_ttproducts_db.php
+++ b/eid/class.tx_ttproducts_db.php
@@ -547,9 +547,7 @@ protected function generateResponse(
 
                     $tagId = $jsTableNamesId . '-' . $view . '-' . $uid . '-' . $field;
                     switch ($field) {
-                        case 'image':
                         case 'image_uid':
-                        case 'smallimage':
                         case 'smallimage_uid':
                             $imageRow = $row;
                             $imageTablename = $tablename;