From 91b934212baae1948c2a3cf9fcb754cb30ba8e3b Mon Sep 17 00:00:00 2001
From: Alexander Menk <a.menk@imi.de>
Date: Thu, 21 Sep 2023 14:29:38 +0200
Subject: [PATCH 1/5] #15 Fix: Sender/Recipient was taken from default config

---
 Helper/Email.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Helper/Email.php b/Helper/Email.php
index 2376eb0..c6b38b2 100644
--- a/Helper/Email.php
+++ b/Helper/Email.php
@@ -112,8 +112,8 @@ public function send(string $to, array $vars, int $storeId = 0)
             'store' => $storeId,
         ]);
         $this->transportBuilder->addTo($to);
-        $this->transportBuilder->addBcc($this->getRecipientAddress());
-        $this->transportBuilder->setFromByScope($this->getFrom());
+        $this->transportBuilder->addBcc($this->getRecipientAddress($storeId));
+        $this->transportBuilder->setFromByScope($this->getFrom($storeId));
         $this->transportBuilder->setTemplateVars($vars);
         $this->transportBuilder->getTransport()->sendMessage();
         $this->inlineTranslate->resume();
@@ -122,35 +122,35 @@ public function send(string $to, array $vars, int $storeId = 0)
     /**
      * @return mixed
      */
-    private function getRecipientAddress()
+    private function getRecipientAddress(int $storeId = 0)
     {
-        return $this->getContactConfig('general/send_to') ?? $this->getConfig('trans_email/ident_sales/email');
+        return $this->getContactConfig('general/send_to', $storeId) ?? $this->getConfig('trans_email/ident_sales/email', $storeId);
     }
 
     /**
      * @return array
      */
-    private function getFrom()
+    private function getFrom(int $storeId = 0)
     {
         return [
-            'name' => $this->getFromName(),
-            'email' => $this->getFromAddress(),
+            'name' => $this->getFromName($storeId),
+            'email' => $this->getFromAddress($storeId),
         ];
     }
 
     /**
      * @return mixed
      */
-    private function getFromAddress()
+    private function getFromAddress(int $storeId = 0)
     {
-        return $this->getContactConfig('general/send_from') ?? $this->getConfig('trans_email/ident_sales/email');
+        return $this->getContactConfig('general/send_from', $storeId) ?? $this->getConfig('trans_email/ident_sales/email', $storeId);
     }
 
     /**
      * @return mixed
      */
-    private function getFromName()
+    private function getFromName(int $storeId = 0)
     {
-       return  $this->getContactConfig('general/send_from_name') ?? $this->getConfig('trans_email/ident_sales/name');
+       return  $this->getContactConfig('general/send_from_name', $storeId) ?? $this->getConfig('trans_email/ident_sales/name', $storeId);
     }
 }

From 3af2cfee6339fdd1fda24c6182664aeacd2a30c8 Mon Sep 17 00:00:00 2001
From: Alexander Menk <a.menk@imi.de>
Date: Thu, 21 Sep 2023 14:41:39 +0200
Subject: [PATCH 2/5] #13 Add all_fields_html field to include all fields
 easily

---
 Helper/Email.php                                           | 6 +++++-
 view/frontend/email/sy_contact_general_email_template.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Helper/Email.php b/Helper/Email.php
index c6b38b2..d7b2477 100644
--- a/Helper/Email.php
+++ b/Helper/Email.php
@@ -83,13 +83,17 @@ public function receive(Request $request, $storeId = 0)
      */
     public function toVars(array $array)
     {
+        $allFieldsHtml = '';
         $vars = [];
         if (is_array($array) && count($array) > 0) {
             foreach ($array as $field) {
-                $vars[$field['key']] = $field['value'];
+                $value = is_array($field['value']) ? implode(', ', $field['value']) : (string) $field['value'];
+                $vars[$field['key']] = $value;
+                $allFieldsHtml .= sprintf('<strong>%s:</strong> %s<br>', htmlspecialchars($field['label']), htmlspecialchars($value));
             }
         }
 
+        $vars['_all_fields_html'] = $allFieldsHtml;
         return $vars;
     }
 
