10998-dont-track-backend-orders-in-ga refactoring

Author: ihorvansach

Block/Adminhtml/System/Config/Form/InfoPlan.php

@@ -38,9 +38,12 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
         }
 
         $html = '';
-        $html .= '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">';
-        $html .= $this->getText() . ' <a style="color: #ef672f; text-decoration: underline;" href="https://magefan.com/magento-2-google-tag-manager/pricing?utm_source=gtm_config&utm_medium=link&utm_campaign=regular" target="_blank">Read more</a>.';
-        $html .= '</div>';
+
+        if ($text = $this->getText()) {
+            $html .= '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">';
+            $html .= $text . ' <a style="color: #ef672f; text-decoration: underline;" href="https://magefan.com/magento-2-google-tag-manager/pricing?utm_source=gtm_config&utm_medium=link&utm_campaign=regular" target="_blank">Read more</a>.';
+            $html .= '</div>';
+        }
 
         $optionAvailableInText = ($this->getMinPlan() == 'Extra')
             ? 'This option is available in <strong>Extra</strong> plan only.'
@@ -50,6 +53,9 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
                 require(["jquery", "Magento_Ui/js/modal/alert", "domReady!"], function($, alert){
                     setInterval(function(){
                         var plusSection = $("#{$this->getSectionId()}-state").parent(".section-config");
+                        if (!plusSection.length) {
+                            plusSection = $("#{$this->getSectionId()}").parents("tr:first");
+                        }
                         plusSection.find(".use-default").css("visibility", "hidden");
                         plusSection.find("input,select").each(function(){
                             $(this).attr("readonly", "readonly");
@@ -58,7 +64,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
                             $(this).data("gtmdisabled", 1);
                             $(this).click(function(){
                                 alert({
-                                    title: "You cannot change this option.",
+                                    title: "You cannot use this option.",
                                     content: "{$optionAvailableInText}",
                                     buttons: [{
                                         text: "Upgrade Plan Now",

Block/Adminhtml/System/Config/Form/InfoServerSideTracking.php

@@ -10,7 +10,6 @@
 
 class InfoServerSideTracking extends InfoPlan
 {
-
     /**
      * @return string
      */

Block/Adminhtml/System/Config/Form/InfoTrackAdminOrders.php

@@ -10,7 +10,6 @@
 
 class InfoTrackAdminOrders extends InfoPlan
 {
-
     /**
      * @return string
      */
@@ -32,54 +31,6 @@ protected function getSectionId(): string
      */
     protected function getText(): string
     {
-        return 'Track Admin Orders option is available in <strong>Extra</strong> plan only.';
-    }
-
-    /**
-     * Return info block html
-     * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
-     * @return string
-     */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
-    {
-        if ($this->getModuleVersion->execute($this->getModuleName() . $this->getMinPlan())) {
-            return '';
-        }
-
-        $html = '<script>
-                require(["jquery", "Magento_Ui/js/modal/alert", "domReady!"], function($, alert){
-                    setInterval(function(){
-                        var $plusSection = $("#row_mfgoogletagmanager_events_purchase_track_admin_orders");
-                        $plusSection.find(".use-default").css("visibility", "hidden");
-                        $plusSection.find("input,select").each(function(){
-                            $(this).attr("readonly", "readonly");
-                            $(this).removeAttr("disabled");
-                            if ($(this).data("gtmdisabled")) return;
-                            $(this).data("gtmdisabled", 1);
-                            $(this).click(function(){
-                                alert({
-                                    title: "You cannot change this option.",
-                                    content: "' .
-            (
-            ($this->getMinPlan() == 'Extra')
-                ? 'This option is available in <strong>Extra</strong> plan only.'
-                : 'This option is available in <strong>Plus or Extra</strong> plans only.'
-            )
-            . '",
-                                    buttons: [{
-                                        text: "Upgrade Plan Now",
-                                        class: "action primary accept",
-                                        click: function () {
-                                            window.open("https://magefan.com/magento-2-google-tag-manager/pricing?utm_source=gtm_config&utm_medium=link&utm_campaign=regular");
-                                        }
-                                    }]
-                                });
-                            });
-                        });
-                    }, 1000);
-                });
-            </script>';
-
-        return $html;
+        return '';
     }
 }