Merge pull request #30 from magmodules/release/1.10.2

Release/1.10.2
magmodules · Aug 21, 2024 · f506905 · f506905
2 parents c3ef702 + 044d33a
commit f506905
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/Service/WebApi/Product.php b/Service/WebApi/Product.php
@@ -10,6 +10,8 @@
 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\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\UrlInterface;
@@ -19,7 +21,6 @@
 use Magmodules\Reloadify\Model\RequestLog\CollectionFactory as RequestLogCollectionFactory;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * Product web API service class
@@ -69,6 +70,10 @@ class Product
      * @var StoreManagerInterface
      */
     private $storeManager;
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
 
     private $mediaPath = '';
 
@@ -90,7 +95,8 @@ public function __construct(
         ConfigRepository $configRepository,
         CollectionProcessorInterface $collectionProcessor,
         Visibility $productVisibility,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        AttributeRepositoryInterface $attributeRepository
     ) {
         $this->productsCollectionFactory = $productsCollectionFactory;
         $this->reviewCollectionFactory = $reviewCollectionFactory;
@@ -99,6 +105,7 @@ public function __construct(
         $this->collectionProcessor = $collectionProcessor;
         $this->productVisibility = $productVisibility;
         $this->storeManager = $storeManager;
+        $this->attributeRepository = $attributeRepository;
     }
 
     /**
@@ -113,23 +120,33 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
         $data = [];
         $collection = $this->getCollection($storeId, $extra, $searchCriteria);
         $ean = $this->configRepository->getEan($storeId);
+        $eanType = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $ean)
+            ->getFrontendInput();
         $name = $this->configRepository->getName($storeId);
+        $nameType = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $name)
+            ->getFrontendInput();
         $sku = $this->configRepository->getSku($storeId);
+        $skuType = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $sku)
+            ->getFrontendInput();
         $brand = $this->configRepository->getBrand($storeId);
+        $brandType = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $brand)
+            ->getFrontendInput();
         $description = $this->configRepository->getDescription($storeId);
+        $descriptionType = $this->attributeRepository
+            ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $description)->getFrontendInput();
 
         foreach ($collection as $product) {
             $data[] = [
                 "id"                   => $product->getId(),
-                "name"                 => $this->getAttributeValue($product, $name),
+                "name"                 => $this->getAttributeValue($product, $name, $nameType),
                 'product_type'         => $product->getTypeId(),
-                "ean"                  => $this->getAttributeValue($product, $ean),
+                "ean"                  => $this->getAttributeValue($product, $ean, $eanType),
                 "short_description"    => $product->getShortDescription(),
-                "description"          => $this->getAttributeValue($product, $description),
+                "description"          => $this->getAttributeValue($product, $description, $descriptionType),
                 "price"                => $product->getPrice(),
                 "url"                  => $product->getProductUrl(),
-                "sku"                  => $this->getAttributeValue($product, $sku),
-                "brand"                => $this->getAttributeValue($product, $brand),
+                "sku"                  => $this->getAttributeValue($product, $sku, $skuType),
+                "brand"                => $this->getAttributeValue($product, $brand, $brandType),
                 "main_image"           => $this->getMainImage($product),
                 "visible"              => (bool)((int)$product->getVisibility() - 1),
                 "variant_ids"          => $this->getVariants($product),
@@ -149,12 +166,12 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
      * @param $attribute
      * @return mixed|string
      */
-    private function getAttributeValue($product, $attribute)
+    private function getAttributeValue($product, $attribute, $type)
     {
         $value = '';
-        if ($attribute) {
-            if ($dropdownValue = $product->getAttributeText($attribute)) {
-                $value = $dropdownValue;
+        if ($attribute && $type) {
+            if (($type == 'select') || ($type == 'multiselect')) {
+                $value = $product->getAttributeText($attribute);
             } else {
                 $value = $product->getData($attribute);
             }

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.10.1",
+    "version": "1.10.2",
     "license": [
         "BSD-2-Clause"
     ],

diff --git a/etc/config.xml b/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <magmodules_reloadify>
             <general>
-                <version>v1.10.1</version>
+                <version>v1.10.2</version>
                 <enable>0</enable>
                 <debug>0</debug>
             </general>