Conlabz_CrConnect - Version 3.2.3

Version Notes

Feature: revised feed url

Download this release

Release Info

Developer Conlabz GmbH
Extension Conlabz_CrConnect
Version 3.2.3
Comparing to
See all releases


Code changes from version 3.2.0 to 3.2.3

Files changed (5) hide show
  1. app/code/community/Conlabz/CrConnect/Block/Config/Url.php +2 -2
  2. app/code/community/Conlabz/CrConnect/Model/Api.php +7 -1
  3. app/code/community/Conlabz/CrConnect/Model/Observer.php +2 -2
  4. app/code/community/Conlabz/CrConnect/etc/config.xml +7 -7
  5. package.xml +5 -5
app/code/community/Conlabz/CrConnect/Block/Config/Url.php CHANGED
@@ -6,8 +6,8 @@ class Conlabz_CrConnect_Block_Config_Url extends Mage_Adminhtml_Block_System_Con
6
  */
7
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
8
  {
9
- $url = Mage::getUrl('crconnect/search/index');
10
  $url .= "<font color='red'>store/1/</font>";
11
- return "<b>".$url."</b>";
12
  }
13
  }
6
  */
7
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
8
  {
9
+ $url = Mage::getUrl('crconnect/search/index', array('password' => $this->__('[Your inserted password above]')));
10
  $url .= "<font color='red'>store/1/</font>";
11
+ return '<b style="white-space: nowrap;">'.$url."</b>";
12
  }
13
  }
app/code/community/Conlabz/CrConnect/Model/Api.php CHANGED
@@ -7,6 +7,7 @@ class Conlabz_CrConnect_Model_Api extends Mage_Core_Model_Abstract
7
  const SUCCESS_STATUS = "SUCCESS";
8
 
9
  const ERROR_CODE_DUPLICATED = 50;
 
10
  const ERROR_CODE_INVALID = 40;
11
 
12
  public function __construct()
@@ -429,7 +430,7 @@ class Conlabz_CrConnect_Model_Api extends Mage_Core_Model_Abstract
429
  $this->_helper->log("during formsSendActivationMail :: receiverAdd :: ERROR");
430
  $this->_helper->log($addResult);
431
 
432
- if ($addResult->statuscode == self::ERROR_CODE_DUPLICATED) {
433
  if ($addResult->data->deactivated == 1) {
434
  // Send activation email for customer
435
  $formId = $this->_helper->getFormsIds($groupId, true);
@@ -598,6 +599,11 @@ class Conlabz_CrConnect_Model_Api extends Mage_Core_Model_Abstract
598
  unset($fields[$a->key]);
599
  }
600
  }
 
 
 
 
 
601
  foreach ($fields as $field) {
602
  $return = $this->_client->groupAttributeAdd($this->_apiKey, $listId, $field, "text", "");
603
  }
7
  const SUCCESS_STATUS = "SUCCESS";
8
 
9
  const ERROR_CODE_DUPLICATED = 50;
10
+ const ERROR_CODE_DUPLICATED_WITH_ORDERS = 55;
11
  const ERROR_CODE_INVALID = 40;
12
 
13
  public function __construct()
430
  $this->_helper->log("during formsSendActivationMail :: receiverAdd :: ERROR");
431
  $this->_helper->log($addResult);
432
 
433
+ if (in_array($addResult->statuscode, array(self::ERROR_CODE_DUPLICATED, self::ERROR_CODE_DUPLICATED_WITH_ORDERS))) {
434
  if ($addResult->data->deactivated == 1) {
435
  // Send activation email for customer
436
  $formId = $this->_helper->getFormsIds($groupId, true);
599
  unset($fields[$a->key]);
600
  }
601
  }
602
+
603
+ if (empty($fields)) {
604
+ return true;
605
+ }
606
+
607
  foreach ($fields as $field) {
608
  $return = $this->_client->groupAttributeAdd($this->_apiKey, $listId, $field, "text", "");
609
  }
app/code/community/Conlabz/CrConnect/Model/Observer.php CHANGED
@@ -215,7 +215,7 @@ class Conlabz_CrConnect_Model_Observer
215
  $allow = false;
216
  }
217
  if (!$allow) {
218
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('Double Opt-In is enabled, please select form(s) and group(s) for your customer groups.'));
219
  }
220
  }
221
  }
@@ -226,7 +226,7 @@ class Conlabz_CrConnect_Model_Observer
226
 
227
  $setupResult = Mage::getModel('crconnect/api')->setupDefaultCleverReachList();
