diff --git a/Classes/Command/ImportCommand.php b/Classes/Command/ImportCommand.php index c2d1402..70da2fd 100644 --- a/Classes/Command/ImportCommand.php +++ b/Classes/Command/ImportCommand.php @@ -202,10 +202,6 @@ private function hydrateNewsletterChannel( $newsletterChannelDomainModel ->setNewsletterChannelId($newsletterChannel->id) ->setTitle($newsletterChannel->title) - ->setIsPublic($newsletterChannel->isPublic) - ->setIsVirtual($newsletterChannel->isVChannel) - ->setOid($newsletterChannel->oid) - ->setEstimatedCount($newsletterChannel->estimatedCount) ->setCrdate(new DateTime()) ->setTstamp(new DateTime()); diff --git a/Classes/Domain/Model/NewsletterChannel.php b/Classes/Domain/Model/NewsletterChannel.php index c755d01..798954d 100644 --- a/Classes/Domain/Model/NewsletterChannel.php +++ b/Classes/Domain/Model/NewsletterChannel.php @@ -24,49 +24,29 @@ class NewsletterChannel extends AbstractEntity { /** - * @var string - */ - protected string $newsletterChannelId = ''; - - /** - * @var string + * @var DateTime */ - protected string $title = ''; + protected DateTime $crdate; /** - * @var bool + * @var DateTime */ - protected bool $isPublic = false; + protected DateTime $tstamp; /** * @var bool */ - protected bool $isVirtual = false; + protected bool $deleted = false; /** * @var string */ - protected string $oid = ''; - - /** - * @var int - */ - protected int $estimatedCount = 0; - - /** - * @var DateTime - */ - protected DateTime $crdate; - - /** - * @var DateTime - */ - protected DateTime $tstamp; + protected string $newsletterChannelId = ''; /** - * @var bool + * @var string */ - protected bool $deleted = false; + protected string $title = ''; /** * @var string @@ -89,61 +69,41 @@ class NewsletterChannel extends AbstractEntity protected string $embedImages = 'none'; /** - * @return string - */ - public function getNewsletterChannelId(): string - { - return $this->newsletterChannelId; - } - - /** - * @param string $newsletterChannelId - * - * @return NewsletterChannel - */ - public function setNewsletterChannelId(string $newsletterChannelId): NewsletterChannel - { - $this->newsletterChannelId = $newsletterChannelId; - - return $this; - } - - /** - * @return string + * @return DateTime */ - public function getTitle(): string + public function getCrdate(): DateTime { - return $this->title; + return $this->crdate; } /** - * @param string $title + * @param DateTime $crdate * * @return NewsletterChannel */ - public function setTitle(string $title): NewsletterChannel + public function setCrdate(DateTime $crdate): NewsletterChannel { - $this->title = $title; + $this->crdate = $crdate; return $this; } /** - * @return bool + * @return DateTime */ - public function isPublic(): bool + public function getTstamp(): DateTime { - return $this->isPublic; + return $this->tstamp; } /** - * @param bool $isPublic + * @param DateTime $tstamp * * @return NewsletterChannel */ - public function setIsPublic(bool $isPublic): NewsletterChannel + public function setTstamp(DateTime $tstamp): NewsletterChannel { - $this->isPublic = $isPublic; + $this->tstamp = $tstamp; return $this; } @@ -151,19 +111,19 @@ public function setIsPublic(bool $isPublic): NewsletterChannel /** * @return bool */ - public function isVirtual(): bool + public function isDeleted(): bool { - return $this->isVirtual; + return $this->deleted; } /** - * @param bool $isVirtual + * @param bool $deleted * * @return NewsletterChannel */ - public function setIsVirtual(bool $isVirtual): NewsletterChannel + public function setDeleted(bool $deleted): NewsletterChannel { - $this->isVirtual = $isVirtual; + $this->deleted = $deleted; return $this; } @@ -171,99 +131,39 @@ public function setIsVirtual(bool $isVirtual): NewsletterChannel /** * @return string */ - public function getOid(): string - { - return $this->oid; - } - - /** - * @param string $oid - * - * @return NewsletterChannel - */ - public function setOid(string $oid): NewsletterChannel - { - $this->oid = $oid; - - return $this; - } - - /** - * @return int - */ - public function getEstimatedCount(): int - { - return $this->estimatedCount; - } - - /** - * @param int $estimatedCount - * - * @return NewsletterChannel - */ - public function setEstimatedCount(int $estimatedCount): NewsletterChannel - { - $this->estimatedCount = $estimatedCount; - - return $this; - } - - /** - * @return DateTime - */ - public function getCrdate(): DateTime - { - return $this->crdate; - } - - /** - * @param DateTime $crdate - * - * @return NewsletterChannel - */ - public function setCrdate(DateTime $crdate): NewsletterChannel - { - $this->crdate = $crdate; - - return $this; - } - - /** - * @return DateTime - */ - public function getTstamp(): DateTime + public function getNewsletterChannelId(): string { - return $this->tstamp; + return $this->newsletterChannelId; } /** - * @param DateTime $tstamp + * @param string $newsletterChannelId * * @return NewsletterChannel */ - public function setTstamp(DateTime $tstamp): NewsletterChannel + public function setNewsletterChannelId(string $newsletterChannelId): NewsletterChannel { - $this->tstamp = $tstamp; + $this->newsletterChannelId = $newsletterChannelId; return $this; } /** - * @return bool + * @return string */ - public function isDeleted(): bool + public function getTitle(): string { - return $this->deleted; + return $this->title; } /** - * @param bool $deleted + * @param string $title * * @return NewsletterChannel */ - public function setDeleted(bool $deleted): NewsletterChannel + public function setTitle(string $title): NewsletterChannel { - $this->deleted = $deleted; + $this->title = $title; return $this; } diff --git a/Configuration/TCA/tx_nrcuniversalmessenger_domain_model_newsletterchannel.php b/Configuration/TCA/tx_nrcuniversalmessenger_domain_model_newsletterchannel.php index b0f4c1e..fed6bad 100644 --- a/Configuration/TCA/tx_nrcuniversalmessenger_domain_model_newsletterchannel.php +++ b/Configuration/TCA/tx_nrcuniversalmessenger_domain_model_newsletterchannel.php @@ -27,7 +27,7 @@ ], 'types' => [ 0 => [ - 'showitem' => 'newsletter_channel_id, title, is_public, is_virtual, oid, estimated_count, sender, reply_to, skip_used_id, embed_images', + 'showitem' => 'newsletter_channel_id, title, sender, reply_to, skip_used_id, embed_images', ], ], 'columns' => [ @@ -106,49 +106,6 @@ 'required' => true, ], ], - 'is_public' => [ - 'exclude' => true, - 'label' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.is_public', - 'config' => [ - 'type' => 'check', - 'renderType' => 'checkboxToggle', - 'default' => 0, - 'readOnly' => true, - ], - ], - 'is_virtual' => [ - 'exclude' => true, - 'label' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.is_virtual', - 'config' => [ - 'type' => 'check', - 'renderType' => 'checkboxToggle', - 'default' => 0, - 'readOnly' => true, - ], - ], - 'oid' => [ - 'exclude' => true, - 'label' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.oid', - 'config' => [ - 'type' => 'input', - 'size' => 255, - 'eval' => 'trim', - 'readOnly' => true, - 'required' => true, - ], - ], - 'estimated_count' => [ - 'exclude' => true, - 'label' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.estimated_count', - 'description' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.estimated_count.description', - 'config' => [ - 'type' => 'input', - 'size' => 10, - 'eval' => 'trim', - 'readOnly' => true, - 'required' => true, - ], - ], 'sender' => [ 'exclude' => true, 'label' => 'LLL:EXT:nrc_universal_messenger/Resources/Private/Language/locallang.xlf:tx_nrcuniversalmessenger_domain_model_newsletterchannel.sender', diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf index 2439ce6..0b9c0d2 100644 --- a/Resources/Private/Language/de.locallang.xlf +++ b/Resources/Private/Language/de.locallang.xlf @@ -19,21 +19,6 @@ Der Titel des Newsletter-Kanals. - - Ist öffentlich? - - - Ist ein virtueller Kanal? - - - OID - - - Geschätzte Anzahl - - - Die geschätzte Anzahl der Einträge in einem Kanal oder Segment. - E-Mail-Adresse des Absenders diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index becfd92..9a107ae 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -19,21 +19,6 @@ The title the newsletter channel. - - Is public? - - - Is virtual channel? - - - OID - - - Estimated count - - - The estimated number of entries in a channel or segment. - Sender email address diff --git a/ext_tables.sql b/ext_tables.sql index 7a180c3..1b028fb 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -15,11 +15,6 @@ CREATE TABLE tx_nrcuniversalmessenger_domain_model_newsletterchannel newsletter_channel_id varchar(255) DEFAULT '' NOT NULL, title varchar(255) DEFAULT '' NOT NULL, - is_public smallint(5) unsigned DEFAULT '0' NOT NULL, - is_virtual smallint(5) unsigned DEFAULT '0' NOT NULL, - oid varchar(255) DEFAULT '' NOT NULL, - estimated_count int(11) unsigned DEFAULT '0' NOT NULL, - sender varchar(255) DEFAULT '' NOT NULL, reply_to varchar(255) DEFAULT '' NOT NULL, skip_used_id smallint(5) unsigned DEFAULT '0' NOT NULL,