Merge pull request #121 from elisei/master

Fix #118 and #120

Model/Customer/Notifier/MailSender.php

@@ -16,30 +16,42 @@
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Store\Model\StoreManagerInterface;
 use Opengento\Gdpr\Model\Notifier\AbstractMailSender;
+use Psr\Log\LoggerInterface;
 
 final class MailSender extends AbstractMailSender implements SenderInterface
 {
+    /**
+     * @var LoggerInterface
+     */
+    private LoggerInterface $logger;
+
     /**
      * @var View
      */
     private View $customerViewHelper;
 
-    private StoreManagerInterface $storeManager;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
 
     public function __construct(
+        LoggerInterface $logger,
         View $customerViewHelper,
         TransportBuilder $transportBuilder,
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
         array $configPaths
     ) {
+        $this->logger = $logger;
         $this->customerViewHelper = $customerViewHelper;
         $this->storeManager = $storeManager;
         parent::__construct($transportBuilder, $scopeConfig, $configPaths);
     }
 
     /**
-     * @inheritdoc
+     * @param CustomerInterface $customer
+     * @return void
      * @throws LocalizedException
      * @throws MailException
      * @throws NoSuchEntityException
@@ -50,8 +62,16 @@ public function send(CustomerInterface $customer): void
         $vars = [
             'customer' => $customer,
             'store' => $this->storeManager->getStore($customer->getStoreId()),
+            'customer_data' => [
+                'customer_name' => $this->customerViewHelper->getCustomerName($customer),
+            ],
         ];
-
-        $this->sendMail($customer->getEmail(), $this->customerViewHelper->getCustomerName($customer), $storeId, $vars);
+
+        try {
+            $this->sendMail($customer->getEmail(), $this->customerViewHelper->getCustomerName($customer), $storeId, $vars);
+            $this->logger->debug(__('GDPR Email Success'));
+        } catch (MailException $exc) {
+            $this->logger->error(__('GDPR Email Error: %1', $exc->getMessage()));
+        }
     }
 }

Model/Order/Notifier/MailSender.php

@@ -14,17 +14,28 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Opengento\Gdpr\Model\Notifier\AbstractMailSender;
+use Psr\Log\LoggerInterface;
 
 final class MailSender extends AbstractMailSender implements SenderInterface
 {
+    /**
+     * @var LoggerInterface
+     */
+    private LoggerInterface $logger;
+
+    /**
+     * @var StoreManagerInterface
+     */
     private StoreManagerInterface $storeManager;
 
     public function __construct(
+        LoggerInterface $logger,
         TransportBuilder $transportBuilder,
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
         array $configPaths
     ) {
+        $this->logger = $logger;
         $this->storeManager = $storeManager;
         parent::__construct($transportBuilder, $scopeConfig, $configPaths);
     }
@@ -39,9 +50,19 @@ public function send(OrderInterface $order): void
         $storeId = $order->getStoreId() === null ? null : (int) $order->getStoreId();
         $vars = [
             'order' => $order,
+            'billing' => $order->getBillingAddress(),
             'store' => $this->storeManager->getStore($order->getStoreId()),
+            'customer_data' => [
+                'customer_name' => $order->getCustomerName(),
+            ],
         ];
 
-        $this->sendMail($order->getCustomerEmail(), $order->getCustomerName(), $storeId, $vars);
+        try {
+            $this->sendMail($order->getCustomerEmail(), $order->getCustomerName(), $storeId, $vars);
+            $this->logger->debug(__('GDPR Email Success'));
+        } catch (MailException $exc) {
+            $this->logger->error(__('GDPR Email Error: %1', $exc->getMessage()));
+        }
+
     }
 }

view/frontend/email/erase_canceled.html

@@ -6,18 +6,25 @@
 -->
 <!--@subject {{trans "Cancellation of the erase of your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
-
-<p>
-    {{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
 {{template config_path="design/email/footer_template"}}

view/frontend/email/erase_canceled_guest.html

@@ -6,18 +6,24 @@
 -->
 <!--@subject {{trans "Cancellation of the erase of your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Guest Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
-
-<p>
-    {{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
-{{template config_path="design/email/footer_template"}}
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>

view/frontend/email/erase_pending.html

@@ -6,19 +6,26 @@
 -->
 <!--@subject {{trans "Erase your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
-
-<p>
-    {{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-    {{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+            <p>{{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
 {{template config_path="design/email/footer_template"}}

view/frontend/email/erase_pending_guest.html

@@ -6,19 +6,26 @@
 -->
 <!--@subject {{trans "Erase your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Guest Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
-
-<p>
-    {{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-    {{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+            <p>{{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
 {{template config_path="design/email/footer_template"}}

view/frontend/email/erase_succeeded.html

@@ -6,18 +6,26 @@
 -->
 <!--@subject {{trans "Erasure of your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
-
-<p>
-    {{trans "We have successfully erased the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+            <p>{{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
 {{template config_path="design/email/footer_template"}}

view/frontend/email/erase_succeeded_guest.html

@@ -6,18 +6,26 @@
 -->
 <!--@subject {{trans "Erasure of your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Guest Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
-
-<p>
-    {{trans "We have successfully erased the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+            <p>{{trans 'You can cancel the erase whitin %delay hours by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
 {{template config_path="design/email/footer_template"}}

view/frontend/email/export_pending.html

@@ -6,20 +6,26 @@
 -->
 <!--@subject {{trans "Export your %store_name information" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
+"var customer_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
-
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
-
-<p>
-    {{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
-    {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
-</p>
-
-<p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
-
-{{template config_path="design/email/footer_template"}}
+<table border="0" cellspacing="0" width="100%" cellpadding="0">
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <p>{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
+            <p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
+        </td>
+    </tr>
+    <tr class="help-info">
+        <td>
+            <p>{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.</p>
+        </td>
+    </tr>
+</table>
+{{template config_path="design/email/footer_template"}}