12322 Codazon Theme compatibility

Author: b__b

Plugin/Frontend/Codazon/ThemeLayoutPro/Helper/Data.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\ProductLabel\Plugin\Frontend\Codazon\ThemeLayoutPro\Helper;
+
+use Magefan\ProductLabel\Model\Config;
+use Magefan\ProductLabel\Model\Parser\Html;
+
+class Data
+{
+    /**
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * @param Config $config
+     */
+    public function __construct(
+        Config $config
+    ) {
+        $this->config = $config;
+    }
+
+    /**
+     * @param $subject
+     * @param $result
+     * @param $product
+     * @return mixed|string
+     */
+    public function afterGetProductImageHtml($subject, $result, $product)
+    {
+        return ($result && $this->config->isEnabled())
+        	? $result . Html::COMMENT_PREFIX . $product->getId() . Html::COMMENT_SUFFIX
+        	: $result;
+    }
+}

etc/frontend/di.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © Magefan (support@magefan.com). All rights reserved.
@@ -7,17 +7,22 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Catalog\Block\Product\Image">
-        <plugin name="wrap_image_with_mf_comments" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Catalog\Block\Product\Image" sortOrder="10" disabled="false"/>
-    </type>
-    <type name="Magento\Framework\Controller\ResultInterface">
-        <plugin name="replace_mf_comments_on_product_labels" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Framework\Controller\ResultInterface" sortOrder="-21" disabled="false"/>
-    </type>
-    <type name="Magento\Catalog\Block\Product\View\Gallery">
-        <plugin name="wrap_gallery_image_with_mf_comments" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Catalog\Block\Product\View\Gallery" sortOrder="10" disabled="false"/>
-    </type>
+    <virtualType name="Magefan\ProductLabel\ImageUpload" type="Magefan\ProductLabel\Model\ImageUploader">
+        <arguments>
+            <argument name="baseTmpPath" xsi:type="string">magefan_product_label/tmp</argument>
+            <argument name="basePath" xsi:type="string">magefan_product_label</argument>
+            <argument name="allowedExtensions" xsi:type="array">
+                <item name="jpg" xsi:type="string">jpg</item>
+                <item name="jpeg" xsi:type="string">jpeg</item>
+                <item name="gif" xsi:type="string">gif</item>
+                <item name="png" xsi:type="string">png</item>
+            </argument>
+        </arguments>
+    </virtualType>
 
-      <type name="MageSuite\ProductTile\Block\Tile\Container">
-        <plugin name="add_mf_comments_to_mage_suite_product_tile" type="Magefan\ProductLabel\Plugin\Frontend\MageSuite\ProductTile\Block\Tile\Container" sortOrder="10" disabled="false"/>
+    <type name="Magefan\ProductLabel\Controller\Adminhtml\Rule\Upload">
+        <arguments>
+            <argument name="imageUploader" xsi:type="object">Magefan\ProductLabel\ImageUpload</argument>
+        </arguments>
     </type>
 </config>

view/frontend/templates/product/initLabel.phtml

@@ -22,7 +22,16 @@
     <?php $script = "
     require(['jquery'], function ($) {
         $('[data-gallery-role=gallery-placeholder]').on('gallery:loaded', function () {
-            $(this).parent().find('.mf-label-container').prependTo('" . $escaper->escapeHtml($block->getConfig()->getProductPageContainerSelector()) . "')
+
+            let mfLabelContainer = $(this).parent().find('.mf-label-container');
+
+            if (!mfLabelContainer.length) {
+                mfLabelContainer = $('.product.media .mf-label-container');
+            }
+
+            if (mfLabelContainer.length) {
+                mfLabelContainer.prependTo('" . $escaper->escapeHtml($block->getConfig()->getProductPageContainerSelector()) . "')
+            }
         });
     });
    "; ?>