diff --git a/view/frontend/email/sy_contact_general_email_template.html b/view/frontend/email/sy_contact_general_email_template.html
index 7d28feb..cba39f7 100644
--- a/view/frontend/email/sy_contact_general_email_template.html
+++ b/view/frontend/email/sy_contact_general_email_template.html
@@ -1,2 +1,2 @@
 <!--@subject Contact Form @-->
-<strong>Customer Message:</strong> {{var message}} <br/>
\ No newline at end of file
+{{var _all_fields_html|raw}}

From ed255a4cdfefc820a985322256f48cd74acf6825 Mon Sep 17 00:00:00 2001
From: Alexander Menk <a.menk@imi.de>
Date: Thu, 21 Sep 2023 14:51:15 +0200
Subject: [PATCH 3/5] Fix: multicheckbox triggered wrong checkbox (duplicate
 ids)

---
 Helper/Email.php                   |  2 +-
 view/frontend/templates/form.phtml | 84 +++++++++++++++---------------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/Helper/Email.php b/Helper/Email.php
index d7b2477..6994ce3 100644
--- a/Helper/Email.php
+++ b/Helper/Email.php
@@ -89,7 +89,7 @@ public function toVars(array $array)
             foreach ($array as $field) {
                 $value = is_array($field['value']) ? implode(', ', $field['value']) : (string) $field['value'];
                 $vars[$field['key']] = $value;
-                $allFieldsHtml .= sprintf('<strong>%s:</strong> %s<br>', htmlspecialchars($field['label']), htmlspecialchars($value));
+                $allFieldsHtml .= sprintf('<strong>%s:</strong> %s<br>', htmlspecialchars($field['label']), htmlspecialchars($value)) . PHP_EOL;
             }
         }
 
diff --git a/view/frontend/templates/form.phtml b/view/frontend/templates/form.phtml
index 5b2cc24..1c5bf2b 100644
--- a/view/frontend/templates/form.phtml
+++ b/view/frontend/templates/form.phtml
@@ -7,65 +7,67 @@
 ?>
 <?php $fields = $block->getFields(); ?>
 <?php if (count($fields) > 0): ?>
-    <form class="form contact" action="<?php echo $block->getUrl('customcontact/form/post'); ?>" id="contact-form"
-          method="post" data-mage-init='<?php echo $block->getJsFormConfig() ?>'>
-        <input type="hidden" name="form_key" value="<?php echo $block->getFormKey(); ?>">
+    <form class="form contact" action="<?= $block->getUrl('customcontact/form/post'); ?>" id="contact-form"
+          method="post" data-mage-init='<?= $block->getJsFormConfig() ?>'>
+        <input type="hidden" name="form_key" value="<?= $block->getFormKey(); ?>">
         <fieldset class="fieldset">
-            <legend class="legend"><span><?php echo __('Write Us'); ?></span></legend>
+            <legend class="legend"><span><?= __('Write Us'); ?></span></legend>
             <div class="field note no-label">
-                <?php echo __('Jot us a note and we’ll get back to you as quickly as possible.'); ?>
+                <?= __('Jot us a note and we’ll get back to you as quickly as possible.'); ?>
             </div>
             <?php foreach ($fields as $field): ?>
-                <div class="field <?php echo $field->getData('key'); ?> <?php echo $field->getData('field_class'); ?>">
+                <div class="field <?= $field->getData('key'); ?> <?= $field->getData('field_class'); ?>">
                     <label class="label"
-                           for="<?php echo $field->getData('key'); ?>"><span><?php echo $field->getData('label'); ?></span></label>
+                           for="<?= $field->getData('key'); ?>"><span><?= $field->getData('label'); ?></span></label>
                     <div class="control">
                         <?php if (in_array($field->getData('field_type'), ['text', 'email'])): ?>
