Merge pull request #26 from magmodules/release/1.8.0

Marvin-Magmodules · web-flow · commit af7c81d62c93 · 2024-01-15T16:56:45.000+01:00
Release/1.8.0
diff --git a/Api/Config/RepositoryInterface.php b/Api/Config/RepositoryInterface.php
@@ -27,6 +27,7 @@ interface RepositoryInterface
     public const XML_PATH_NAME = '%s/attributes/name';
     public const XML_PATH_SKU = '%s/attributes/sku';
     public const XML_PATH_BRAND = '%s/attributes/brand';
+    public const XML_PATH_DESCRIPTION = '%s/attributes/description';
 
     /**
      * Get extension version
@@ -103,6 +104,15 @@ public function getSku(int $storeId = null): string;
      */
     public function getBrand(int $storeId = null): string;
 
+    /**
+     * Get description attribute
+     *
+     * @param int|null $storeId
+     *
+     * @return string
+     */
+    public function getDescription(int $storeId = null): string;
+
     /**
      * Get current store
      *
diff --git a/Model/Config/Repository.php b/Model/Config/Repository.php
@@ -219,4 +219,16 @@ public function getBrand(int $storeId = null): string
             ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDescription(int $storeId = null): string
+    {
+        return (string)$this->getStoreValue(
+            self::XML_PATH_DESCRIPTION,
+            $storeId,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/Service/WebApi/Cart.php b/Service/WebApi/Cart.php
@@ -210,10 +210,25 @@ private function getProducts(Quote $quote)
         $quoteProducts = [];
         /* @var Item $item */
         foreach ($quote->getAllItems() as $item) {
-            $quoteProducts[] = [
+            //skip variants
+            if ($item->getParentItem() && $item->getParentItem()->getProductType() == 'configurable') {
+                continue;
+            }
+
+            $quoteProduct = [
                 'id'       => $item->getProductId(),
                 'quantity' => $item->getQty()
             ];
+
+            //add variant to parent data
+            if ($item->getProductType() == 'configurable') {
+                $child = $item->getChildren();
+                if (count($child) != 0) {
+                    $child = reset($child);
+                    $quoteProduct['variant_id'] = $child->getProductId();
+                }
+            }
+            $quoteProducts[] = $quoteProduct;
         }
         return $quoteProducts;
     }
