Merge pull request #60 from feedaty/development

Development
feedaty · Sep 6, 2023 · 88c40e6 · 88c40e6
2 parents e8a5c98 + c99a648
commit 88c40e6
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,21 @@
 
 #### RELASE NOTES
 
+### V2.10.5
 
+* Fixed Bugs
+    * Orders Export | Fix call to a member function getId() on null
+
+### V2.10.4
+
+* Fixed Bugs
+    * Fix Undefined property:  $request in Controller/Adminhtml/Index/Index.php
+
 ### V2.10.3
 
 * Fixed Bugs
     * PHP 8.2 compatibility
 
-
 ### V2.10.1
 * Features:
     * Debug Mode

diff --git a/Controller/Adminhtml/Index/Index.php b/Controller/Adminhtml/Index/Index.php
@@ -175,54 +175,57 @@ public function execute()
 
                     $product = $item->getProduct();
 
-                    $productId = $product->getId();
-                    /**
-                     * Get Product Thumbnail
-                     */
-                    $productThumbnailUrl = $this->ordersHelper->getProductThumbnailUrl($item);
-
-                    /**
-                     * Get Magento Info
-                     */
-                    $platform = $this->ordersHelper->getPlatform();
-
-                    /*
-                    * Get Product Url
-                    */
-
-                    $productUrl = '';
-                    if ($product) {
-                        if ($item->getProductType() === 'grouped'){
-                            $options = $item->getProductOptions();
-                            if(!empty($options['info_buyRequest'])) {
-                                if(!empty($options['super_product_config']["product_id"])) {
-                                    $productUrl = $this->storeManager->getStore($storeId)->getBaseUrl() . 'catalog/product/view/id/'.$options['super_product_config']["product_id"].'/?___store='.$storeId;
+                    if($product){
+                        $productId = $product->getId();
+                        /**
+                         * Get Product Thumbnail
+                         */
+                        $productThumbnailUrl = $this->ordersHelper->getProductThumbnailUrl($item);
+
+                        /**
+                         * Get Magento Info
+                         */
+                        $platform = $this->ordersHelper->getPlatform();
+
+                        /*
+                        * Get Product Url
+                        */
+
+                        $productUrl = '';
+                        if ($product) {
+                            if ($item->getProductType() === 'grouped'){
+                                $options = $item->getProductOptions();
+                                if(!empty($options['info_buyRequest'])) {
+                                    if(!empty($options['super_product_config']["product_id"])) {
+                                        $productUrl = $this->storeManager->getStore($storeId)->getBaseUrl() . 'catalog/product/view/id/'.$options['super_product_config']["product_id"].'/?___store='.$storeId;
+                                    }
                                 }
                             }
+                            else{
+                                $productUrl = $this->storeManager->getStore($storeId)->getBaseUrl() . 'catalog/product/view/id/'.$productId.'/?___store='.$storeId;
+                            }
                         }
-                        else{
-                            $productUrl = $this->storeManager->getStore($storeId)->getBaseUrl() . 'catalog/product/view/id/'.$productId.'/?___store='.$storeId;
-                        }
-                    }
 
-                    $ean = $this->ordersHelper->getProductEan($storeId, $item);
+                        $ean = $this->ordersHelper->getProductEan($storeId, $item);
 
-                    $row = [
-                        $order->getId(),
-                        $order->getBillingAddress()->getEmail(),
-                        $order->getBillingAddress()->getEmail(),
-                        $order->getCreatedAt(),
-                        $productId,
-                        str_replace('"', '""', $item->getName()),
-                        $productUrl,
-                        $productThumbnailUrl,
-                        $ean,
-                        $platform
-                    ];
+                        $row = [
+                            $order->getId(),
+                            $order->getBillingAddress()->getEmail(),
+                            $order->getBillingAddress()->getEmail(),
+                            $order->getCreatedAt(),
+                            $productId,
+                            str_replace('"', '""', $item->getName()),
+                            $productUrl,
+                            $productThumbnailUrl,
+                            $ean,
+                            $platform
+                        ];
 
-                    $data[] = $row;
+                        $data[] = $row;
+
+                    }
+                    }
 
-                }
             }
 
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "AFL-3.0"
     ],
 
-    "version": "2.10.4-stable",
+    "version": "2.10.5-stable",
 
 	"type": "magento2-module",
 

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Feedaty_Badge" setup_version="2.10.4">
+    <module name="Feedaty_Badge" setup_version="2.10.5">
         <sequence>
             <module name="Magento_Widget" />
         </sequence>