[TASK] Adding template name & extension key to mail table

Classes/Controller/QueueController.php

@@ -54,7 +54,7 @@ class QueueController extends ActionController {
 			$selectedTemplate = key($registerArray[$selectedExtension]);
 		}
 
-		$this->view->assign('selectedTemplateKey', trim($selectedTemplate));
+		$this->view->assign('selectedTemplateKey', $selectedTemplate);
 		$this->view->assign('selectedExtensionKey', $selectedExtension);
 		$this->view->assign('templates', $registerArray);
 		$this->view->assign('mode', 'queue');

Classes/Domain/Model/Mail.php

@@ -84,6 +84,16 @@ class Mail extends AbstractEntity {
 	 */
 	protected $fromName = '';
 
+	/**
+	 * @var string
+	 */
+	protected $extensionKey = '';
+
+	/**
+	 * @var string
+	 */
+	protected $templateName = '';
+
 	/**
 	 * @return string
 	 */
@@ -215,4 +225,32 @@ class Mail extends AbstractEntity {
 	public function setFromName($fromName) {
 		$this->fromName = $fromName;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getExtensionKey() {
+		return $this->extensionKey;
+	}
+
+	/**
+	 * @param string $extensionKey
+	 */
+	public function setExtensionKey($extensionKey) {
+		$this->extensionKey = $extensionKey;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplateName() {
+		return $this->templateName;
+	}
+
+	/**
+	 * @param string $templateName
+	 */
+	public function setTemplateName($templateName) {
+		$this->templateName = $templateName;
+	}
 }

Classes/Domain/Repository/MailRepository.php

@@ -49,4 +49,21 @@ class MailRepository extends AbstractRepository {
 
 		return $query->matching($query->equals('sent', FALSE))->execute();
 	}
+
+	/**
+	 * @param string $extensionKey
+	 * @param string $templateName
+	 * @param int $limit
+	 * @return array|QueryResultInterface
+	 */
+	public function findAllEntries($extensionKey, $templateName, $limit = NULL) {
+		$query = $this->createQuery();
+		if ($limit) {
+			$query->setLimit($limit);
+		}
+
+		$query->setOrderings(['priority' => Query::ORDER_DESCENDING]);
+
+		return $query->matching($query->equals('sent', FALSE))->execute();
+	}
 }

Configuration/TCA/tx_sgmail_domain_model_mail.php

@@ -33,7 +33,7 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'searchFields' => 'mail_subject, mail_body, to_address, from_address, from_name, bcc_addresses, cc_addresses',
+		'searchFields' => 'mail_subject, mail_body, to_address, from_address, from_name, bcc_addresses, cc_addresses, extension_key, template_name',
 		'dividers2tabs' => TRUE,
 		'delete' => 'deleted',
 		'enablecolumns' => [
@@ -43,11 +43,11 @@ return [
 		'iconfile' => 'EXT:sg_mail/Resources/Public/Icons/ModuleIconTCA.svg'
 	],
 	'interface' => [
-		'showRecordFieldList' => 'hidden, mail_subject, mail_body, to_address, from_address, sent, priority, from_name, bcc_addresses, cc_addresses',
+		'showRecordFieldList' => 'hidden, mail_subject, mail_body, to_address, from_address, sent, priority, from_name, bcc_addresses, cc_addresses, extension_key, template_name',
 	],
 	'types' => [
 		'1' => [
-			'showitem' => 'hidden;;1, sent, priority, to_address, from_address, mail_subject, mail_body, from_name, bcc_addresses, cc_addresses'
+			'showitem' => 'hidden;;1, sent, priority, to_address, from_address, mail_subject, mail_body, from_name, bcc_addresses, cc_addresses, extension_key, template_name'
 		],
 	],
 	'columns' => [
@@ -130,6 +130,22 @@ return [
 				'type' => 'input',
 				'eval' => ''
 			],
+		],
+		'extension_key' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_mail.extension_key',
+			'config' => [
+				'type' => 'input',
+				'eval' => ''
+			],
+		],
+		'template_name' => [
+			'exclude' => TRUE,
+			'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_mail.template_name',
+			'config' => [
+				'type' => 'input',
+				'eval' => ''
+			],
 		]
 	]
 ];

Resources/Private/Language/de.locallang_db.xlf

@@ -21,6 +21,10 @@
 			<source>CC Addresses</source>
 			<target>CC Adressen</target>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_mail.extension_key" approved="yes">
+			<source>Extension Key</source>
+			<target>Extension Key</target>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_mail.from_address" approved="yes">
 			<source>From email address</source>
 			<target>Von E-Mail-Adresse</target>
@@ -45,6 +49,10 @@
 			<source>Sent</source>
 			<target>Gesendet</target>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_mail.template_name" approved="yes">
+			<source>Template Name</source>
+			<target>Template Name</target>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_mail.to_address" approved="yes">
 			<source>To email address</source>
 			<target>An E-Mail-Adresse</target>

Resources/Private/Language/locallang_db.xlf

@@ -18,6 +18,9 @@
 		<trans-unit id="tx_sgmail_domain_model_mail.cc_addresses">
 			<source>CC Addresses</source>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_mail.extension_key">
+			<source>Extension Key</source>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_mail.from_address">
 			<source>From email address</source>
 		</trans-unit>
@@ -36,6 +39,9 @@
 		<trans-unit id="tx_sgmail_domain_model_mail.sent">
 			<source>Sent</source>
 		</trans-unit>
+		<trans-unit id="tx_sgmail_domain_model_mail.template_name">
+			<source>Template Name</source>
+		</trans-unit>
 		<trans-unit id="tx_sgmail_domain_model_mail.to_address">
 			<source>To email address</source>
 		</trans-unit>

ext_tables.sql

@@ -11,6 +11,8 @@ CREATE TABLE tx_sgmail_domain_model_mail (
 	bcc_addresses varchar(255) DEFAULT '' NOT NULL,
 	sent tinyint(1) DEFAULT '0' NOT NULL,
 	priority int(11) unsigned DEFAULT '0' NOT NULL,
+	extension_key varchar(30) DEFAULT '' NOT NULL,
+	template_name varchar(30) DEFAULT '' NOT NULL,
 
 	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
 	crdate int(11) unsigned DEFAULT '0' NOT NULL,