[TASK] Updating template db model & save logic

Classes/Controller/MailController.php

@@ -218,15 +218,29 @@ class MailController extends ActionController {
 	 * @param string $selectedLanguageRight
 	 * @param string $subjectLeft
 	 * @param string $subjectRight
+	 * @param string $fromNameLeft
+	 * @param string $fromMailLeft
+	 * @param string $ccLeft
+	 * @param string $bccLeft
+	 * @param string $replyToLeft
+	 * @param string $fromNameRight
+	 * @param string $fromMailRight
+	 * @param string $ccRight
+	 * @param string $bccRight
+	 * @param string $replyToRight
 	 */
 	public function saveAction(
 		$contentLeft = NULL, $contentRight = NULL, $selectedExtension = NULL, $selectedTemplate = NULL,
-		$selectedLanguageLeft = NULL, $selectedLanguageRight = NULL, $subjectLeft = NULL, $subjectRight = NULL
+		$selectedLanguageLeft = NULL, $selectedLanguageRight = NULL, $subjectLeft = NULL, $subjectRight = NULL,
+		$fromNameLeft = NULL, $fromMailLeft = NULL, $ccLeft = NULL, $bccLeft = NULL, $replyToLeft = NULL,
+		$fromNameRight = NULL, $fromMailRight = NULL, $ccRight = NULL, $bccRight = NULL, $replyToRight = NULL
 	) {
-		$this->saveTemplate($selectedExtension, $selectedTemplate, $selectedLanguageLeft, $contentLeft, $subjectLeft);
+		$this->saveTemplate($selectedExtension, $selectedTemplate, $selectedLanguageLeft, $contentLeft, $subjectLeft,
+			$fromNameLeft, $fromMailLeft, $ccLeft, $bccLeft, $replyToLeft);
 		if ($selectedLanguageLeft !== $selectedLanguageRight) {
 			$this->saveTemplate(
-				$selectedExtension, $selectedTemplate, $selectedLanguageRight, $contentRight, $subjectRight
+				$selectedExtension, $selectedTemplate, $selectedLanguageRight, $contentRight, $subjectRight,
+				$fromNameRight, $fromMailRight, $ccRight, $bccRight, $replyToRight
 			);
 		}
 
@@ -247,7 +261,8 @@ class MailController extends ActionController {
 	 * @return Template $template
 	 */
 	private function saveTemplate(
-		$selectedExtension, $selectedTemplate, $selectedLanguage, $selectedContent, $selectedSubject
+		$selectedExtension, $selectedTemplate, $selectedLanguage, $selectedContent, $selectedSubject,
+		$selectedFromName, $selectedFromMail, $selectedCc, $selectedBcc, $selectedReplyTo
 	) {
 		/** @var Template $template */
 		$template = $this->templateRepository->findOneByTemplate(

Classes/Domain/Model/Template.php

@@ -57,6 +57,31 @@ class Template extends AbstractEntity {
 	 */
 	protected $content = '';
 
+	/**
+	 * @var string
+	 */
+	protected $fromName = '';
+
+	/**
+	 * @var string
+	 */
+	protected $fromMail = '';
+
+	/**
+	 * @var string
+	 */
+	protected $cc = '';
+
+	/**
+	 * @var string
+	 */
+	protected $bcc = '';
+
+	/**
+	 * @var string
+	 */
+	protected $replyTo = '';
+
 	/**
 	 * @return string
 	 */
@@ -126,4 +151,74 @@ class Template extends AbstractEntity {
 	public function setContent($content) {
 		$this->content = $content;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getFromName() {
+		return $this->fromName;
+	}
+
+	/**
+	 * @param string $fromName
+	 */
+	public function setFromName($fromName) {
+		$this->fromName = $fromName;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFromMail() {
+		return $this->fromMail;
+	}
+
+	/**
+	 * @param string $fromMail
+	 */
+	public function setFromMail($fromMail) {
+		$this->fromMail = $fromMail;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCc() {
+		return $this->cc;
+	}
+
+	/**
+	 * @param string $cc
+	 */
+	public function setCc($cc) {
+		$this->cc = $cc;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBcc() {
+		return $this->bcc;
+	}
+
+	/**
+	 * @param string $bcc
+	 */
+	public function setBcc($bcc) {
+		$this->bcc = $bcc;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getReplyTo() {
+		return $this->replyTo;
+	}
+
+	/**
+	 * @param string $replyTo
+	 */
+	public function setReplyTo($replyTo) {
+		$this->replyTo = $replyTo;
+	}
 }

Configuration/TCA/tx_sgmail_domain_model_template.php

@@ -33,7 +33,7 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'searchFields' => 'extension_key, template_name, language, subject',
+		'searchFields' => 'extension_key, template_name, language, subject, fromName, fromMail, replyTo',
 		'dividers2tabs' => TRUE,
 		'delete' => 'deleted',
 		'enablecolumns' => [
@@ -43,11 +43,11 @@ return [
 		'iconfile' => 'EXT:sg_mail/Resources/Public/Icons/ModuleIconTCA.svg'
 	],
 	'interface' => [
-		'showRecordFieldList' => 'extension_key, template_name, language, content, subject',
+		'showRecordFieldList' => 'extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo'
 	],
 	'types' => [
 		'1' => [
-			'showitem' => 'hidden;;1, extension_key, template_name, language, content, subject'
+			'showitem' => 'hidden;;1, extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo'
 		],
 	],
 	'columns' => [
@@ -98,6 +98,41 @@ return [
 				'type' => 'input',
 				'eval' => 'required'
 			],
+		],
+		'fromName' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.fromName',
+			'config' => [
+				'type' => 'input'
+			],
+		],
+		'fromMail' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.fromMail',
+			'config' => [
+				'type' => 'input'
+			],
+		],
+		'cc' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.cc',
+			'config' => [
+				'type' => 'input'
+			],
+		],
+		'bcc' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.bcc',
+			'config' => [
+				'type' => 'input'
+			],
+		],
+		'replyTo' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.replyTo',
+			'config' => [
+				'type' => 'input'
+			],
 		]
 	]
 ];

Resources/Private/Language/de.locallang_db.xlf

@@ -53,10 +53,18 @@
 			<source>Template</source>
 			<target>Template</target>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.bcc" approved="yes">
+			<source>BCC</source>
+			<target>BCC</target>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.bcc_addresses" approved="yes">
 			<source></source>
 			<target>BCC Adressen</target>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.cc" approved="yes">
+			<source>CC</source>
+			<target>CC</target>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.cc_addresses" approved="yes">
 			<source></source>
 			<target>CC Adressen</target>
@@ -69,6 +77,14 @@
 			<source>Extension Key</source>
 			<target>Extension Key</target>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.fromMail" approved="yes">
+			<source>From Address</source>
+			<target>Absender Adresse</target>
+		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.fromName" approved="yes">
+			<source>From Name</source>
+			<target>Absender Name</target>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.from_name" approved="yes">
 			<source></source>
 			<target>Absender Name</target>

Resources/Private/Language/locallang_db.xlf

@@ -42,15 +42,30 @@
 		<trans-unit id="tx_sgmail_domain_model_template">
 			<source>Template</source>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.bcc">
+			<source>BCC</source>
+		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.cc">
+			<source>CC</source>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.content">
 			<source>Content</source>
 		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.extension_key">
 			<source>Extension Key</source>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.fromMail">
+			<source>From Address</source>
+		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.fromName">
+			<source>From Name</source>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.language">
 			<source>Language</source>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_template.replyTo">
+			<source>Reply To</source>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_template.subject">
 			<source>Subject</source>
 		</trans-unit>

ext_tables.sql

@@ -31,6 +31,11 @@ CREATE TABLE tx_sgmail_domain_model_template (
 	subject text NOT NULL,
 	extension_key varchar(255) DEFAULT '' NOT NULL,
 	template_name varchar(255) DEFAULT '' NOT NULL,
+	fromName varchar(255) DEFAULT '' NOT NULL,
+	fromMail varchar(255) DEFAULT '' NOT NULL,
+	cc varchar(255) DEFAULT '' NOT NULL,
+	bcc varchar(255) DEFAULT '' NOT NULL,
+	replyTo varchar(255) DEFAULT '' NOT NULL,
 	language varchar(30) DEFAULT '' NOT NULL,
 	content text NOT NULL,