-                            <input name="<?php echo $field->getData('key'); ?>"
-                                   id="<?php echo $field->getData('key'); ?>"
-                                   title="<?php echo $field->getData('label'); ?>"
-                                   value="<?php echo $block->escapeHtml($field->getData('default_value')); ?>"
-                                   class="<?php echo $field->getData('field_class'); ?>"
-                                   type="<?php echo $field->getData('field_type'); ?>">
+                            <input name="<?= $field->getData('key'); ?>"
+                                   id="<?= $field->getData('key'); ?>"
+                                   title="<?= $field->getData('label'); ?>"
+                                   value="<?= $block->escapeHtml($field->getData('default_value')); ?>"
+                                   class="<?= $field->getData('field_class'); ?>"
+                                   type="<?= $field->getData('field_type'); ?>">
                         <?php elseif ($field->getData('field_type') == 'textarea'): ?>
-                            <textarea name="<?php echo $field->getData('key'); ?>"
-                                      id="<?php echo $field->getData('key'); ?>"
-                                      title="<?php echo $field->getData('label'); ?>"
-                                      class="<?php echo $field->getData('field_class'); ?>"
-                                      style="resize:none"><?php echo $block->escapeHtml($field->getData('default_value')); ?></textarea>
+                            <textarea name="<?= $field->getData('key'); ?>"
+                                      id="<?= $field->getData('key'); ?>"
+                                      title="<?= $field->getData('label'); ?>"
+                                      class="<?= $field->getData('field_class'); ?>"
+                                      style="resize:none"><?= $block->escapeHtml($field->getData('default_value')); ?></textarea>
                         <?php elseif ($field->getData('field_type') == 'checkbox'): ?>
-                            <input type="checkbox" name="<?php echo $field->getData('key'); ?>"
-                                   id="<?php echo $field->getData('key'); ?>"
-                                   title="<?php echo $field->getData('label'); ?>"
-                                   value="<?php echo $block->escapeHtml($field->getData('default_value')); ?>"
-                                   class="<?php echo $field->getData('field_class'); ?>"
-                                   type="<?php echo $field->getData('field_type'); ?>">
-                            <label for="<?php echo $field->getData('key'); ?>">
-                                <?php echo $block->escapeHtml($field->getData('default_value')); ?>
+                            <input type="checkbox" name="<?= $field->getData('key'); ?>"
+                                   id="<?= $field->getData('key'); ?>"
+                                   title="<?= $field->getData('label'); ?>"
+                                   value="<?= $block->escapeHtml($field->getData('default_value')); ?>"
+                                   class="<?= $field->getData('field_class'); ?>"
+                                   type="<?= $field->getData('field_type'); ?>">
+                            <label for="<?= $field->getData('key'); ?>">
+                                <?= $block->escapeHtml($field->getData('default_value')); ?>
                             </label>
                         <?php elseif ($field->getData('field_type') == 'select'): ?>
-                            <select name="<?php echo $field->getData('key'); ?>" id="<?php echo $field->getData('key'); ?>">
+                            <select name="<?= $field->getData('key'); ?>" id="<?= $field->getData('key'); ?>">
                                 <?php foreach(explode('|', $field->getData('options')) as $value): ?>
-                                    <option value="<?php echo $block->escapeHtml($value); ?>"
+                                    <option value="<?= $block->escapeHtml($value); ?>"
                                         <?php if ($field->getData('default_value') == $value) echo " selected" ?>
                                     >
-                                        <?php echo $block->escapeHtml($value); ?>
+                                        <?= $block->escapeHtml($value); ?>
                                     </option>
                                 <?php endforeach ?>
                             </select>
                         <?php elseif ($field->getData('field_type') == 'checkbox_list'): ?>
-                            <?php foreach(explode('|', $field->getData('options')) as $value): ?>
+                            <?php foreach (explode('|', $field->getData('options')) as $index => $value): ?>
                                 <p>
