Skip to content

Commit

Permalink
Merge pull request #18 from sendsmaily/release/2.2.0
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
tomkabel authored Jan 28, 2021
2 parents d8b3335 + d320c85 commit 60b9f0e
Showing 3 changed files with 63 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 2.2.0

- Disable Magento newsletter emails if opt-in/out enabled - [[#15](https://github.com/sendsmaily/Sendsmaily-Sync-for-Magento/issues/15)]

### 2.1.1

- Add section to Admin panel for easy access to Smaily RSS-feed
53 changes: 53 additions & 0 deletions app/code/community/Sendsmaily/Sync/Model/Subscriber.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

/**
* Sendsmaily Sync
* Export Magento newsletter subscribers to Sendsmaily
* Copyright (C) 2010 Sendsmaily
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

class Sendsmaily_Sync_Model_Subscriber extends Mage_Newsletter_Model_Subscriber
{
/**
* Skip sending out confirmation success email if Smaily opt-in enabled.
*
* @return Sendsmaily_Sync_Model_Subscriber|Mage_Newsletter_Model_Subscriber
*/
public function sendConfirmationSuccessEmail()
{
// Do not send.
if (Mage::helper('sync')->newsletterOptInEnabled() === true) {
return $this;
}
// Send subscription email via Magento.
return parent::sendConfirmationSuccessEmail();
}

/**
* Skip sending out unsubsciption email if Smaily opt-in enabled.
*
* @return Sendsmaily_Sync_Model_Subscriber|Mage_Newsletter_Model_Subscriber
*/
public function sendUnsubscriptionEmail()
{
// Do not send.
if (Mage::helper('sync')->newsletterOptInEnabled() === true) {
return $this;
}
// Send unsubscription email via Magento.
return parent::sendUnsubscriptionEmail();
}
}
7 changes: 6 additions & 1 deletion app/code/community/Sendsmaily/Sync/etc/config.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<config>
<modules>
<Sendsmaily_Sync>
<version>2.1.1</version>
<version>2.2.0</version>
</Sendsmaily_Sync>
</modules>

@@ -71,6 +71,11 @@
<sync>
<class>Sendsmaily_Sync_Model</class>
</sync>
<newsletter>
<rewrite>
<subscriber>Sendsmaily_Sync_Model_Subscriber</subscriber>
</rewrite>
</newsletter>
</models>

<blocks>

0 comments on commit 60b9f0e

Please sign in to comment.