Merge branch 'main' into 1.2.4-rc

Author: sol-loup

app/code/Meta/Catalog/Helper/Product/Identifier.php

@@ -56,30 +56,34 @@ public function __construct(SystemConfig $systemConfig, ProductRepository $produ
     }
 
     /**
-     * Get product's identifier (SKU or ID, depending on configuration)
+     * Get product's identifier col name(SKU or entity ID, depending on configuration)
      *
-     * @param ProductInterface $product
-     * @return bool|int|string
+     * @return string
      */
-    private function getProductIdentifier(ProductInterface $product)
+    public function getProductIdentifierColName(): string
     {
         if ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_SKU) {
-            return $product->getSku();
+            return 'sku';
         } elseif ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_ID) {
-            return $product->getId();
+            return 'entity_id';
         }
-        return false;
+        return '';
     }
 
     /**
-     * Get product Retailer ID for Commerce
+     * Get product Retailer ID for Commerce (SKU or ID, depending on configuration)
      *
      * @param ProductInterface $product
      * @return int|string|bool
      */
     public function getMagentoProductRetailerId(ProductInterface $product)
     {
-        return $this->getProductIdentifier($product);
+        if ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_SKU) {
+            return $product->getSku();
+        } elseif ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_ID) {
+            return $product->getId();
+        }
+        return false;
     }
 
     /**

app/code/Meta/Catalog/Plugin/FacebookCatalogDeletePlugin.php

@@ -80,9 +80,15 @@ public function __construct(
      */
     public function afterDelete(Product $subject, $result, $object)
     {
+        $identifier = $this->identifier->getMagentoProductRetailerId($object);
+        if ($identifier === false) {
+            $this->fbeHelper->log('Deleted Product does not have meta identifier.');
+            return $result;
+        }
+
         $catalogDelete = $this->catalogUpdateFactory->create()
             ->setProductId($object->getId())
-            ->setSku($object->getSku())
+            ->setSku($identifier)
             ->setMethod('delete');
         try {
             $this->catalogUpdateResourceModel->deleteUpdateProductEntries($identifier);