Merge pull request #280 from franzholz/develop

next version 2.15.11
franzholz · Jul 17, 2024 · 9a8be21 · 9a8be21
2 parents 87b5624 + 61ec6ea
commit 9a8be21
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;

diff --git 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',

diff --git 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.