[TASK] Add Buyer Email Reply To Address

Resolves: #318
extcode · Feb 9, 2021 · e3396aa · e3396aa
1 parent 017d989
commit e3396aa
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 18 deletions.
diff --git a/Classes/Service/MailHandler.php b/Classes/Service/MailHandler.php
@@ -52,6 +52,11 @@ class MailHandler implements SingletonInterface
      */
     protected $buyerEmailBcc = '';
 
+    /**
+     * @var string
+     */
+    protected $buyerEmailReplyTo = '';
+
     /**
      * @var string
      */
@@ -86,7 +91,7 @@ public function __construct()
     /**
      * Sets Plugin Settings
      */
-    public function setPluginSettings()
+    public function setPluginSettings(): void
     {
         $this->pluginSettings =
             $this->configurationManager->getConfiguration(
@@ -117,6 +122,17 @@ public function setPluginSettings()
                 $this->setBuyerEmailBcc($this->pluginSettings['mail']['buyer']['bccAddress']);
             }
 
+            if (!empty($this->pluginSettings['settings']['buyer'])
+                && !empty($this->pluginSettings['settings']['buyer']['emailReplyToAddress'])
+            ) {
+                $this->setBuyerEmailReplyTo($this->pluginSettings['settings']['buyer']['emailReplyToAddress']);
+            } elseif (!empty($this->pluginSettings['mail'])
+                && !empty($this->pluginSettings['mail']['buyer'])
+                && !empty($this->pluginSettings['mail']['buyer']['replyToAddress'])
+            ) {
+                $this->setBuyerEmailReplyTo($this->pluginSettings['mail']['buyer']['replyToAddress']);
+            }
+
             if (!empty($this->pluginSettings['settings']['seller'])
                 && !empty($this->pluginSettings['settings']['seller']['emailFromAddress'])
             ) {
@@ -155,7 +171,7 @@ public function setPluginSettings()
     /**
      * @param Cart $cart
      */
-    public function setCart(Cart $cart)
+    public function setCart(Cart $cart): void
     {
         $this->cart = $cart;
     }
@@ -192,6 +208,22 @@ public function getBuyerEmailBcc(): string
         return $this->buyerEmailBcc;
     }
 
+    /**
+     * @param string $buyerEmailReplyTo
+     */
+    public function setBuyerEmailReplyTo(string $buyerEmailReplyTo): void
+    {
+        $this->buyerEmailReplyTo = $buyerEmailReplyTo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBuyerEmailReplyTo(): string
+    {
+        return $this->buyerEmailReplyTo;
+    }
+
     /**
      * @param string $email
      */
@@ -245,25 +277,28 @@ public function getSellerEmailBcc(): string
      *
      * @param Item $orderItem
      */
-    public function sendBuyerMail(Item $orderItem)
+    public function sendBuyerMail(Item $orderItem): void
     {
-        if (empty($this->buyerEmailFrom) || empty($orderItem->getBillingAddress()->getEmail())) {
+        if (empty($this->getBuyerEmailFrom()) || empty($orderItem->getBillingAddress()->getEmail())) {
             return;
         }
 
         $status = $orderItem->getPayment()->getStatus();
 
         $email = GeneralUtility::makeInstance(FluidEmail::class)
             ->to($orderItem->getBillingAddress()->getEmail())
-            ->from($this->buyerEmailFrom)
+            ->from($this->getBuyerEmailFrom())
             ->setTemplate('Mail/' . ucfirst($status) . '/Buyer')
-            ->format(\TYPO3\CMS\Core\Mail\FluidEmail::FORMAT_HTML)
+            ->format(FluidEmail::FORMAT_HTML)
             ->assign('settings', $this->pluginSettings['settings'])
             ->assign('cart', $this->cart)
             ->assign('orderItem', $orderItem);
 
-        if ($this->buyerEmailBcc) {
-            $email->bcc(explode(',', $this->buyerEmailBcc));
+        if ($this->getBuyerEmailBcc()) {
+            $email->bcc(explode(',', $this->getBuyerEmailBcc()));
+        }
+        if ($this->getbuyerEmailReplyTo()) {
+            $email->replyTo($this->getbuyerEmailReplyTo());
         }
 
         if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['cart']['MailAttachmentsHook']) {
@@ -289,28 +324,28 @@ public function sendBuyerMail(Item $orderItem)
      *
      * @param Item $orderItem
      */
-    public function sendSellerMail(Item $orderItem)
+    public function sendSellerMail(Item $orderItem): void
     {
-        if (empty($this->sellerEmailFrom) || empty($this->sellerEmailTo)) {
+        if (empty($this->getSellerEmailFrom()) || empty($this->getSellerEmailTo())) {
             return;
         }
 
         $status = $orderItem->getPayment()->getStatus();
 
         $email = GeneralUtility::makeInstance(FluidEmail::class)
-            ->to($this->sellerEmailTo)
-            ->from($this->sellerEmailFrom)
+            ->to($this->getSellerEmailTo())
+            ->from($this->getSellerEmailFrom())
             ->setTemplate('Mail/' . ucfirst($status) . '/Seller')
-            ->format(\TYPO3\CMS\Core\Mail\FluidEmail::FORMAT_HTML)
+            ->format(FluidEmail::FORMAT_HTML)
             ->assign('settings', $this->pluginSettings['settings'])
             ->assign('cart', $this->cart)
             ->assign('orderItem', $orderItem);
 
         if ($orderItem->getBillingAddress()->getEmail()) {
             $email->replyTo($orderItem->getBillingAddress()->getEmail());
         }
-        if ($this->sellerEmailBcc) {
-            $bcc = explode(',', $this->sellerEmailBcc);
+        if ($this->getSellerEmailBcc()) {
+            $bcc = explode(',', $this->getSellerEmailBcc());
             $email->bcc(...$bcc);
         }
 

diff --git a/Configuration/FlexForms/CartPlugin.xml b/Configuration/FlexForms/CartPlugin.xml
@@ -62,6 +62,17 @@
                             </config>
                         </TCEforms>
                     </settings.buyer.emailBccAddress>
+                    <settings.buyer.emailReplyToAddress>
+                        <TCEforms>
+                            <label>
+                                LLL:EXT:cart/Resources/Private/Language/locallang_db.xml:tx_cart.flexform.buyer.email_reply_to_address
+                            </label>
+                            <description>LLL:EXT:cart/Resources/Private/Language/locallang_db.xml:tx_cart.flexform.buyer.email_reply_to_address.description</description>
+                            <config>
+                                <type>input</type>
+                            </config>
+                        </TCEforms>
+                    </settings.buyer.emailReplyToAddress>
                 </el>
             </ROOT>
         </sDEF>

diff --git a/Documentation/AdministratorManual/Configuration/Order/Mail/Index.rst b/Documentation/AdministratorManual/Configuration/Order/Mail/Index.rst
@@ -13,6 +13,7 @@ but also configured via TypoScript.
            buyer {
                fromAddress = cart.buyer.sender@extco.de
                bccAddress = cart.buyer.bcc1@extco.de, cart.buyer.bcc2@extco.de
+               replyToAddress = cart.buyer.reply@extco.de
                attachments {
                    1 = EXT:theme_cart/Resources/Public/Files/AGB.pdf
                }
@@ -48,6 +49,18 @@ mail.buyer.bccAddress
       Defines to which addresses the e-mail should be sent in BCC (Blind Carbon Copy).
       Multiple recipients can be given separated by commas.
 
+mail.buyer.replyToAddress
+"""""""""""""""""""""""""
+.. container:: table-row
+
+   Property
+      plugin.tx_cart.mail.buyer.replyToAddress
+   Data type
+      string
+   Description
+      Defines to which address should be used as Reply To.
+      This will override the ['MAIL']['defaultMailReplyToAddress'] configuration.
+
 mail.buyer.attachments
 """"""""""""""""""""""
 .. container:: table-row

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-    <file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2015-02-03T15:20:00Z" product-name="cart">
+    <file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2021-02-09T12:22:00Z" product-name="cart">
         <header/>
         <body>
 
@@ -79,6 +79,14 @@
                 <source>The recipients of e-mails sent to one or more e-mail addresses separated by commas and listed in the so-called BCC (Blind Carbon Copy) field will receive a copy of the sent e-mail without their address being visible to the other specified recipients. (Source: Wikipedia)</source>
                 <target>Die Empfänger von E-Mails an eine oder mehrere durch Kommata getrennte E-Mail-Adressen, die im sogenannten BCC-Feld (von englisch: Blind Carbon Copy, dt. sinngemäß Blindkopie) aufgeführt wurden, erhalten eine Kopie der gesendeten E-Mail, ohne dass ihre Adresse für die anderen angegebenen Empfänger sichtbar wird. (Quelle: Wikipedia)</target>
             </trans-unit>
+            <trans-unit id="tx_cart.flexform.buyer.email_reply_to_address">
+                <source>Reply To email address for email to the Buyer</source>
+                <target>Reply To E-Mail-Adresse für E-Mail an den Käufer</target>
+            </trans-unit>
+            <trans-unit id="tx_cart.flexform.buyer.email_reply_to_address.description">
+                <source>The Reply To will override the default address configured in TYPO3 configuration.</source>
+                <target>Die Reply To E-Mail-Adresse überschreibt die im TYPO3 konfigurierte Standardantwortadresse.</target>
+            </trans-unit>
 
             <trans-unit id="tx_cart.tax_class_id">
                 <source>Tax Class</source>

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-    <file source-language="en" datatype="plaintext" original="messages" date="2015-02-03T15:20:00Z" product-name="cart">
+    <file source-language="en" datatype="plaintext" original="messages" date="2021-02-09T12:22:00Z" product-name="cart">
         <header/>
         <body>
 
@@ -61,6 +61,12 @@
             <trans-unit id="tx_cart.flexform.buyer.email_bcc_address.description">
                 <source>The recipients of e-mails sent to one or more e-mail addresses separated by commas and listed in the so-called BCC (Blind Carbon Copy) field will receive a copy of the sent e-mail without their address being visible to the other specified recipients. (Source: Wikipedia)</source>
             </trans-unit>
+            <trans-unit id="tx_cart.flexform.buyer.email_reply_to_address">
+                <source>Reply To email address for email to the Buyer</source>
+            </trans-unit>
+            <trans-unit id="tx_cart.flexform.buyer.email_reply_to_address.description">
+                <source>The Reply To will override the default address configured in TYPO3 configuration.</source>
+            </trans-unit>
 
             <trans-unit id="tx_cart.tax_class_id">
                 <source>Tax Class</source>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -5,7 +5,7 @@
     'description' => 'Shopping Cart(s) for TYPO3',
     'category' => 'plugin',
     'shy' => false,
-    'version' => '7.0.1',
+    'version' => '7.1.0',
     'dependencies' => '',
     'conflicts' => '',
     'priority' => '',