228
  if (!$setupResult) {
229
- $session->addError("Could not connect to or receive any data from CleverReach. Please check your API key, selected group(s) and form(s).");
230
  }
231
  }
232
  }
215
  $allow = false;
216
  }
217
  if (!$allow) {
218
+ Mage::getSingleton('adminhtml/session')->addError(Mage::helper('crconnect')->__('Double Opt-In is enabled, please select form(s) and group(s) for your customer groups.'));
219
  }
220
  }
221
  }
226
 
227
  $setupResult = Mage::getModel('crconnect/api')->setupDefaultCleverReachList();
228
  if (!$setupResult) {
229
+ $session->addError(Mage::helper('crconnect')->__("Could not connect to or receive any data from CleverReach. Please check your API key, selected group(s) and form(s)."));
230
  }
231
  }
232
  }
app/code/community/Conlabz/CrConnect/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Conlabz_CrConnect>
5
- <version>3.2.0</version>
6
  </Conlabz_CrConnect>
7
  </modules>
8
  <global>
@@ -129,12 +129,12 @@
129
  <admin>
130
  <routers>
131
  <adminhtml>
132
-                 <args>
133
-                     <modules>
134
-                     <Conlabz_CrConnect after="Mage_Adminhtml">Conlabz_CrConnect_Adminhtml</Conlabz_CrConnect>
135
-                     </modules>
136
-                 </args>
137
-             </adminhtml>
138
  </routers>
139
  </admin>
140
  <frontend>
2
  <config>
3
  <modules>
4
  <Conlabz_CrConnect>
5
+ <version>3.2.3</version>
6
  </Conlabz_CrConnect>
7
  </modules>
8
  <global>
129
  <admin>
130
  <routers>
131
  <adminhtml>
132
+ <args>
133
+ <modules>
134
+ <Conlabz_CrConnect after="Mage_Adminhtml">Conlabz_CrConnect_Adminhtml</Conlabz_CrConnect>
135
+ </modules>
136
+ </args>
137
+ </adminhtml>
138
  </routers>
139
  </admin>
140
  <frontend>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Conlabz_CrConnect</name>
4
- <version>3.2.0</version>
5
  <stability>stable</stability>
6
  <license>GNU General Public License</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Synchronizes your Magento subscribers, customers and sales with CleverReach Email Marketing Software.</summary>
