Skip to content

Commit 270db22

Browse files
SantiagoebizmartsSantiagoebizmarts
authored
Merge pull request #1170 from mailchimp/pre-release/1.1.20
Pre release/1.1.20
2 parents 215ea17 + cf97015 commit 270db22

File tree

28 files changed

+1946
-648
lines changed

28 files changed

+1946
-648
lines changed

‎CHANGELOG.md

+23-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
11
# Changelog
2-
## [1.1.19](https://github.com/mailchimp/mc-magento/releases/tag/1.1.19) - 2020-01-03
2+
## [1.1.20](https://github.com/mailchimp/mc-magento/releases/tag/1.1.20) - 2020-03-30
3+
**Fixed**
4+
- Not sending emails using Mandrill when new customer register. [\#1159](https://github.com/mailchimp/mc-magento/issues/1159)
5+
- Mandrill configuration showing: --- Invalid API KEY --- even if API key is correct [\#1157](https://github.com/mailchimp/mc-magento/issues/1157)
6+
- Warning: include(Ebizmarts/MailChimp/Model/Resource/Ecommercesyncdata/Promorules/Collection.php): failed to open stream: No such file or directory in /data/web/jenkins/public/builds/current/lib/Varien/Autoload.php on line 94 [\#1156](https://github.com/mailchimp/mc-magento/issues/1156)
7+
- Limit local length of Merge Field to be the same size as in Mailchimp. [\#1140](https://github.com/mailchimp/mc-magento/issues/1140)
8+
- Loading animation remains forever if there are no lists in the account after placing API Key [\#1136](https://github.com/mailchimp/mc-magento/issues/1136)
9+
- Remove the mc_eid logic. [\#1141](https://github.com/mailchimp/mc-magento/issues/1141)
10+
- Javascript error in campaignCatcher.js [\#1147](https://github.com/mailchimp/mc-magento/issues/1147)
11+
12+
**Changed**
13+
- Only 10 interest group checkboxes showed after checkout [\#1135](https://github.com/mailchimp/mc-magento/issues/1135)
14+
- Add Customer data update based on map fields in webhook [\#1110](https://github.com/mailchimp/mc-magento/issues/1110)
15+
- Add explanation on warning when clicking Resend and Reset buttons with what scope will be deleted. [\#1142](https://github.com/mailchimp/mc-magento/issues/1142)
16+
17+
## [1.1.19](https://github.com/mailchimp/mc-magento/releases/tag/1.1.19) - 2020-03-03
18+
**Fixed**
19+
- Serializer error when Magento is compiled. [\#1116](https://github.com/mailchimp/mc-magento/issues/1116)
20+
- Missing getWebhooks() function on Lib. [\#1115](https://github.com/mailchimp/mc-magento/issues/1115)
21+
- Error in Cron error while executing mailchimp_clear_ecommerce_data [\#1112](https://github.com/mailchimp/mc-magento/issues/1112)
22+
- Fix incorrect class declaration in function setEcommerceSyncDataItemValues [\#1103](https://github.com/mailchimp/mc-magento/issues/1103)
23+
324
**Changed**
425
- Refactor collection filters to avoid doing joins, where, etc outside resources. [\#1119](https://github.com/mailchimp/mc-magento/issues/1119)
526
- Allow translation of texts on app/code/community/Ebizmarts/MailChimp/controllers/CartController.php [\#1118](https://github.com/mailchimp/mc-magento/issues/1118)
27+
- Add Customer Interest Groups update based on webhook [\#1111](https://github.com/mailchimp/mc-magento/issues/1111)
628
- Add Mailchimp configuration link at Newsletter -> Mailchimp menu [\#1107](https://github.com/mailchimp/mc-magento/issues/1107)
729
- Log the product id if is not supported by Mailchimp [\#1101](https://github.com/mailchimp/mc-magento/issues/1101)
830
- Exceptions not treated properly. [\#1098](https://github.com/mailchimp/mc-magento/issues/1098)
@@ -12,11 +34,6 @@
1234
- Unify Ecommerce Items Classes [\#1064](https://github.com/mailchimp/mc-magento/issues/1064)
1335
- Create option in backend adminhtml to subsribe customers [\#450](https://github.com/mailchimp/mc-magento/issues/450)
1436

15-
**Fixed**
16-
- Serializer error when Magento is compiled. [\#1116](https://github.com/mailchimp/mc-magento/issues/1116)
17-
- Missing getWebhooks() function on Lib. [\#1115](https://github.com/mailchimp/mc-magento/issues/1115)
18-
- Fix incorrect class declaration in function setEcommerceSyncDataItemValues [\#1103](https://github.com/mailchimp/mc-magento/issues/1103)
19-
2037
## [1.1.18](https://github.com/mailchimp/mc-magento/releases/tag/1.1.18) - 2019-10-07
2138
**Changed**
2239
- Avoid sending carts until the initial sync finishes [\#1073](https://github.com/mailchimp/mc-magento/issues/1073)

‎app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Form/Field/Mapfields.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function _renderCellTemplate($columnName)
9191
$rendered .= '</select>';
9292
} else {
9393
return
94-
'<input type="text" name="'
94+
'<input type="text" maxlength="10" name="'
9595
. $inputName . '" value="#{' . $columnName . '}" '
9696
. ($column['size'] ? 'size="' . $column['size'] . '"' : '') . '/>';
9797
}

‎app/code/community/Ebizmarts/MailChimp/Helper/Curl.php

+22-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
class Ebizmarts_MailChimp_Helper_Curl extends Mage_Core_Helper_Abstract
1717
{
1818
/**
19-
* @param array $options
20-
* @return array An array with...
19+
* @var Mage_HTTP_Client_Curl
20+
*/
21+
protected $_curl;
22+
/**
23+
* @param $url
24+
* @param $httpMethod
25+
* @param array $curlOptions
26+
* @param array $params
27+
* @return array
2128
*/
2229
public function curlExec($url, $httpMethod, $curlOptions = array(), $params = array())
2330
{
@@ -30,28 +37,36 @@ public function curlExec($url, $httpMethod, $curlOptions = array(), $params = ar
3037
}
3138

3239
$curlError = null;
33-
$curl = new Mage_HTTP_Client_Curl();
40+
$this->_curl = new Mage_HTTP_Client_Curl();
3441

3542
foreach ($curlOptions as $key => $value) {
3643
if (isset($value)) {
37-
$curl->setOption($key, $value);
44+
$this->_curl->setOption($key, $value);
3845
}
3946
}
4047

4148
$curlResult = null;
4249

4350
try {
4451
if ($httpMethod == Zend_Http_Client::GET) {
45-
$curl->get($url);
52+
$this->_curl->get($url);
4653
} elseif ($httpMethod == Zend_Http_Client::POST) {
47-
$curl->post($url, $params);
54+
$this->_curl->post($url, $params);
4855
}
4956

50-
$curlResult = $curl->getBody();
57+
$curlResult = $this->_curl->getBody();
5158
} catch (Exception $e) {
5259
$curlError = $e->getMessage();
5360
}
5461

5562
return array('response' => $curlResult, 'error' => $curlError);
5663
}
64+
65+
/**+
66+
* @return int
67+
*/
68+
public function getStatus()
69+
{
70+
return $this->_curl->getStatus();
71+
}
5772
}

‎app/code/community/Ebizmarts/MailChimp/Helper/Data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4464,7 +4464,7 @@ public function getInterest($storeId)
44644464
$apiInterestCategoryInterest = $apiInterestCategory->getInterests();
44654465

44664466
foreach ($interest as $interestId) {
4467-
$mailchimpInterest = $apiInterestCategoryInterest->getAll($listId, $interestId);
4467+
$mailchimpInterest = $apiInterestCategoryInterest->getAll($listId, $interestId, null, null, 100);
44684468

44694469
foreach ($mailchimpInterest['interests'] as $mi) {
44704470
$rc[$mi['category_id']]['category'][$mi['display_order']] =

‎app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Resendecommercedata/Comment.php

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
3+
class Ebizmarts_MailChimp_Model_Adminhtml_Resendecommercedata_Comment
4+
{
5+
/**
6+
* @var Ebizmarts_MailChimp_Helper_Data
7+
*/
8+
protected $_mcHelper;
9+
10+
public function __construct()
11+
{
12+
$this->setMcHelper();
13+
}
14+
15+
/**
16+
* @return Ebizmarts_MailChimp_Helper_Data
17+
*/
18+
public function getMcHelper()
19+
{
20+
return $this->_mcHelper;
21+
}
22+
23+
/**
24+
* @param Ebizmarts_MailChimp_Helper_Data $mcHelper
25+
*/
26+
public function setMcHelper()
27+
{
28+
$this->_mcHelper = Mage::helper('mailchimp');
29+
}
30+
31+
/**
32+
* @return string
33+
*/
34+
public function getCommentText()
35+
{
36+
$helper = $this->getMcHelper();
37+
$scopeArray = $helper->getCurrentScope();
38+
$scope = $scopeArray['scope'];
39+
40+
if ($scope === "default"){
41+
$comment = $helper->__("This will resend the ecommerce data "
42+
."for all Websites and Store Views.");
43+
} else {
44+
$websiteOrStoreViewScope = $this->_getScope($scopeArray);
45+
$comment = $helper->__("This will resend the ecommerce data "
46+
."for %s only.", $websiteOrStoreViewScope);
47+
}
48+
49+
return $comment;
50+
}
51+
52+
/**
53+
* @param $scopeArray
54+
* @return string
55+
*/
56+
protected function _getScope($scopeArray)
57+
{
58+
$scope = $scopeArray['scope'];
59+
if ($scope == "websites"){
60+
$result = "this Website";
61+
} else {
62+
$result = "this Store View";
63+
}
64+
65+
return $result;
66+
}
67+
}

‎app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Resendsubscribers/Comment.php

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
3+
class Ebizmarts_MailChimp_Model_Adminhtml_Resendsubscribers_Comment
4+
{
5+
/**
6+
* @var Ebizmarts_MailChimp_Helper_Data
7+
*/
8+
protected $_mcHelper;
9+
10+
public function __construct()
11+
{
12+
$this->setMcHelper();
13+
}
14+
15+
/**
16+
* @return Ebizmarts_MailChimp_Helper_Data
17+
*/
18+
public function getMcHelper()
19+
{
20+
return $this->_mcHelper;
21+
}
22+
23+
/**
24+
* @param Ebizmarts_MailChimp_Helper_Data $mcHelper
25+
*/
26+
public function setMcHelper()
27+
{
28+
$this->_mcHelper = Mage::helper('mailchimp');
29+
}
30+
31+
/**
32+
* @return string
33+
*/
34+
public function getCommentText()
35+
{
36+
$helper = $this->getMcHelper();
37+
$scopeArray = $helper->getCurrentScope();
38+
$scope = $scopeArray['scope'];
39+
40+
if ($scope === "default"){
41+
$comment = $helper->__("This will resend the subscribers "
42+
."for all Websites and Store Views.");
43+
} else {
44+
$websiteOrStoreViewScope = $this->_getScope($scopeArray);
45+
$comment = $helper->__("This will resend the subscribers "
46+
."for %s only.", $websiteOrStoreViewScope);
47+
}
48+
49+
return $comment;
50+
}
51+
52+
/**
53+
* @param $scopeArray
54+
* @return string
55+
*/
56+
protected function _getScope($scopeArray)
57+
{
58+
$scope = $scopeArray['scope'];
59+
if ($scope == "websites"){
60+
$result = "this Website";
61+
} else {
62+
$result = "this Store View";
63+
}
64+
65+
return $result;
66+
}
67+
}

‎app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Reseterrors/Comment.php

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
3+
class Ebizmarts_MailChimp_Model_Adminhtml_Reseterrors_Comment
4+
{
5+
/**
6+
* @var Ebizmarts_MailChimp_Helper_Data
7+
*/
8+
protected $_mcHelper;
9+
10+
public function __construct()
11+
{
12+
$this->setMcHelper();
13+
}
14+
15+
/**
16+
* @return Ebizmarts_MailChimp_Helper_Data
17+
*/
18+
public function getMcHelper()
19+
{
20+
return $this->_mcHelper;
21+
}
22+
23+
/**
24+
* @param Ebizmarts_MailChimp_Helper_Data $mcHelper
25+
*/
26+
public function setMcHelper()
27+
{
28+
$this->_mcHelper = Mage::helper('mailchimp');
29+
}
30+
31+
/**
32+
* @return string
33+
*/
34+
public function getCommentText()
35+
{
36+
$helper = $this->getMcHelper();
37+
$scopeArray = $helper->getCurrentScope();
38+
$scope = $scopeArray['scope'];
39+
40+
if ($scope == "default"){
41+
$comment = $helper->__("This will reset the errors "
42+
."for all Websites and Store Views.");
43+
} else {
44+
$websiteOrStoreViewScope = $this->_getScope($scopeArray);
45+
$comment = $helper->__("This will reset the errors "
46+
."for %s only.", $websiteOrStoreViewScope);
47+
}
48+
49+
return $comment;
50+
}
51+
52+
/**
53+
* @param $scopeArray
54+
* @return string
55+
*/
56+
protected function _getScope($scopeArray)
57+
{
58+
$scope = $scopeArray['scope'];
59+
if ($scope == "websites"){
60+
$result = "this Website";
61+
} else {
62+
$result = "this Store View";
63+
}
64+
65+
return $result;
66+
}
67+
}

‎app/code/community/Ebizmarts/MailChimp/Model/Api/PromoCodes.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public function createEcommercePromoCodesCollection()
473473
/**
474474
* @var $collection Ebizmarts_MailChimp_Model_Resource_Ecommercesyncdata_PromoCodes_Collection
475475
*/
476-
$collection = Mage::getResourceModel('mailchimp/ecommercesyncdata_promocodes_collection');
476+
$collection = Mage::getResourceModel('mailchimp/ecommercesyncdata_promoCodes_collection');
477477

478478
return $collection;
479479
}

‎app/code/community/Ebizmarts/MailChimp/Model/Api/PromoRules.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public function createEcommercePromoRulesCollection()
455455
/**
456456
* @var $collection Ebizmarts_MailChimp_Model_Resource_Ecommercesyncdata_PromoRules_Collection
457457
*/
458-
$collection = Mage::getResourceModel('mailchimp/ecommercesyncdata_promorules_collection');
458+
$collection = Mage::getResourceModel('mailchimp/ecommercesyncdata_promoRules_collection');
459459

460460
return $collection;
461461
}

0 commit comments

Comments
 (0)