Merge branch 'main' of github.com:magento-commerce/facebook-for-magento2 into 1.0.0-release

Author: omiroshnichenko

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

@@ -114,24 +114,26 @@ public function retrieve($offset = 1, $limit = self::LIMIT): array
             $configurableAttributes = $configurableType->getConfigurableAttributes($product);
 
             foreach ($configurableType->getUsedProducts($product) as $childProduct) {
-                /** @var Product $childProduct */
-                $configurableSettings = ['item_group_id' => $product->getId()];
-                foreach ($configurableAttributes as $attribute) {
-                    $productAttribute = $attribute->getProductAttribute();
-                    $attributeCode = $productAttribute->getAttributeCode();
-                    $attributeValue = $childProduct->getData($productAttribute->getAttributeCode());
-                    $attributeLabel = $productAttribute->getSource()->getOptionText($attributeValue);
-                    $configurableSettings[$attributeCode] = $attributeLabel;
+                if ($childProduct->getStatus() == Status::STATUS_ENABLED) {
+                    /** @var Product $childProduct */
+                    $configurableSettings = ['item_group_id' => $product->getId()];
+                    foreach ($configurableAttributes as $attribute) {
+                        $productAttribute = $attribute->getProductAttribute();
+                        $attributeCode = $productAttribute->getAttributeCode();
+                        $attributeValue = $childProduct->getData($productAttribute->getAttributeCode());
+                        $attributeLabel = $productAttribute->getSource()->getOptionText($attributeValue);
+                        $configurableSettings[$attributeCode] = $attributeLabel;
+                    }
+                    // Assign parent product name to all child products' name (used as variant name is Meta catalog)
+                    // https://developers.facebook.com/docs/commerce-platform/catalog/variants
+                    $childProduct->setName($product->getName());
+                    $childProduct->setConfigurableSettings($configurableSettings);
+                    $childProduct->setParentProductUrl($product->getProductUrl());
+                    if (!$childProduct->getDescription()) {
+                        $childProduct->setDescription($product->getDescription());
+                    }
+                    $simpleProducts[] = $childProduct;
                 }
-                // Assign parent product name to all child products' name (used as variant name is Meta catalog)
-                // https://developers.facebook.com/docs/commerce-platform/catalog/variants
-                $childProduct->setName($product->getName());
-                $childProduct->setConfigurableSettings($configurableSettings);
-                $childProduct->setParentProductUrl($product->getProductUrl());
-                if (!$childProduct->getDescription()) {
-                    $childProduct->setDescription($product->getDescription());
-                }
-                $simpleProducts[] = $childProduct;
             }
         }
 

app/code/Meta/Conversion/view/frontend/templates/pixel/view_content.phtml

@@ -11,12 +11,12 @@ if ($block->getFacebookPixelID()) {
         {
             "*": {
                 "Meta_Conversion/js/metaPixelTracker" : {
-                    "url" : "<?= $block->escapeJs($trackerUrl); ?>",
-                    "payload": <?= $block->escapeJs(json_encode([
+                    "url" : "<?= $block->escapeUrl($trackerUrl); ?>",
+                    "payload": <?= /* @noEscape */ json_encode([
                         "eventName" => $block->getEventToObserveName(),
                         "productId" => $block->getProductId()
-                    ])) ?>,
-                    "browserEventData": <?= $block->escapeJs(json_encode([
+                    ]) ?>,
+                    "browserEventData": <?= /* @noEscape */ json_encode([
                         'fbAgentVersion' => $block->getFacebookAgentVersion(),
                         'fbPixelId' => $block->getFacebookPixelID(),
                         'source' => $block->getSource(),
@@ -31,7 +31,7 @@ if ($block->getFacebookPixelID()) {
                             'value' => $block->getValue() ?? '',
                             'currency' => $block->getCurrency() ?? ''
                         ]
-                    ])) ?>
+                    ]) ?>
                 }
             }
         }