12223 use product label for gallery only, and use data from listing for other produts on product page

Author: b__b

Model/Parser/Html.php

@@ -19,6 +19,7 @@
 class Html
 {
     const COMMENT_PREFIX = '<!--mf_product_label_comment_';
+    const COMMENT_PREFIX_GALLERY = '<!--mf_product_label_gallery_comment_';
 
     const COMMENT_SUFFIX = '-->';
 
@@ -95,8 +96,14 @@ public function __construct(
     public function execute(string $output): string
     {
         $isOutputIsJson = $this->json_validate($output);
-        
+
         $productIds = $this->getProductIds($output);
+        $currentPageProductId = $this->fan == 'catalog_product_view' ? $this->getCurrentPageProductId($output) : 0;
+
+        if ($currentPageProductId) {
+            $productIds[] = $currentPageProductId;
+        }
+
         [$ruleIds, $productIdRuleIds] = $this->getProductIdsToRuleIdsMap->execute($productIds);
 
         $rules = $this->ruleCollectionFactory->create()
@@ -108,7 +115,9 @@ public function execute(string $output): string
         $replaceMap = [];
 
         foreach ($productIdRuleIds as $productId => $productRuleIds) {
-            $productLabels = $this->getProductLabels($rules, $productRuleIds);
+            $forProductPage = $currentPageProductId && $productId == $currentPageProductId;
+
+            $productLabels = $this->getProductLabels($rules, $productRuleIds, $forProductPage);
 
             $htmlToReplace = $this->layout
                 ->createBlock(\Magefan\ProductLabel\Block\Label::class)
@@ -126,16 +135,17 @@ public function execute(string $output): string
 
         foreach ($replaceMap as $productId => $replace) {
             $replace = $isOutputIsJson ? trim(json_encode($replace),'"') : $replace;
-            $output = str_replace(self::COMMENT_PREFIX . $productId . self::COMMENT_SUFFIX, $replace, $output);
+
+            $output = ($currentPageProductId && $currentPageProductId == $productId)
+                ? str_replace(self::COMMENT_PREFIX_GALLERY . $productId . self::COMMENT_SUFFIX, $replace, $output)
+                : str_replace(self::COMMENT_PREFIX         . $productId . self::COMMENT_SUFFIX, $replace, $output);
         }
 
         return $output;
     }
 
-    public function getProductLabels($rules, $productRuleIds): array
+    public function getProductLabels($rules, $productRuleIds, $forProductPage = false): array
     {
-        $forProductPage = $this->fan == 'catalog_product_view';
-
         $productLabelsCount = 0;
         $productLabels = [];
 
@@ -168,6 +178,27 @@ public function getProductLabels($rules, $productRuleIds): array
         return $productLabels;
     }
 
+    /**
+     * @param string $html
+     * @return int
+     */
+    private function getCurrentPageProductId(string $html): int
+    {
+        $pattern = '/' . self::COMMENT_PREFIX_GALLERY . '(.*?)' . self::COMMENT_SUFFIX . '/';
+        preg_match_all($pattern, $html, $matches);
+
+
+        foreach ($matches[1] as $commentData) {
+            $productId = (int)$commentData;
+
+            if ($productId) {
+                return $productId;
+            }
+        }
+
+        return 0;
+    }
+
     /**
      * @param string $html
      * @return array
@@ -187,8 +218,8 @@ private function getProductIds(string $html): array
 
         return $productIds;
     }
-    
-    private function json_validate($json, $depth = 512, $flags = 0) 
+
+    private function json_validate($json, $depth = 512, $flags = 0)
     {
         if (!is_string($json)) {
             return false;
@@ -199,7 +230,7 @@ private function json_validate($json, $depth = 512, $flags = 0)
         if ($trimmedJson[0] !== '{' && $trimmedJson[0] !== '[') {
             return false;
         }
-    
+
         // Decode JSON and check for errors
         json_decode($json, false, $depth, $flags);
         return json_last_error() === JSON_ERROR_NONE;

Plugin/Frontend/Magento/Catalog/Block/Product/View/Gallery.php

@@ -44,7 +44,7 @@ public function __construct(
     public function afterToHtml($subject, $result)
     {
         if ($this->config->isEnabled() && ($product = $subject->getProduct())) {
-            $mfPlComment = Html::COMMENT_PREFIX . $product->getId() . Html::COMMENT_SUFFIX;
+            $mfPlComment = Html::COMMENT_PREFIX_GALLERY . $product->getId() . Html::COMMENT_SUFFIX;
 
             if ($this->hyvaThemeDetection->execute()) {
                 $result = $this->addMfLabelContainerToImageWrapperTag($result, (int)$product->getId());
@@ -76,7 +76,7 @@ private function addMfLabelContainerToImageWrapperTag(string $html, int $product
                 $endOfTagWithWrapperClassPosition = strpos($html, '>', $wrapperClassPosition);
 
                 if ($endOfTagWithWrapperClassPosition !== false) {
-                    $mfPlContainer = Html::COMMENT_PREFIX . $productId . Html::COMMENT_SUFFIX;
+                    $mfPlContainer = Html::COMMENT_PREFIX_GALLERY . $productId . Html::COMMENT_SUFFIX;
 
                     $html = substr_replace($html, $mfPlContainer, $endOfTagWithWrapperClassPosition + 1, 0);
                 }