From 5c583a697dab26980f92a7819cd31a89bdb822ec Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 22 Mar 2022 11:34:39 +0200 Subject: [PATCH] type fixes --- .../Espo/Modules/Crm/Tools/MassEmail/Processor.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php b/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php index 0b2ae1e589..014a30a482 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php @@ -293,7 +293,7 @@ class Processor $emailData['body'] = $body; - $email = $this->entityManager->getEntity('Email'); + $email = $this->entityManager->getNewEntity('Email'); $email->set($emailData); @@ -389,9 +389,12 @@ class Processor $smtpParams = null ): bool { - $queueItemFetched = $this->entityManager->getEntity($queueItem->getEntityType(), $queueItem->getId()); + $queueItemFetched = $this->entityManager->getEntityById($queueItem->getEntityType(), $queueItem->getId()); - if ($queueItemFetched->get('status') !== EmailQueueItem::STATUS_PENDING) { + if ( + !$queueItemFetched || + $queueItemFetched->get('status') !== EmailQueueItem::STATUS_PENDING + ) { return false; } @@ -458,7 +461,7 @@ class Processor if ($campaign) { $email->setLinkMultipleIdList( 'teams', - $campaign->getLinkMultipleIdList('teams') + $campaign->getLinkMultipleIdList('teams') ?? [] ); }