Merge branch 'main' into remove-dependency

Author: jczhuoMeta

app/code/Meta/Catalog/Model/Category/CategoryCollection.php

@@ -435,7 +435,7 @@ private function updateCategoryWithFBRequestJson(
             'method' => 'POST',
             'relative_url' => $setId,
             'body' => http_build_query([
-                'name' => $this->categoryUtilities->getCategoryPathName($category, $storeId, $isVisibleOnMeta),
+                'name' => $category->getName(),
                 'filter' => $this->categoryUtilities->getCategoryProductFilter($products),
                 'metadata' => $this->categoryUtilities->getCategoryMetaData($category),
                 'retailer_id' => $category->getId(),

app/code/Meta/Catalog/Model/Product/Feed/ProductRetriever/Configurable.php

@@ -21,7 +21,7 @@
 namespace Meta\Catalog\Model\Product\Feed\ProductRetriever;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
@@ -119,6 +119,7 @@ public function retrieve($offset = 1, $limit = self::LIMIT): array
     {
         $storeId = $this->storeId ?? $this->fbeHelper->getStore()->getId();
 
+        /** @var ProductCollection $configurableCollection */
         $configurableCollection = $this->productCollectionFactory->create();
         $configurableCollection->addAttributeToSelect('*')
             ->addAttributeToFilter([
@@ -132,6 +133,7 @@ public function retrieve($offset = 1, $limit = self::LIMIT): array
                 ]
             ], null, 'left')
             ->addAttributeToFilter('type_id', ConfigurableType::TYPE_CODE)
+            ->addMediaGalleryData()
             ->addStoreFilter($storeId)
             ->setStoreId($storeId);
 

app/code/Meta/Catalog/Model/Product/Feed/ProductRetriever/Other.php

@@ -22,6 +22,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
@@ -114,6 +115,7 @@ public function retrieve($offset = 1, $limit = self::LIMIT): array
 
         $storeId = $this->storeId ?? $this->fbeHelper->getStore()->getId();
 
+        /** @var ProductCollection $collection */
         $collection = $this->productCollectionFactory->create();
         $collection->addAttributeToSelect('*')
             ->addAttributeToFilter('visibility', ['neq' => Visibility::VISIBILITY_NOT_VISIBLE])
@@ -139,6 +141,7 @@ public function retrieve($offset = 1, $limit = self::LIMIT): array
                     'neq' => SimpleType::TYPE_SIMPLE
                 ],
             ], null, 'left')
+            ->addMediaGalleryData()
             ->addStoreFilter($storeId)
             ->setStoreId($storeId);
 

app/code/Meta/Catalog/Model/Product/Feed/ProductRetriever/Simple.php

@@ -21,7 +21,7 @@
 namespace Meta\Catalog\Model\Product\Feed\ProductRetriever;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
@@ -113,6 +113,7 @@ public function retrieve($offset = 1, $limit = null): array
         }
         $storeId = $this->storeId ?? $this->fbeHelper->getStore()->getId();
 
+        /** @var ProductCollection $collection */
         $collection = $this->productCollectionFactory->create();
         $collection->addAttributeToSelect('*')
             ->addAttributeToFilter([
@@ -126,6 +127,7 @@ public function retrieve($offset = 1, $limit = null): array
                 ]
             ], null, 'left')
             ->addAttributeToFilter('type_id', ProductType::TYPE_SIMPLE)
+            ->addMediaGalleryData()
             ->addStoreFilter($storeId)
             ->setStoreId($storeId);
 

app/code/Meta/Conversion/Observer/Common.php

@@ -1,11 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Meta\Conversion\Observer;
 
 use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Cookie\Helper\Cookie as CookieHelper;
 
 /**
  * Set cookie with payload data for event pixel
@@ -29,21 +31,29 @@ class Common
      */
     private CookieManagerInterface $cookieManager;
 
+    /**
+     * @var CookieHelper
+     */
+    private CookieHelper $cookieHelper;
+
     /**
      * Constructor common
      *
      * @param CookieManagerInterface $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param JsonHelper $jsonHelper
+     * @param CookieHelper $cookieHelper
      */
     public function __construct(
         CookieManagerInterface $cookieManager,
         CookieMetadataFactory $cookieMetadataFactory,
-        JsonHelper $jsonHelper
+        JsonHelper $jsonHelper,
+        CookieHelper $cookieHelper
     ) {
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->jsonHelper = $jsonHelper;
+        $this->cookieHelper = $cookieHelper;
     }
 
     /**
@@ -58,6 +68,12 @@ public function __construct(
      */
     public function setCookieForMetaPixel($cookieName, $dataForMetaPixel)
     {
+        if ($this->cookieHelper->isCookieRestrictionModeEnabled()
+            && $this->cookieHelper->isUserNotAllowSaveCookie()
+        ) {
+            return;
+        }
+
         $publicCookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
             ->setDuration(3600)
             ->setPath('/')