-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1170 from mailchimp/pre-release/1.1.20
Pre release/1.1.20
- Loading branch information
Showing
28 changed files
with
1,946 additions
and
648 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Resendecommercedata/Comment.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
|
|
||
| class Ebizmarts_MailChimp_Model_Adminhtml_Resendecommercedata_Comment | ||
| { | ||
| /** | ||
| * @var Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| protected $_mcHelper; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->setMcHelper(); | ||
| } | ||
|
|
||
| /** | ||
| * @return Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| public function getMcHelper() | ||
| { | ||
| return $this->_mcHelper; | ||
| } | ||
|
|
||
| /** | ||
| * @param Ebizmarts_MailChimp_Helper_Data $mcHelper | ||
| */ | ||
| public function setMcHelper() | ||
| { | ||
| $this->_mcHelper = Mage::helper('mailchimp'); | ||
| } | ||
|
|
||
| /** | ||
| * @return string | ||
| */ | ||
| public function getCommentText() | ||
| { | ||
| $helper = $this->getMcHelper(); | ||
| $scopeArray = $helper->getCurrentScope(); | ||
| $scope = $scopeArray['scope']; | ||
|
|
||
| if ($scope === "default"){ | ||
| $comment = $helper->__("This will resend the ecommerce data " | ||
| ."for all Websites and Store Views."); | ||
| } else { | ||
| $websiteOrStoreViewScope = $this->_getScope($scopeArray); | ||
| $comment = $helper->__("This will resend the ecommerce data " | ||
| ."for %s only.", $websiteOrStoreViewScope); | ||
| } | ||
|
|
||
| return $comment; | ||
| } | ||
|
|
||
| /** | ||
| * @param $scopeArray | ||
| * @return string | ||
| */ | ||
| protected function _getScope($scopeArray) | ||
| { | ||
| $scope = $scopeArray['scope']; | ||
| if ($scope == "websites"){ | ||
| $result = "this Website"; | ||
| } else { | ||
| $result = "this Store View"; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Resendsubscribers/Comment.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
|
|
||
| class Ebizmarts_MailChimp_Model_Adminhtml_Resendsubscribers_Comment | ||
| { | ||
| /** | ||
| * @var Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| protected $_mcHelper; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->setMcHelper(); | ||
| } | ||
|
|
||
| /** | ||
| * @return Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| public function getMcHelper() | ||
| { | ||
| return $this->_mcHelper; | ||
| } | ||
|
|
||
| /** | ||
| * @param Ebizmarts_MailChimp_Helper_Data $mcHelper | ||
| */ | ||
| public function setMcHelper() | ||
| { | ||
| $this->_mcHelper = Mage::helper('mailchimp'); | ||
| } | ||
|
|
||
| /** | ||
| * @return string | ||
| */ | ||
| public function getCommentText() | ||
| { | ||
| $helper = $this->getMcHelper(); | ||
| $scopeArray = $helper->getCurrentScope(); | ||
| $scope = $scopeArray['scope']; | ||
|
|
||
| if ($scope === "default"){ | ||
| $comment = $helper->__("This will resend the subscribers " | ||
| ."for all Websites and Store Views."); | ||
| } else { | ||
| $websiteOrStoreViewScope = $this->_getScope($scopeArray); | ||
| $comment = $helper->__("This will resend the subscribers " | ||
| ."for %s only.", $websiteOrStoreViewScope); | ||
| } | ||
|
|
||
| return $comment; | ||
| } | ||
|
|
||
| /** | ||
| * @param $scopeArray | ||
| * @return string | ||
| */ | ||
| protected function _getScope($scopeArray) | ||
| { | ||
| $scope = $scopeArray['scope']; | ||
| if ($scope == "websites"){ | ||
| $result = "this Website"; | ||
| } else { | ||
| $result = "this Store View"; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
app/code/community/Ebizmarts/MailChimp/Model/Adminhtml/Reseterrors/Comment.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
|
|
||
| class Ebizmarts_MailChimp_Model_Adminhtml_Reseterrors_Comment | ||
| { | ||
| /** | ||
| * @var Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| protected $_mcHelper; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->setMcHelper(); | ||
| } | ||
|
|
||
| /** | ||
| * @return Ebizmarts_MailChimp_Helper_Data | ||
| */ | ||
| public function getMcHelper() | ||
| { | ||
| return $this->_mcHelper; | ||
| } | ||
|
|
||
| /** | ||
| * @param Ebizmarts_MailChimp_Helper_Data $mcHelper | ||
| */ | ||
| public function setMcHelper() | ||
| { | ||
| $this->_mcHelper = Mage::helper('mailchimp'); | ||
| } | ||
|
|
||
| /** | ||
| * @return string | ||
| */ | ||
| public function getCommentText() | ||
| { | ||
| $helper = $this->getMcHelper(); | ||
| $scopeArray = $helper->getCurrentScope(); | ||
| $scope = $scopeArray['scope']; | ||
|
|
||
| if ($scope == "default"){ | ||
| $comment = $helper->__("This will reset the errors " | ||
| ."for all Websites and Store Views."); | ||
| } else { | ||
| $websiteOrStoreViewScope = $this->_getScope($scopeArray); | ||
| $comment = $helper->__("This will reset the errors " | ||
| ."for %s only.", $websiteOrStoreViewScope); | ||
| } | ||
|
|
||
| return $comment; | ||
| } | ||
|
|
||
| /** | ||
| * @param $scopeArray | ||
| * @return string | ||
| */ | ||
| protected function _getScope($scopeArray) | ||
| { | ||
| $scope = $scopeArray['scope']; | ||
| if ($scope == "websites"){ | ||
| $result = "this Website"; | ||
| } else { | ||
| $result = "this Store View"; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.