Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Replace Subscriber model with Doctrine in Tasks\Newsletter

Browse Source 
[MAILPOET-4363]
This commit is contained in:
Rodrigo Primo
2022-08-27 15:45:12 -03:00
committed by Aschepikov
parent fd0acbd6cf
commit 68c3277195
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mailpoet/lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@ -273,11 +273,17 @@ class SendingQueue {
$statistics = [];
$metas = [];
foreach ($subscribers as $subscriber) {
$subscriberEntity = $this->subscribersRepository->findOneById($subscriber->id);
if (!$subscriberEntity instanceof SubscriberEntity) {
continue;
}
// render shortcodes and replace subscriber data in tracked links
$preparedNewsletters[] =
$this->newsletterTask->prepareNewsletterForSending(
$newsletter,
$subscriber,
$subscriberEntity,
$queue
);
// format subscriber name/address according to mailer settings
@ -288,12 +294,7 @@ class SendingQueue {
// create personalized instant unsubsribe link
$unsubscribeUrls[] = $this->links->getUnsubscribeUrl($queue, $subscriber->id);
$subscriberEntity = $this->subscribersRepository->findOneById($subscriber->id);
if ($subscriberEntity instanceof SubscriberEntity) {
$metas[] = $this->mailerMetaInfo->getNewsletterMetaInfo($newsletter, $subscriberEntity);
} else {
$metas[] = [];
}
$metas[] = $this->mailerMetaInfo->getNewsletterMetaInfo($newsletter, $subscriberEntity);
// keep track of values for statistics purposes
$statistics[] = [