From 9ab75baec089c4a327a0c3b082f0aaedfbfb15ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torben=20Ho=CC=88hn?= <torhoehn@gmail.com>
Date: Fri, 5 Jan 2018 16:36:04 +0100
Subject: [PATCH] updated newsletter subscriber model
---
.../Magento/Newsletter/Model/Subscriber.php | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index b8d7ccf83af..961ed539815 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -604,14 +604,19 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
$this->save();
$sendSubscription = $sendInformationEmail;
- if ($sendSubscription === null xor $sendSubscription) {
+ if ($sendSubscription === null xor $sendSubscription && $this->isStatusChanged()) {
try {
- if ($isConfirmNeed) {
- $this->sendConfirmationRequestEmail();
- } elseif ($this->isStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
- $this->sendUnsubscriptionEmail();
- } elseif ($this->isStatusChanged() && $status == self::STATUS_SUBSCRIBED) {
- $this->sendConfirmationSuccessEmail();
+ switch ($status) {
+ case self::STATUS_UNSUBSCRIBED:
+ $this->sendUnsubscriptionEmail();
+ break;
+ case self::STATUS_SUBSCRIBED:
+ $this->sendConfirmationSuccessEmail();
+ break;
+ case self::STATUS_NOT_ACTIVE:
+ if ($isConfirmNeed)
+ $this->sendConfirmationRequestEmail();
+ break;
}
} catch (MailException $e) {
// If we are not able to send a new account email, this should be ignored
--
GitLab