diff --git a/application/Espo/Modules/Crm/Entities/MassEmail.php b/application/Espo/Modules/Crm/Entities/MassEmail.php index ea1a8371aa..d95f584407 100644 --- a/application/Espo/Modules/Crm/Entities/MassEmail.php +++ b/application/Espo/Modules/Crm/Entities/MassEmail.php @@ -37,7 +37,7 @@ class MassEmail extends Entity public const STATUS_COMPLETE = 'Complete'; public const STATUS_FAILED = 'Failed'; - public const STATUS_IN_PROGRESS = 'In Process'; + public const STATUS_IN_PROCESS = 'In Process'; public const STATUS_PENDING = 'Pending'; public const STATUS_DRAFT = 'Draft'; diff --git a/application/Espo/Modules/Crm/Jobs/ProcessMassEmail.php b/application/Espo/Modules/Crm/Jobs/ProcessMassEmail.php index 404af025ef..c80929b408 100644 --- a/application/Espo/Modules/Crm/Jobs/ProcessMassEmail.php +++ b/application/Espo/Modules/Crm/Jobs/ProcessMassEmail.php @@ -84,7 +84,7 @@ class ProcessMassEmail implements JobDataLess $massEmailList = $this->entityManager ->getRDBRepositoryByClass(MassEmail::class) ->where([ - 'status' => MassEmail::STATUS_IN_PROGRESS, + 'status' => MassEmail::STATUS_IN_PROCESS, ]) ->find(); diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php index 0d75c9156f..ce95c026bd 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php @@ -213,7 +213,7 @@ class QueueCreator } if (!$isTest) { - $massEmail->set('status', MassEmail::STATUS_IN_PROGRESS); + $massEmail->set('status', MassEmail::STATUS_IN_PROCESS); if (empty($itemList)) { $massEmail->set('status', MassEmail::STATUS_COMPLETE); diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php index 47fe068138..3ce19f703c 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php @@ -499,7 +499,7 @@ class SendingProcessor $this->entityManager->saveEntity($queueItem); - $this->log->error('MassEmail#sendQueueItem: [' . $e->getCode() . '] ' .$e->getMessage()); + $this->log->error("Mass Email, send item: {$e->getCode()}, " . $e->getMessage()); return false; }