-                                    <input type="checkbox" name="<?php echo $field->getData('key'); ?>[]"
-                                           id="<?php echo $field->getData('key'); ?>"
-                                           title="<?php echo $field->getData('label'); ?>"
-                                           value="<?php echo $block->escapeHtml($value); ?>"
-                                           class="<?php echo $field->getData('field_class'); ?>"
-                                           type="<?php echo $field->getData('field_type'); ?>"
-                                            <?php if ($field->getData('default_value') == $value) echo " selected" ?>
+                                    <input type="checkbox" name="<?= $field->getData('key'); ?>[]"
+                                           id="<?= $field->getData('key') . $index; ?>"
+                                           title="<?= $field->getData('label'); ?>"
+                                           value="<?= $block->escapeHtml($value); ?>"
+                                           class="<?= $field->getData('field_class'); ?>"
+                                           type="<?= $field->getData('field_type'); ?>"
+                                        <?php if ($field->getData('default_value') == $value) {
+                                            echo " selected";
+                                        } ?>
                                     >
-                                    <label for="<?php echo $field->getData('key'); ?>">
-                                        <?php echo $block->escapeHtml($value); ?>
+                                    <label for="<?= $field->getData('key') . $index; ?>">
+                                        <?= $block->escapeHtml($value); ?>
                                     </label>
                                 </p>
                             <?php endforeach ?>
@@ -77,8 +79,8 @@
         <div class="actions-toolbar">
             <div class="primary">
                 <input type="hidden" name="hideit" id="hideit" value="">
-                <button type="submit" title="<?php echo __('Submit'); ?>" class="action submit primary">
-                    <span><?php echo __('Submit'); ?></span>
+                <button type="submit" title="<?= __('Submit'); ?>" class="action submit primary">
+                    <span><?= __('Submit'); ?></span>
                 </button>
             </div>
         </div>

From b22fb1d6212b6f87849fc0ebb5c7f86dca2d496a Mon Sep 17 00:00:00 2001
From: Alexander Menk <a.menk@imi.de>
Date: Thu, 21 Sep 2023 14:55:13 +0200
Subject: [PATCH 4/5] Include new feature in README

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 9b1a99d..d787c8d 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,11 @@ Based on (https://github.com/SlavaYurthev/Contact-M2/)
 
 `composer require imi/contact-m2`
 
+## Mail Template
+
+You can use the following snipped to include all the non-empty fields:
+
+```
+{{var _all_fields_html|raw}}
+```
 

From a140c2fec9ff7f1c7133d4be3627214ee507a849 Mon Sep 17 00:00:00 2001
From: Alexander Menk <a.menk@imi.de>
Date: Thu, 21 Sep 2023 15:26:11 +0200
Subject: [PATCH 5/5] #14 Still send to the customer service if there is no
 mail field

---
 .../System/Config/Form/Field/Fields.php       | 16 +++++++-------
 Helper/Email.php                              | 22 +++++++++++++++----
 README.md                                     | 14 ++++++++++--
 etc/adminhtml/system.xml                      |  3 ++-
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/Block/Adminhtml/System/Config/Form/Field/Fields.php b/Block/Adminhtml/System/Config/Form/Field/Fields.php
index f88c3b8..8ce066a 100644
--- a/Block/Adminhtml/System/Config/Form/Field/Fields.php
+++ b/Block/Adminhtml/System/Config/Form/Field/Fields.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Contact
- * 
+ *
  * @author Slava Yurthev
  */
 namespace SY\Contact\Block\Adminhtml\System\Config\Form\Field;
@@ -19,24 +19,24 @@ private function getTypeRenderer(){
 		return $this->_typeRenderer
 			->addOption('text', 'Single Line Text')
 			->addOption('textarea', 'Multi Line Text')
-			->addOption('email', 'E-Mail')
+			->addOption('email', 'E-Mail***')
 			->addOption('checkbox', 'Checkbox')
 			->addOption('checkbox_list', 'Checkbox List')
 			->addOption('select', 'Drop Down');
 	}
 	protected function _prepareToRender(){
 		$this->addColumn('key', [
-				'label' => __('Key'), 
+				'label' => __('Key'),
 				'style'=>'min-width:100px',
 				'class' => 'input-text required'
 			]);
 		$this->addColumn('label', [
-				'label' => __('Label'), 
+				'label' => __('Label'),
 				'style'=>'min-width:100px',
 				'class' => 'input-text required'
 			]);
 		$this->addColumn('field_class', [
-				'label' => __('Field Class'), 
+				'label' => __('Field Class'),
 				'style'=>'min-width:100px'
 			]);
 		$this->addColumn('default_value', [
@@ -52,7 +52,7 @@ protected function _prepareToRender(){
                 'style'=>'min-width:100px'
             ]);
 		$this->addColumn('field_type', [
-				'label' => __('Type'), 
+				'label' => __('Type'),
 				'style'=>'min-width:100px',
 				'renderer' => $this->getTypeRenderer()
 			]);
@@ -65,7 +65,7 @@ protected function _prepareArrayRow(\Magento\Framework\DataObject $row){
 		$type = $row->getData('field_type');
 		$key = 'option_' . $this->getTypeRenderer()->calcOptionHash($type);
 		$options[$key] = 'selected="selected"';
-		
+
 		$row->setData('option_extra_attrs', $options);
 	}
-}
\ No newline at end of file
+}
diff --git a/Helper/Email.php b/Helper/Email.php
index 6994ce3..949d781 100644
--- a/Helper/Email.php
+++ b/Helper/Email.php
@@ -67,12 +67,21 @@ public function receive(Request $request, $storeId = 0)
         $this->request = $request;
         $info = $this->request->getData('info');
         $info = $this->_json->unserialize($info);
+
         if (is_array($info) && count($info) > 0) {
+
+            $didSentEmail = false;
             foreach ($info as $field) {
                 if (@$field['type'] == self::EMAIL_TYPE) {
                     $this->send($field['value'], $this->toVars($info), $storeId);
+                    $didSentEmail = true;
                 }
             }
+
+            if (!$didSentEmail) {
+                $this->send(null, $this->toVars($info), $storeId);
+
+            }
         }
     }
 
