diff --git a/lib/API/JSON/ResponseBuilders/NewsletterTemplatesResponseBuilder.php b/lib/API/JSON/ResponseBuilders/NewsletterTemplatesResponseBuilder.php index 2ee0077bc1..21078595de 100644 --- a/lib/API/JSON/ResponseBuilders/NewsletterTemplatesResponseBuilder.php +++ b/lib/API/JSON/ResponseBuilders/NewsletterTemplatesResponseBuilder.php @@ -13,7 +13,6 @@ class NewsletterTemplatesResponseBuilder { 'categories' => $template->getCategories(), 'thumbnail' => $template->getThumbnail(), 'name' => $template->getName(), - 'description' => $template->getDescription(), 'readonly' => $template->getReadonly(), 'body' => $template->getBody(), 'created_at' => $template->getCreatedAt()->format(self::DATE_FORMAT), @@ -34,7 +33,6 @@ class NewsletterTemplatesResponseBuilder { 'categories' => $template->getCategories(), 'thumbnail' => $template->getThumbnail(), 'name' => $template->getName(), - 'description' => $template->getDescription(), 'readonly' => $template->getReadonly(), ]; } diff --git a/lib/Entities/NewsletterTemplateEntity.php b/lib/Entities/NewsletterTemplateEntity.php index 66759cf819..0f30c5e2a1 100644 --- a/lib/Entities/NewsletterTemplateEntity.php +++ b/lib/Entities/NewsletterTemplateEntity.php @@ -36,12 +36,6 @@ class NewsletterTemplateEntity { */ private $categories = '[]'; - /** - * @ORM\Column(type="string") - * @var string - */ - private $description = ''; - /** * @ORM\Column(type="json") * @Assert\NotBlank() @@ -91,14 +85,6 @@ class NewsletterTemplateEntity { $this->categories = $categories; } - public function getDescription(): string { - return $this->description; - } - - public function setDescription(string $description) { - $this->description = $description; - } - /** * @return array|null */ diff --git a/lib/NewsletterTemplates/NewsletterTemplatesRepository.php b/lib/NewsletterTemplates/NewsletterTemplatesRepository.php index 948a34e15e..6336a25714 100644 --- a/lib/NewsletterTemplates/NewsletterTemplatesRepository.php +++ b/lib/NewsletterTemplates/NewsletterTemplatesRepository.php @@ -14,6 +14,8 @@ use MailPoet\Entities\NewsletterTemplateEntity; * @method void remove(NewsletterTemplateEntity $entity) */ class NewsletterTemplatesRepository extends Repository { + const RECENTLY_SENT_CATEGORIES = '["recent"]'; + protected function getEntityClassName() { return NewsletterTemplateEntity::class; } @@ -23,7 +25,7 @@ class NewsletterTemplatesRepository extends Repository { */ public function findAllForListing(): array { return $this->doctrineRepository->createQueryBuilder('nt') - ->select('PARTIAL nt.{id,categories,thumbnail,name,description,readonly}') + ->select('PARTIAL nt.{id,categories,thumbnail,name,readonly}') ->addOrderBy('nt.readonly', 'ASC') ->addOrderBy('nt.createdAt', 'DESC') ->addOrderBy('nt.id', 'DESC') diff --git a/tests/acceptance/ManageWelcomeEmailCest.php b/tests/acceptance/ManageWelcomeEmailCest.php index b405d7d594..5bd580152c 100644 --- a/tests/acceptance/ManageWelcomeEmailCest.php +++ b/tests/acceptance/ManageWelcomeEmailCest.php @@ -119,7 +119,6 @@ class ManageWelcomeEmailCest { $i->click($saveTemplateOption); $i->waitForElement($saveTemplateButton); $i->fillField('template_name', $templateTitle); - $i->fillField('template_description', $templateDescr); $i->click($saveTemplateButton); $i->waitForText('Template has been saved.'); $i->amOnMailpoetPage('Emails'); diff --git a/tests/acceptance/SaveNewsletterAsTemplateCest.php b/tests/acceptance/SaveNewsletterAsTemplateCest.php index edc1c341fe..76e0ead9f4 100644 --- a/tests/acceptance/SaveNewsletterAsTemplateCest.php +++ b/tests/acceptance/SaveNewsletterAsTemplateCest.php @@ -24,7 +24,6 @@ class SaveNewsletterAsTemplateCest { $i->click('[data-automation-id="newsletter_save_options_toggle"]'); $i->click('[data-automation-id="newsletter_save_as_template_option"]'); $i->fillField(['name' => 'template_name'], $templateName); - $i->fillField(['name' => 'template_description'], $templateDescription); $i->click('[data-automation-id="newsletter_save_as_template_button"]'); $i->waitForText('Template has been saved'); diff --git a/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php b/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php index 03cbeadd76..100b04d11d 100644 --- a/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php +++ b/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php @@ -30,7 +30,6 @@ class SavePostNotificationEmailAsTemplateCest { $i->click($saveTemplateOption); $i->waitForElement($saveTemplateButton); $i->fillField('template_name', $templateTitle); - $i->fillField('template_description', $templateDescr); $i->click($saveTemplateButton); $i->waitForText('Template has been saved.'); diff --git a/views/newsletter/templates/components/save.hbs b/views/newsletter/templates/components/save.hbs index ed9c2c64ce..dc4baeaf32 100644 --- a/views/newsletter/templates/components/save.hbs +++ b/views/newsletter/templates/components/save.hbs @@ -39,7 +39,6 @@
<%= __('Save as template') %>
-