10
  <description>With CleverReach (http://www.cleverreach.de) you can create professional emails online, dispatch them reliably, track their success and manage receivers. &#xFEFF;&#xFEFF;&#xFEFF;CleverReach&#xFEFF;&#xFEFF;&#xFEFF; is equipped with a particularly user-friendly interface, which you can use intuitively and without special knowledge.</description>
11
- <notes>Feature: Adding orders to the synchronization</notes>
12
  <authors><author><name>conlabz GmbH</name><user>conlabz</user><email>info@conlabz.de</email></author></authors>
13
- <date>2016-09-21</date>
14
- <time>12:55:21</time>
15
- <contents><target name="magecommunity"><dir name="Conlabz"><dir name="CrConnect"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Newsletter.php" hash="ff47d3028a8e766077ee78affd52eea6"/></dir></dir></dir><dir name="Newsletter"><file name="Subscriber.php" hash="e1b516bc593a41bcc6d00b259776c8b8"/></dir></dir><dir name="Config"><file name="GroupsApis.php" hash="9f1fae68c4224144a42d400b14d4d7d6"/><file name="Key.php" hash="e8467e4fe47aa6965ac7284978a08dbd"/><file name="Url.php" hash="becf4140ce0997e95548b758d8b7ed68"/></dir><dir name="Customer"><file name="Newsletter.php" hash="9c013645664761cf4e56e79a66e79cbf"/></dir><file name="Groupsapis.php" hash="f20a158b439469cdd498b16cc459ab4a"/></dir><dir name="Helper"><file name="Data.php" hash="a7bbe5176dc9fa164270ceb6396cd4cb"/></dir><dir name="Model"><file name="Api.php" hash="b65ab7e7cd2ecaf3d1048c8e0d57c74d"/><dir name="Checkout"><file name="Observer.php" hash="8fd916c7332ce6ebfa9197666c2987a9"/></dir><dir name="Customer"><file name="Observer.php" hash="878370bd5958b3813f0b90f395b27ecf"/></dir><dir name="Newsletter"><file name="Subscriber.php" hash="96e4b452bf916d5afa209cb80192eba0"/></dir><file name="Observer.php" hash="7da2f897697c76d4b662252bb6f0b071"/><file name="Search.php" hash="5419d8b49f901e2d28eff3d57ae9de4f"/><file name="Subscriber.php" hash="3e3698a40f540a038ad4dc56e1975070"/><dir name="System"><dir name="Config"><dir name="Source"><file name="EmptyForms.php" hash="910b9588b11edf73be1fc0103e49b997"/><file name="EmptyList.php" hash="6fe676d12ff5fa9231c3b0869b1ec750"/></dir></dir></dir><dir name="Website"><file name="Observer.php" hash="6c068fc61ae6ed512cbdce2a28f48cb7"/></dir></dir><dir name="Test"><dir name="Config"><file name="ActivationXml.php" hash="0270720ffc36ea493b9c976377bdfdcd"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="CrconfigController.php" hash="fdb46a1200e564d69426aba8a518e487"/><file name="CrconnectController.php" hash="fa3cb1d4f515cabd0e378715258db203"/></dir><file name="HookController.php" hash="2c81dd3ebd9310ca86afc732b2e2d1c6"/><file name="ManageController.php" hash="12ff08a154cb21dc0fe4fed3cd718d1c"/><file name="SearchController.php" hash="0141ec8a414c86619ff63c6a856af470"/><file name="SubscriberController.php" hash="3bbf81a698e630d4a04f638a53ecd3e9"/><file name="UnsubscribeController.php" hash="eaba3ee3bef995d4bb6f7e17b1709585"/></dir><dir name="etc"><file name="adminhtml.xml" hash="05f8a5b43c8abe877f05e09eec5d8c65"/><file name="config.xml" hash="f9f635392b3b3e2e2d6c9b79c06f836a"/><file name="jstranslator.xml" hash="040e5e790dcae18ddf223d54e38e45b0"/><file name="system.xml" hash="634952e319523e7640152ddaeedeaef9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Conlabz_CrConnect.xml" hash="dd6482e7f0daedb3387e80bdff66f321"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="crconnect.xml" hash="dd115195559fe2058fbd6fbdceabdddc"/></dir><dir name="template"><dir name="crconnect"><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="a533451e27b90284d3414e391b460231"/></dir></dir><dir name="form"><file name="newsletter.phtml" hash="4a1309d0d6d2587c8534dd4a1ccdf235"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="crconnect.xml" hash="fac2e1194c8c007a54abfe3e82fd6834"/></dir><dir name="template"><dir name="crconnect"><file name="config.phtml" hash="9f2232c8311fa439434d8023181a7ab5"/><dir name="newsletter"><dir name="subscriber"><file name="list.phtml" hash="2d7dd105e2c543d19746ada03fa54ff8"/></dir></dir><dir name="system"><dir name="config"><dir name="form"><dir name="field"><file name="array_groups.phtml" hash="ac84db9b1e8b342337a478ecba62e0b1"/><file name="cr_array_groups.phtml" hash="c924ef81c5699817327580eb7b8a2e86"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Conlabz_CleverReach.csv" hash="4cb844c7288d9995d21d39eb4015fa44"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="cleverreach"><file name="cleverreach-logo.png" hash="bff60f831ca9e1dc9bcbdb2e3f5a5805"/></dir></dir><dir name="js"><file name="crconnect.js" hash="481f77d2331b82c7c6043e72043f5c26"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Conlabz_CrConnect</name>
4
+ <version>3.2.3</version>
5
  <stability>stable</stability>
6
  <license>GNU General Public License</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Synchronizes your Magento subscribers, customers and sales with CleverReach Email Marketing Software.</summary>
10
  <description>With CleverReach (http://www.cleverreach.de) you can create professional emails online, dispatch them reliably, track their success and manage receivers. &#xFEFF;&#xFEFF;&#xFEFF;CleverReach&#xFEFF;&#xFEFF;&#xFEFF; is equipped with a particularly user-friendly interface, which you can use intuitively and without special knowledge.</description>
11
+ <notes>Feature: revised feed url</notes>
12
  <authors><author><name>conlabz GmbH</name><user>conlabz</user><email>info@conlabz.de</email></author></authors>
13
+ <date>2017-03-16</date>
14
+ <time>10:28:25</time>
15
+ <contents><target name="magecommunity"><dir name="Conlabz"><dir name="CrConnect"><dir name="Block"><dir name="Adminhtml"><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Newsletter.php" hash="ff47d3028a8e766077ee78affd52eea6"/></dir></dir></dir><dir name="Newsletter"><file name="Subscriber.php" hash="e1b516bc593a41bcc6d00b259776c8b8"/></dir></dir><dir name="Config"><file name="GroupsApis.php" hash="9f1fae68c4224144a42d400b14d4d7d6"/><file name="Key.php" hash="e8467e4fe47aa6965ac7284978a08dbd"/><file name="Url.php" hash="19519ce690aedccea366d011384864d4"/></dir><dir name="Customer"><file name="Newsletter.php" hash="9c013645664761cf4e56e79a66e79cbf"/></dir><file name="Groupsapis.php" hash="f20a158b439469cdd498b16cc459ab4a"/></dir><dir name="Helper"><file name="Data.php" hash="a7bbe5176dc9fa164270ceb6396cd4cb"/></dir><dir name="Model"><file name="Api.php" hash="db8f68475af21f50d2a9c596c0ccb3b1"/><dir name="Checkout"><file name="Observer.php" hash="8fd916c7332ce6ebfa9197666c2987a9"/></dir><dir name="Customer"><file name="Observer.php" hash="878370bd5958b3813f0b90f395b27ecf"/></dir><dir name="Newsletter"><file name="Subscriber.php" hash="96e4b452bf916d5afa209cb80192eba0"/></dir><file name="Observer.php" hash="202d8c66a903545f4dcaaeaf482bbe2e"/><file name="Search.php" hash="5419d8b49f901e2d28eff3d57ae9de4f"/><file name="Subscriber.php" hash="3e3698a40f540a038ad4dc56e1975070"/><dir name="System"><dir name="Config"><dir name="Source"><file name="EmptyForms.php" hash="910b9588b11edf73be1fc0103e49b997"/><file name="EmptyList.php" hash="6fe676d12ff5fa9231c3b0869b1ec750"/></dir></dir></dir><dir name="Website"><file name="Observer.php" hash="6c068fc61ae6ed512cbdce2a28f48cb7"/></dir></dir><dir name="Test"><dir name="Config"><file name="ActivationXml.php" hash="0270720ffc36ea493b9c976377bdfdcd"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="CrconfigController.php" hash="fdb46a1200e564d69426aba8a518e487"/><file name="CrconnectController.php" hash="fa3cb1d4f515cabd0e378715258db203"/></dir><file name="HookController.php" hash="2c81dd3ebd9310ca86afc732b2e2d1c6"/><file name="ManageController.php" hash="12ff08a154cb21dc0fe4fed3cd718d1c"/><file name="SearchController.php" hash="0141ec8a414c86619ff63c6a856af470"/><file name="SubscriberController.php" hash="3bbf81a698e630d4a04f638a53ecd3e9"/><file name="UnsubscribeController.php" hash="eaba3ee3bef995d4bb6f7e17b1709585"/></dir><dir name="etc"><file name="adminhtml.xml" hash="05f8a5b43c8abe877f05e09eec5d8c65"/><file name="config.xml" hash="e4efa9fc014e78ee1f0084b96072a96d"/><file name="jstranslator.xml" hash="040e5e790dcae18ddf223d54e38e45b0"/><file name="system.xml" hash="634952e319523e7640152ddaeedeaef9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Conlabz_CrConnect.xml" hash="dd6482e7f0daedb3387e80bdff66f321"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="crconnect.xml" hash="dd115195559fe2058fbd6fbdceabdddc"/></dir><dir name="template"><dir name="crconnect"><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="a533451e27b90284d3414e391b460231"/></dir></dir><dir name="form"><file name="newsletter.phtml" hash="4a1309d0d6d2587c8534dd4a1ccdf235"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="crconnect.xml" hash="fac2e1194c8c007a54abfe3e82fd6834"/></dir><dir name="template"><dir name="crconnect"><file name="config.phtml" hash="9f2232c8311fa439434d8023181a7ab5"/><dir name="newsletter"><dir name="subscriber"><file name="list.phtml" hash="2d7dd105e2c543d19746ada03fa54ff8"/></dir></dir><dir name="system"><dir name="config"><dir name="form"><dir name="field"><file name="array_groups.phtml" hash="ac84db9b1e8b342337a478ecba62e0b1"/><file name="cr_array_groups.phtml" hash="c924ef81c5699817327580eb7b8a2e86"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Conlabz_CleverReach.csv" hash="4cb844c7288d9995d21d39eb4015fa44"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="cleverreach"><file name="cleverreach-logo.png" hash="bff60f831ca9e1dc9bcbdb2e3f5a5805"/></dir></dir><dir name="js"><file name="crconnect.js" hash="481f77d2331b82c7c6043e72043f5c26"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>