Merge pull request #224 from magmodules/release/1.18.2

Release/1.18.2
magmodules · Apr 11, 2024 · a703a08 · a703a08
2 parents ffd4501 + 8e42d63
commit a703a08
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/Model/Collection/Products.php b/Model/Collection/Products.php
@@ -385,10 +385,7 @@ public function joinPriceIndexLeft($collection, $websiteId)
      */
     public function getParents($parentRelations, $config): ProductCollection
     {
-        if (empty($parentRelations)) {
-            return $this->productCollection; //return empty product collection
-        }
-
+        $parentRelations = $parentRelations ?: [0];
         $filters = $config['filters'];
 
         if (!$config['flat']) {

diff --git a/Model/Generate.php b/Model/Generate.php
@@ -136,8 +136,8 @@ public function generateByStore(
                 $parent = null;
                 if (!empty($parentRelations[$product->getEntityId()])) {
                     foreach ($parentRelations[$product->getEntityId()] as $parentId) {
-                        if ($parent = $parents->getItemById($parentId)) {
-                            continue;
+                        if ($foundParent = $parents->getItemById($parentId)) {
+                            $parent = $foundParent;
                         }
                     }
                 }

diff --git a/Model/Item.php b/Model/Item.php
@@ -333,6 +333,7 @@ public function getProductData($items, $config): array
         try {
             $productIds = $this->itemHelper->getProductIdsFromCollection($items);
             $products = $this->productModel->getCollection($config, '', $productIds);
+            $this->productHelper->getInventoryData()->load($products->getColumnValues('sku'), $config);
             $parentRelations = $this->productHelper->getParentsFromCollection($products, $config);
             $parents = $this->productModel->getParents($parentRelations, $config);
 
@@ -342,8 +343,8 @@ public function getProductData($items, $config): array
                 if (!empty($parentRelations[$product->getEntityId()])) {
                     foreach ($parentRelations[$product->getEntityId()] as $parentId) {
                         /** @var Product $parent */
-                        if ($parent = $parents->getItemById($parentId)) {
-                            continue;
+                        if ($foundParent = $parents->getItemById($parentId)) {
+                            $parent = $foundParent;
                         }
                     }
                 }

diff --git a/Ui/Component/Listing/Column/Order/AbstractOrder.php b/Ui/Component/Listing/Column/Order/AbstractOrder.php
@@ -48,19 +48,19 @@ public function __construct(
     }
 
     /**
-     * Returs imploded customer name
+     * Returns imploded customer name
      *
      * @param array $data
      * @return string
      */
-    public function getCustomerName($data): string
+    public function getCustomerName(array $data): string
     {
         return implode(
             ' ',
             [
-                $data['first_name'],
-                $data['middle_name'],
-                $data['last_name'],
+                $data['first_name'] ?? '-',
+                $data['middle_name'] ?? '',
+                $data['last_name'] ?? '-',
             ]
         );
     }

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-channable",
     "description": "Channable integration for Magento 2",
     "type": "magento2-module",
-    "version": "1.18.1",
+    "version": "1.18.2",
     "license": "BSD-2-Clause",
     "homepage": "https://github.com/magmodules/magento2-channable",
     "require": {

diff --git a/etc/config.xml b/etc/config.xml
@@ -12,7 +12,7 @@
             <general>
                 <enable>0</enable>
                 <limit>250</limit>
-                <version>v1.18.1</version>
+                <version>v1.18.2</version>
             </general>
             <data>
                 <name_attribute>name</name_attribute>