diff --git a/Service/WebApi/Order.php b/Service/WebApi/Order.php
@@ -153,6 +153,11 @@ private function getProducts(OrderModel $order): array
     {
         $orderedProducts = [];
         foreach ($order->getAllItems() as $item) {
+            //skip variants
+            if ($item->getParentItem() && $item->getParentItem()->getProductType() == 'configurable') {
+                continue;
+            }
+
             $orderedProduct = [
                 'id' => $item->getProductId(),
                 'quantity' => $item->getQtyOrdered(),
diff --git a/Service/WebApi/Product.php b/Service/WebApi/Product.php
@@ -7,16 +7,18 @@
 
 namespace Magmodules\Reloadify\Service\WebApi;
 
-use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product as ProductModel;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\UrlInterface;
 use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
 use Magmodules\Reloadify\Api\Config\RepositoryInterface as ConfigRepository;
 use Magmodules\Reloadify\Model\RequestLog\Collection as RequestLogCollection;
 use Magmodules\Reloadify\Model\RequestLog\CollectionFactory as RequestLogCollectionFactory;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Product web API service class
@@ -42,10 +44,6 @@ class Product
      * @var ProductCollectionFactory
      */
     private $productsCollectionFactory;
-    /**
-     * @var Image
-     */
-    private $image;
     /**
      * @var CollectionFactory
      */
@@ -62,29 +60,44 @@ class Product
      * @var CollectionProcessorInterface
      */
     private $collectionProcessor;
+    /**
+     * @var Visibility
+     */
+    private $productVisibility;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    private $mediaPath = '';
 
     /**
-     * @param ProductCollectionFactory     $productsCollectionFactory
-     * @param Image                        $image
-     * @param CollectionFactory            $reviewCollectionFactory
-     * @param RequestLogCollectionFactory  $requestLogCollectionFactory
-     * @param ConfigRepository             $configRepository
+     * Product constructor.
+     *
+     * @param ProductCollectionFactory $productsCollectionFactory
+     * @param CollectionFactory $reviewCollectionFactory
+     * @param RequestLogCollectionFactory $requestLogCollectionFactory
+     * @param ConfigRepository $configRepository
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param Visibility $productVisibility
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ProductCollectionFactory $productsCollectionFactory,
-        Image $image,
         CollectionFactory $reviewCollectionFactory,
         RequestLogCollectionFactory $requestLogCollectionFactory,
         ConfigRepository $configRepository,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        Visibility $productVisibility,
+        StoreManagerInterface $storeManager
     ) {
         $this->productsCollectionFactory = $productsCollectionFactory;
         $this->reviewCollectionFactory = $reviewCollectionFactory;
-        $this->image = $image;
         $this->requestLogCollection = $requestLogCollectionFactory->create();
         $this->configRepository = $configRepository;
         $this->collectionProcessor = $collectionProcessor;
+        $this->productVisibility = $productVisibility;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -102,13 +115,15 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
         $name = $this->configRepository->getName($storeId);
         $sku = $this->configRepository->getSku($storeId);
         $brand = $this->configRepository->getBrand($storeId);
+        $description = $this->configRepository->getDescription($storeId);
 
         foreach ($collection as $product) {
             $data[] = [
                 "id"                   => $product->getId(),
                 "name"                 => $this->getAttributeValue($product, $name),
                 "ean"                  => $this->getAttributeValue($product, $ean),
                 "short_description"    => $product->getShortDescription(),
+                "description"          => $this->getAttributeValue($product, $description),
                 "price"                => $product->getPrice(),
                 "url"                  => $product->getProductUrl(),
                 "sku"                  => $this->getAttributeValue($product, $sku),
@@ -159,7 +174,8 @@ private function getCollection(
     ): Collection {
         $collection = $this->productsCollectionFactory->create()
             ->addAttributeToSelect('*')
-            ->setStore($storeId);
+            ->setStore($storeId)
+            ->setVisibility($this->productVisibility->getVisibleInSiteIds());
         if ($extra['entity_id']) {
             $collection->addFieldToFilter('entity_id', $extra['entity_id']);
         } else {
@@ -210,9 +226,11 @@ private function applyFilter(Collection $products, array $filters, int $storeId
      */
     private function getMainImage($product)
     {
-        return $this->image->init($product, 'image')
-            ->setImageFile($product->getImage())
-            ->getUrl();
+        if (!$this->mediaPath) {
+            $this->mediaPath = $this->storeManager->getStore($product->getStoreId())
+                ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
+        }
+        return $this->mediaPath . 'catalog/product' . $product->getImage();
     }
 
     /**
diff --git a/Service/WebApi/Variants.php b/Service/WebApi/Variants.php
@@ -7,14 +7,15 @@
 
 namespace Magmodules\Reloadify\Service\WebApi;
 
-use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magmodules\Reloadify\Api\Config\RepositoryInterface as ConfigRepository;
 use Magmodules\Reloadify\Service\ProductData\Stock;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\UrlInterface;
 
 /**
  * Variants web API service class
@@ -42,10 +43,6 @@ class Variants
      * @var ProductCollectionFactory
      */
     private $productsCollectionFactory;
-    /**
-     * @var Image
-     */
-    private $image;
     /**
      * @var ResourceConnection
      */
@@ -62,30 +59,35 @@ class Variants
      * @var CollectionProcessorInterface
      */
     private $collectionProcessor;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    private $mediaPath = '';
 
     /**
      * Variants constructor.
      *
      * @param ProductCollectionFactory $productsCollectionFactory
-     * @param Image                    $image
      * @param ResourceConnection       $resourceConnection
      * @param ConfigRepository         $configRepository
      * @param Stock                    $stock
      */
     public function __construct(
         ProductCollectionFactory $productsCollectionFactory,
-        Image $image,
         ResourceConnection $resourceConnection,
         ConfigRepository $configRepository,
         Stock $stock,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        StoreManagerInterface $storeManager
     ) {
         $this->productsCollectionFactory = $productsCollectionFactory;
-        $this->image = $image;
         $this->resourceConnection = $resourceConnection;
         $this->configRepository = $configRepository;
         $this->stock = $stock;
         $this->collectionProcessor = $collectionProcessor;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -102,6 +104,7 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
         $name = $this->configRepository->getName($storeId);
         $sku = $this->configRepository->getSku($storeId);
         $brand = $this->configRepository->getBrand($storeId);
+        $description = $this->configRepository->getDescription($storeId);
 
         $data = [];
         $collection = $this->getCollection($storeId, $extra, $searchCriteria);
@@ -114,6 +117,7 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
             $data[] = [
                 "id"           => $product->getId(),
                 "title"        => $this->getAttributeValue($product, $name),
+                "description"  => $this->getAttributeValue($product, $description),
                 "article_code" => $product->getSku(),
                 "ean"          => $this->getAttributeValue($product, $ean),
                 "main_image"   => $this->getMainImage($product),
@@ -217,9 +221,11 @@ private function applyFilter(Collection $products, array $filters)
      */
     private function getMainImage($product)
     {
-        return $this->image->init($product, 'image')
-            ->setImageFile($product->getImage())
-            ->getUrl();
+        if (!$this->mediaPath) {
+            $this->mediaPath = $this->storeManager->getStore($product->getStoreId())
+                ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
+        }
+        return $this->mediaPath . 'catalog/product' . $product->getImage();
     }
 
     /**
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-reloadify",
     "description": "Reloadify extension for Magento 2",
     "type": "magento2-module",
-    "version": "1.7.1",
+    "version": "1.8.0",
     "license": [
         "BSD-2-Clause"
     ],
diff --git a/etc/adminhtml/system/attributes.xml b/etc/adminhtml/system/attributes.xml
@@ -38,5 +38,12 @@
             <config_path>magmodules_reloadify/attributes/brand</config_path>
             <comment>Select the attribute associate with the product brand. Suggested field: Manufacturer</comment>
         </field>
+        <field id="description" translate="label comment" type="select" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1" canRestore="1">
+            <label>Description</label>
+            <source_model>Magmodules\Reloadify\Model\Config\Source\Attributes</source_model>
+            <config_path>magmodules_reloadify/attributes/description</config_path>
+            <comment>Select the attribute associate with the product description. Suggested field: Description</comment>
+        </field>
     </group>
 </include>
diff --git a/etc/config.xml b/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <magmodules_reloadify>
             <general>
-                <version>v1.7.1</version>
+                <version>v1.8.0</version>
                 <enable>0</enable>
                 <debug>0</debug>
             </general>
@@ -19,6 +19,7 @@
                 <name>name</name>
                 <sku>sku</sku>
                 <brand>manufacturer</brand>
+                <description>description</description>
             </attributes>
         </magmodules_reloadify>
     </default>