@@ -98,14 +107,14 @@ public function toVars(array $array)
     }
 
     /**
-     * @param string $to
+     * @param ?string $to if this is null, send only to customer service (but use it as $to)
      * @param array $vars
      * @param int $storeId
      *
      * @throws LocalizedException
      * @throws MailException
      */
-    public function send(string $to, array $vars, int $storeId = 0)
+    public function send(?string $to, array $vars, int $storeId = 0)
     {
         $this->inlineTranslate->suspend();
         $this->transportBuilder->setTemplateIdentifier(
@@ -115,8 +124,13 @@ public function send(string $to, array $vars, int $storeId = 0)
             'area' => Area::AREA_FRONTEND,
             'store' => $storeId,
         ]);
-        $this->transportBuilder->addTo($to);
-        $this->transportBuilder->addBcc($this->getRecipientAddress($storeId));
+
+        if ($to === null) {
+            $this->transportBuilder->addTo($this->getRecipientAddress($storeId));
+        } else {
+            $this->transportBuilder->addTo($to);
+            $this->transportBuilder->addBcc($this->getRecipientAddress($storeId));
+        }
         $this->transportBuilder->setFromByScope($this->getFrom($storeId));
         $this->transportBuilder->setTemplateVars($vars);
         $this->transportBuilder->getTransport()->sendMessage();
diff --git a/README.md b/README.md
index d787c8d..d9ca967 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,21 @@ Based on (https://github.com/SlavaYurthev/Contact-M2/)
 
 `composer require imi/contact-m2`
 
-## Mail Template
+## Usage 
+
+### Configuration
+
+The plugin is configured at `Stores -> Configuration -> Custom Contact -> Contact Us`
+
+### Recipient
+
+Email type fields will receive the email. If you want to ask for another email, use the text type.
+
+
+### Mail Template
 
 You can use the following snipped to include all the non-empty fields:
 
 ```
 {{var _all_fields_html|raw}}
 ```
-
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 206fcc2..f4d1f28 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -28,7 +28,8 @@
 					<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
 					<comment><![CDATA[
 					* You can use directives in for the Default Value such as {{customer.firstname}} {{customerDefaultBilling.city}}<br>
-					** Enter a field name to show the current field only, if another one is filled.
+					** Enter a field name to show the current field only, if another one is filled.<br>
+					*** Email type fields will receive the email. If you want to ask for another email, use the text type.
 					]]></comment>
 				</field>
 				<field id="email_template" translate="label comment" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">