Skip to content
This repository has been archived by the owner on Jun 1, 2018. It is now read-only.

Commit

Permalink
Minor changes to pull request to add configuration to enable webhook …
Browse files Browse the repository at this point in the history 
…creation.
  • Loading branch information
@Santiagoebizmarts
Santiagoebizmarts committed Jul 14, 2016
1 parent 98a6db2 commit 0d1a09c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ public function saveConfig(Varien_Event_Observer $observer)
} elseif (is_array($additionalLists)) {
foreach ($additionalLists as $additional) {
if ($additional == $selectedLists[0]) {
$message = Mage::helper('monkey')->__('Be Careful! You have choosen the same list for "General Subscription" and "Additionaloo Lists". Please change this values and save the configuration again');
$message = Mage::helper('monkey')->__('Be Careful! You have choosen the same list for "General Subscription" and "Additional Lists". Please change this values and save the configuration again');
Mage::getSingleton('adminhtml/session')->addWarning($message);
}
}
$selectedLists = array_merge($selectedLists, $additionalLists);
}

$webhooksKey = Mage::helper('monkey')->getWebhooksKey();
$allowWebhooks = Mage::getStoreConfig('monkey/general/enable_webhooks');
$allowWebhooks = Mage::getStoreConfig('monkey/general/enable_webhooks', $store);

//Generating Webhooks URL
if($allowWebhooks) {
Expand Down
28 changes: 14 additions & 14 deletions app/code/community/Ebizmarts/MageMonkey/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<can_be_empty>1</can_be_empty>
<comment><![CDATA[Synchronize Magento's General Subscription List with this MailChimp list]]></comment>
<comment><![CDATA[Synchronize Magento's General Subscription List with this MailChimp list.]]></comment>
</list>
<cutomergroup translate="label comment">
<label>Subscriber Group</label>
Expand Down Expand Up @@ -167,7 +167,7 @@
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<can_be_empty>1</can_be_empty>
<comment>All selected lists will be available to customers as additionals lists</comment>
<comment><![CDATA[All selected lists will be available to customers as additionals lists.]]></comment>
</additional_lists>
<confirmation_email translate="label comment">
<label>Use Magento's confirmation email</label>
Expand All @@ -187,7 +187,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment><![CDATA[<b>IMPORTANT</b>: Should be set to <b>Yes</b>. Abusing this may cause your account to be suspended.<br/><a target='_blank' href='http://kb.mailchimp.com/article/how-does-confirmed-optin-or-double-optin-work/'>How does double opt-in work?</a>]]></comment>
<comment><![CDATA[<b>IMPORTANT</b>: Should be set to <b>Yes</b>. Abusing this may cause your account to be suspended.<br/><a target='_blank' href='http://kb.mailchimp.com/article/how-does-confirmed-optin-or-double-optin-work/'>How does double opt-in work?</a>.]]></comment>
</double_optin>
<map_fields translate="label comment">
<label>Customer Fields Mapping</label>
Expand All @@ -206,7 +206,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>This value will be sent as FNAME to MailChimp</comment>
<comment><![CDATA[This value will be sent as FNAME to MailChimp.]]></comment>
</guest_name>
<guest_lastname translate="label comment">
<label>Last Name for Guests subscribers</label>
Expand All @@ -215,7 +215,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>This value will be sent as LNAME to MailChimp</comment>
<comment><![CDATA[This value will be sent as LNAME to MailChimp.]]></comment>
</guest_lastname>
<checkout_subscribe translate="label comment">
<label>Subscribe On Checkout</label>
Expand All @@ -225,7 +225,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>Show Newsletter Subscribe checkbox in the last Checkout Step (Order Review)</comment>
<comment><![CDATA[Show Newsletter Subscribe checkbox in the last Checkout Step (Order Review).]]></comment>
</checkout_subscribe>
<markfield translate="label comment">
<label>Map field to mark</label>
Expand All @@ -234,7 +234,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>Field to distinguish if the user subscribe</comment>
<comment><![CDATA[Field to distinguish if the user subscribe.]]></comment>
</markfield>
<checkout_async translate="label comment">
<label>Use Async subscribe in checkout</label>
Expand Down Expand Up @@ -269,14 +269,14 @@
<comment></comment>
</cron_export>
<enable_webhooks translate="label comment">
<label>Allow the creation and execution of webhooks</label>
<label>Enable two way sync via webhook</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>140</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>Webhooks are created inside your MailChimp Account and are used by MailChimp to sync data back to your site</comment>
<comment><![CDATA[A Webhook associated to the configured list is created inside your MailChimp Account and is used to sync data back to your site.]]></comment>
</enable_webhooks>
<webhook_delete translate="label comment">
<label>Webhooks Delete action</label>
Expand All @@ -297,7 +297,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>Notifications related to campaigns sent, cleaned emails, etc</comment>
<comment><![CDATA[Notifications related to campaigns sent, cleaned emails, etc.]]></comment>
</adminhtml_notification>
<enable_log translate="label comment">
<label>Enable Log</label>
Expand All @@ -307,7 +307,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment>File is {{base_dir}}/var/log/MageMonkey_ApiCall.log</comment>
<comment><![CDATA[File is {{base_dir}}/var/log/MageMonkey_ApiCall.log.]]></comment>
</enable_log>
</fields>
</general>
Expand All @@ -328,7 +328,7 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<can_be_empty>1</can_be_empty>
<comment><![CDATA[Send new orders to MailChimp using Ecommerce360.<br/><a target='_blank' href='http://kb.mailchimp.com/article/how-do-i-turn-on-ecommerce360-tracking-on-my-campaigns/'>How do I turn on Ecommerce360 tracking on my campaigns?</a><br/><a target='_blank' href='http://kb.mailchimp.com/article/how-to-segment-your-list-based-on-your-customers-purchase-activity'>How to segment your list based on your customers purchase activity</a>]]></comment>
<comment><![CDATA[Send new orders to MailChimp using Ecommerce360.<br/><a target='_blank' href='http://kb.mailchimp.com/article/how-do-i-turn-on-ecommerce360-tracking-on-my-campaigns/'>How do I turn on Ecommerce360 tracking on my campaigns?</a><br/><a target='_blank' href='http://kb.mailchimp.com/article/how-to-segment-your-list-based-on-your-customers-purchase-activity'>How to segment your list based on your customers purchase activity</a>.]]></comment>
</active>
<order_status translate="label comment">
<label>Order Status</label>
Expand All @@ -338,7 +338,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<comment><![CDATA[<b>IMPORTANT</b>: By default this function run every one hour. If you want to edit this value visit our <a target='_blank' href='http://wiki.ebizmarts.com/installation/configuration/faq#TOC-How-I-set-up-the-Magento-cron-'>wiki</a>]]></comment>
<comment><![CDATA[<b>IMPORTANT</b>: By default this function run every one hour. If you want to edit this value visit our <a target='_blank' href='http://wiki.ebizmarts.com/installation/configuration/faq#TOC-How-I-set-up-the-Magento-cron-'>wiki</a>.]]></comment>
<depends>
<active>3</active>
</depends>
Expand All @@ -365,7 +365,7 @@
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
<can_be_empty>1</can_be_empty>
<comment>All selected attributes will be sent on the product name to MailChimp for segmentation purposes</comment>
<comment><![CDATA[All selected attributes will be sent on the product name to MailChimp for segmentation purposes.]]></comment>
<depends>
<active separator=",">1,2,3</active>
</depends>
Expand Down

0 comments on commit 0d1a09c

Please sign in to comment.