Merge pull request #2012 from mailchimp/Issue2002-2.3.6-p1

Issue2002 2.3.6 p1
mailchimp · Oct 1, 2024 · 3868750 · 3868750
2 parents 4f2c694 + 64a4230
commit 3868750
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 296 deletions.
diff --git a/Block/Adminhtml/System/Config/CleanEcommerce.php b/Block/Adminhtml/System/Config/CleanEcommerce.php
diff --git a/Controller/Adminhtml/Ecommerce/CheckEcommerce.php b/Controller/Adminhtml/Ecommerce/CheckEcommerce.php
diff --git a/Controller/Adminhtml/Ecommerce/CleanEcommerce.php b/Controller/Adminhtml/Ecommerce/CleanEcommerce.php
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -140,13 +140,6 @@
                         <field id="*/*/active">1</field>
                     </depends>
                 </field>
-                <field id="clean_ecommerce" translate="button_label" type="button" sortOrder="87" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <button_label>Remove Unused Registers</button_label>
-                    <frontend_model>Ebizmarts\MailChimp\Block\Adminhtml\System\Config\CleanEcommerce</frontend_model>
-                    <depends>
-                        <field id="*/*/active">1</field>
-                    </depends>
-                </field>
                 <field id="fix_mailchimpjs" translate="button_label" type="button" sortOrder="88" showInDefault="1" showInWebsite="1" showInStore="1">
                     <button_label>Fix Mailchimp JS in frontend</button_label>
                     <frontend_model>Ebizmarts\MailChimp\Block\Adminhtml\System\Config\FixMailchimpJS</frontend_model>

diff --git a/view/adminhtml/templates/system/config/cleanecommerce.phtml b/view/adminhtml/templates/system/config/cleanecommerce.phtml
diff --git a/view/adminhtml/templates/system/config/fieldset/hint.phtml b/view/adminhtml/templates/system/config/fieldset/hint.phtml
@@ -18,8 +18,6 @@
      "getInterestUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/getInterest'));?>",
      "resyncSubscribersUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/resyncSubscribers'));?>",
      "resyncProductsUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/resyncProducts'));?>",
-     "cleanEcommerceUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/cleanEcommerce'));?>",
-     "checkEcommerceUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/checkEcommerce'));?>",
      "fixMailchimpjsUrl": "<?= $block->escapeUrl($block->getUrl('mailchimp/ecommerce/fixMailchimpJS'));?>",
      "scope": "<?= $block->escapeHtml($block->getScope());?>",
      "scopeId": "<?= $block->escapeHtml($block->getScopeId()); ?>"

diff --git a/view/adminhtml/web/js/configapikey.js b/view/adminhtml/web/js/configapikey.js
@@ -25,8 +25,6 @@ define(
                 "getInterestUrl": "",
                 "resyncSubscribersUrl": "",
                 "resyncProductsUrl": "",
-                "cleanEcommerceUrl": "",
-                "checkEcommerceUrl": "",
                 "fixMailchimpjsUrl": "",
                 "scope": "",
                 "scopeId": ""
@@ -59,10 +57,6 @@ define(
                     var mailchimpStoreId = $('#mailchimp_general_monkeystore').find(':selected').val();
                     self._resyncProducts(mailchimpStoreId);
                 });
-                self._checkCleanButton();
-                $('#mailchimp_general_clean_ecommerce').click(function () {
-                    self._cleanEcommerce();
-                });
                 $('#mailchimp_general_fix_mailchimpjs').click(function () {
                     self._fixMailchimpJS();
                 });
@@ -179,47 +173,14 @@ define(
                 $("#row_mailchimp_ecommerce_reset_errors_retry").show();
                 $("#mailchimp_ecommerce_reset_errors_retry").show();
                 $("#row_mailchimp_ecommerce_reset_errors_noretry").show();
-                $("#mailchimp_ecommerce_reset_errors_noretry").show();
                 $("#row_mailchimp_ecommerce_clean_errors_months").show();
                 $("#mailchimp_ecommerce_clean_errors_months").show();
+                $("#mailchimp_ecommerce_reset_errors_noretry").show();
                 $("#row_mailchimp_ecommerce_delete_store").show();
                 $("#mailchimp_ecommerce_delete_store").show();
                 $("#row_mailchimp_ecommerce_resync_products").show();
                 $("#mailchimp_ecommerce_resync_products").show();
             },
-            _checkCleanButton: function () {
-                var checkEcommerceUrl = this.options.checkEcommerceUrl;
-                $.ajax({
-                    url: checkEcommerceUrl,
-                    data: {'form_key': window.FORM_KEY},
-                    type: 'GET',
-                    dataType: 'json',
-                    showLoader: true
-                }).done(function (data) {
-                    if (data.valid == -1) {
-                        alert({content: 'Error: can\'t check the unused registers'});
-                    } else if (data.valid == 0) {
-                        $('#row_mailchimp_general_clean_ecommerce').hide();
-                        $('#mailchimp_general_clean_ecommerce').hide();
-                    }
-                });
-            },
-            _cleanEcommerce: function () {
-                var cleanEcommerceUrl = this.options.cleanEcommerceUrl;
-                $.ajax({
-                    url: cleanEcommerceUrl,
-                    data: {'form_key': window.FORM_KEY},
-                    type: 'GET',
-                    dataType: 'json',
-                    showLoader: true
-                }).done(function (data) {
-                    if (data.valid == 0) {
-                        alert({content: 'Error: can\'t remove the unused registers'});
-                    } else if (data.valid == 1) {
-                        alert({content: 'All unused registers are deleted'});
-                    }
-                });
-            },
             _fixMailchimpJS: function ()
             {
                 var fixMailchimpjsUrl = this.options.fixMailchimpjsUrl;