Merge pull request #1004 from mailchimp/Rename_delete_customer_accoun…

…t_option#992 Rename delete customer account option #992
mailchimp · Jul 22, 2019 · 5a854c0 · 5a854c0
2 parents 3599684 + 76240c6
commit 5a854c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/WebhookDelete.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/WebhookDelete.php
@@ -18,9 +18,11 @@ class Ebizmarts_MailChimp_Model_System_Config_Source_WebhookDelete
      */
     public function toOptionArray()
     {
+        $mailchimpHelper = Mage::helper('mailchimp');
+
         return array(
-            array('value' => 0, 'label' => Mage::helper('mailchimp')->__('Unsubscribe customers')),
-            array('value' => 1, 'label' => Mage::helper('mailchimp')->__('Delete customer account'))
+            array('value' => 0, 'label' => $mailchimpHelper->__('Unsubscribe')),
+            array('value' => 1, 'label' => $mailchimpHelper->__('Delete subscriber'))
         );
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/etc/system.xml b/app/code/community/Ebizmarts/MailChimp/etc/system.xml
@@ -219,6 +219,15 @@
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[Click this button to create the webhook manually, it will only work if the webhook doesn't already exist.]]></comment>
                         </create_webhook>
+                        <webhook_delete translate="label">
+                            <label>Webhook Delete Subscriber Action</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>mailchimp/system_config_source_webhookDelete</source_model>
+                            <sort_order>59</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </webhook_delete>
                         <webhook_active translate="label comment">
                             <label>Enable Two Way Sync</label>
                             <frontend_type>select</frontend_type>
@@ -242,15 +251,6 @@
                             <can_be_empty>1</can_be_empty>
                             <comment><![CDATA[If you enable this Magento confirmation email will be sent for subscribers instead of Mailchimp email.]]></comment>
                         </magento_mail>
-                        <webhook_delete translate="label">
-                            <label>Webhooks Delete action</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>mailchimp/system_config_source_webhookDelete</source_model>
-                            <sort_order>70</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>1</show_in_store>
-                        </webhook_delete>
                         <enable_log translate="label comment">
                             <label>Enable Log</label>
                             <frontend_type>select</frontend_type>