Set v1.0.8. Removed doesProductHaveImage method. Deleted validation f…

…or Image. Removed Encrypted integration_api_password.
Returnless-com · Mar 12, 2021 · 7bb6348 · 7bb6348
1 parent 7a55eea
commit 7bb6348
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 47 deletions.
diff --git a/Model/Api/OrderInfo.php b/Model/Api/OrderInfo.php
@@ -267,62 +267,28 @@ protected function getProductById($id)
         return $product;
     }
 
-    /**
-     * @param $product
-     * @return mixed
-     */
-    public function doesProductHaveImage($product)
-    {
-        $image = false;
-
-        if (!$product || !$product->getId()) {
-            return $image;
-        }
-
-        $image = $product->getImage();
-
-        if (empty($image) || $image == 'no_selection') {
-            $image = $product->getSmallImage();
-        }
-
-        if (empty($image) || $image == 'no_selection') {
-            $image = $product->getThumbnail();
-        }
-
-        return (empty($image) || $image == 'no_selection') ? false : true;
-    }
-
     /**
      * @param $product
      * @return bool
      */
     public function getImageByProduct1($product)
     {
-        $image = false;
-
-        $productHasImage = $this->doesProductHaveImage($product);
-
-        if ($productHasImage) {
-            $mediaGalleryImages = $product->getMediaGalleryImages();
-
-            $image = $mediaGalleryImages->getFirstItem()->getUrl();
-        }
+        $mediaGalleryImages = $product->getMediaGalleryImages();
+        $image = $mediaGalleryImages->getFirstItem()->getUrl();
 
         return $image;
     }
 
+    /**
+     * @param $product
+     * @return bool|string
+     */
     public function getImageByProduct($product)
     {
-        $image = false;
-
-        $productHasImage = $this->doesProductHaveImage($product);
-
-        if ($productHasImage) {
-            $image = $this->image
-                ->init($product, 'product_page_image_large')
-                ->setImageFile($product->getImage())
-                ->getUrl();
-        }
+        $image = $this->image
+            ->init($product, 'product_page_image_large')
+            ->setImageFile($product->getImage())
+            ->getUrl();
 
         return $image;
     }

diff --git a/composer.json b/composer.json
@@ -17,5 +17,5 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "1.0.7"
+    "version": "1.0.8"
 }
diff --git a/etc/config.xml b/etc/config.xml
@@ -5,7 +5,7 @@
         <returnless_connector>
             <general>
                 <enabled>1</enabled>
-                <integration_api_password backend_model="Magento\Config\Model\Config\Backend\Encrypted" ><![CDATA[0:3:GYPxbV49zVR1PoaSzMfZ36rYjrnGQIrSrKI066/AQMlTRoiL7Xzdaoqp99CQpWqwxzkhj1DHrh4eJR0v]]></integration_api_password>
+                <integration_api_password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
             </general>
         </returnless_connector>
     </default>

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="Returnless_Connector" setup_version="1.0.7">
+    <module name="Returnless_Connector" setup_version="1.0.8">
         <sequence>
             <module name="Magento_Sales"/>
         </sequence>