EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
mass email: skip for inactive campaign
Yuri Kuznetsov153c09f28296
diff --git a/application/Espo/Modules/Crm/Classes/Select/Campaign/PrimaryFilters/Active.php b/application/Espo/Modules/Crm/Classes/Select/Campaign/PrimaryFilters/Active.phpindex cdf5d05cdf..d94557099c 100644--- a/application/Espo/Modules/Crm/Classes/Select/Campaign/PrimaryFilters/Active.php+++ b/application/Espo/Modules/Crm/Classes/Select/Campaign/PrimaryFilters/Active.php@@ -37,6 +37,6 @@ class Active implements Filter{public function apply(SelectBuilder $queryBuilder): void{- $queryBuilder->where(['status' => Campaign::TYPE_ACTIVE]);+ $queryBuilder->where(['status' => Campaign::STATUS_ACTIVE]);}}diff --git a/application/Espo/Modules/Crm/Entities/Campaign.php b/application/Espo/Modules/Crm/Entities/Campaign.phpindex 3abd970154..6dd23d0455 100644--- a/application/Espo/Modules/Crm/Entities/Campaign.php+++ b/application/Espo/Modules/Crm/Entities/Campaign.php@@ -43,7 +43,8 @@ class Campaign extends Entitypublic const TYPE_EMAIL = 'Email';public const TYPE_MAIL = 'Mail';- public const TYPE_ACTIVE = 'Active';+ public const STATUS_ACTIVE = 'Active';+ public const STATUS_INACTIVE = 'Inactive';public function getName(): ?string{@@ -72,6 +73,11 @@ class Campaign extends Entityreturn $this->get('type');}+ public function getStatus(): ?string+ {+ return $this->get('status');+ }+public function getStartDate(): ?Date{/** @var ?Date */diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.phpindex 1f67d2ad34..c6b8e03daf 100644--- a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php+++ b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php@@ -29,6 +29,8 @@namespace Espo\Modules\Crm\Tools\MassEmail;+use Espo\Core\Utils\Log;+use Espo\Modules\Crm\Entities\Campaign;use Espo\ORM\Collection;use Espo\ORM\Entity;use Espo\ORM\Name\Attribute;@@ -50,7 +52,8 @@ class QueueCreatorpublic function __construct(protected EntityManager $entityManager,- private Metadata $metadata+ private Metadata $metadata,+ private Log $log,) {$this->targetLinkList = $this->metadata->get(['scopes', 'TargetList', 'targetLinkList']) ?? [];}@@ -83,6 +86,14 @@ class QueueCreatorthrow new Error("Mass Email {$massEmail->getId()} should has status 'Pending'.");}+ if ($this->toSkipAsInactive($massEmail, $isTest)) {+ $this->log->notice("Skipping mass email {id} queue creation for inactive campaign.", [+ 'id' => $massEmail->getId(),+ ]);++ return;+ }+if (!$isTest) {$this->cleanupQueueItems($massEmail);}@@ -226,4 +237,11 @@ class QueueCreator/** @var EmailAddressRepository */return $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);}++ private function toSkipAsInactive(MassEmail $massEmail, bool $isTest): bool+ {+ return !$isTest &&+ $massEmail->getCampaign() &&+ $massEmail->getCampaign()->getStatus() === Campaign::STATUS_INACTIVE;+ }}diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.phpindex 9cebe28f9c..ade21e13da 100644--- a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php+++ b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php@@ -91,6 +91,14 @@ class SendingProcessor*/public function process(MassEmail $massEmail, bool $isTest = false): void{+ if ($this->toSkipAsInactive($massEmail, $isTest)) {+ $this->log->notice("Skipping mass email {id} queue for inactive campaign.", [+ 'id' => $massEmail->getId(),+ ]);++ return;+ }+$maxSize = 0;if ($this->handleMaxSize($isTest, $maxSize)) {@@ -619,4 +627,11 @@ class SendingProcessorreturn $body;}++ private function toSkipAsInactive(MassEmail $massEmail, bool $isTest): bool+ {+ return !$isTest &&+ $massEmail->getCampaign() &&+ $massEmail->getCampaign()->getStatus() === Campaign::STATUS_INACTIVE;+ }}