Skip to content

Commit 4ef6b09

Browse files
thomas-kl1thomas-kl1
authored
Merge pull request #121 from elisei/master
Fix #118 and #120
2 parents 0f56e53 + 88fdebb commit 4ef6b09

12 files changed

+236
-127
lines changed

‎Model/Customer/Notifier/MailSender.php

+24-4
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,42 @@
1616
use Magento\Framework\Mail\Template\TransportBuilder;
1717
use Magento\Store\Model\StoreManagerInterface;
1818
use Opengento\Gdpr\Model\Notifier\AbstractMailSender;
19+
use Psr\Log\LoggerInterface;
1920

2021
final class MailSender extends AbstractMailSender implements SenderInterface
2122
{
23+
/**
24+
* @var LoggerInterface
25+
*/
26+
private LoggerInterface $logger;
27+
2228
/**
2329
* @var View
2430
*/
2531
private View $customerViewHelper;
2632

27-
private StoreManagerInterface $storeManager;
33+
/**
34+
* @var StoreManagerInterface
35+
*/
36+
private $storeManager;
2837

2938
public function __construct(
39+
LoggerInterface $logger,
3040
View $customerViewHelper,
3141
TransportBuilder $transportBuilder,
3242
ScopeConfigInterface $scopeConfig,
3343
StoreManagerInterface $storeManager,
3444
array $configPaths
3545
) {
46+
$this->logger = $logger;
3647
$this->customerViewHelper = $customerViewHelper;
3748
$this->storeManager = $storeManager;
3849
parent::__construct($transportBuilder, $scopeConfig, $configPaths);
3950
}
4051

4152
/**
42-
* @inheritdoc
53+
* @param CustomerInterface $customer
54+
* @return void
4355
* @throws LocalizedException
4456
* @throws MailException
4557
* @throws NoSuchEntityException
@@ -50,8 +62,16 @@ public function send(CustomerInterface $customer): void
5062
$vars = [
5163
'customer' => $customer,
5264
'store' => $this->storeManager->getStore($customer->getStoreId()),
65+
'customer_data' => [
66+
'customer_name' => $this->customerViewHelper->getCustomerName($customer),
67+
],
5368
];
54-
55-
$this->sendMail($customer->getEmail(), $this->customerViewHelper->getCustomerName($customer), $storeId, $vars);
69+
70+
try {
71+
$this->sendMail($customer->getEmail(), $this->customerViewHelper->getCustomerName($customer), $storeId, $vars);
72+
$this->logger->debug(__('GDPR Email Success'));
73+
} catch (MailException $exc) {
74+
$this->logger->error(__('GDPR Email Error: %1', $exc->getMessage()));
75+
}
5676
}
5777
}

‎Model/Order/Notifier/MailSender.php

+22-1
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,28 @@
1414
use Magento\Sales\Api\Data\OrderInterface;
1515
use Magento\Store\Model\StoreManagerInterface;
1616
use Opengento\Gdpr\Model\Notifier\AbstractMailSender;
17+
use Psr\Log\LoggerInterface;
1718

1819
final class MailSender extends AbstractMailSender implements SenderInterface
1920
{
21+
/**
22+
* @var LoggerInterface
23+
*/
24+
private LoggerInterface $logger;
25+
26+
/**
27+
* @var StoreManagerInterface
28+
*/
2029
private StoreManagerInterface $storeManager;
2130

2231
public function __construct(
32+
LoggerInterface $logger,
2333
TransportBuilder $transportBuilder,
2434
ScopeConfigInterface $scopeConfig,
2535
StoreManagerInterface $storeManager,
2636
array $configPaths
2737
) {
38+
$this->logger = $logger;
2839
$this->storeManager = $storeManager;
2940
parent::__construct($transportBuilder, $scopeConfig, $configPaths);
3041
}
@@ -39,9 +50,19 @@ public function send(OrderInterface $order): void
3950
$storeId = $order->getStoreId() === null ? null : (int) $order->getStoreId();
4051
$vars = [
4152
'order' => $order,
53+
'billing' => $order->getBillingAddress(),
4254
'store' => $this->storeManager->getStore($order->getStoreId()),
55+
'customer_data' => [
56+
'customer_name' => $order->getCustomerName(),
57+
],
4358
];
4459

45-
$this->sendMail($order->getCustomerEmail(), $order->getCustomerName(), $storeId, $vars);
60+
try {
61+
$this->sendMail($order->getCustomerEmail(), $order->getCustomerName(), $storeId, $vars);
62+
$this->logger->debug(__('GDPR Email Success'));
63+
} catch (MailException $exc) {
64+
$this->logger->error(__('GDPR Email Error: %1', $exc->getMessage()));
65+
}
66+
4667
}
4768
}

‎view/frontend/email/erase_canceled.html

+18-11
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@
66
-->
77
<!--@subject {{trans "Cancellation of the erase of your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15-
16-
<p>
17-
{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
</p>
20-
21-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
22-
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
</td>
23+
</tr>
24+
<tr class="help-info">
25+
<td>
26+
<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>
27+
</td>
28+
</tr>
29+
</table>
2330
{{template config_path="design/email/footer_template"}}

‎view/frontend/email/erase_canceled_guest.html

+18-12
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@
66
-->
77
<!--@subject {{trans "Cancellation of the erase of your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Guest Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
15-
16-
<p>
17-
{{trans "We have received a request to cancel the erasure of the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
</p>
20-
21-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
22-
23-
{{template config_path="design/email/footer_template"}}
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
</td>
23+
</tr>
24+
<tr class="help-info">
25+
<td>
26+
<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>
27+
</td>
28+
</tr>
29+
</table>

‎view/frontend/email/erase_pending.html

+19-12
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,26 @@
66
-->
77
<!--@subject {{trans "Erase your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15-
16-
<p>
17-
{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
{{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}}
20-
</p>
21-
22-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
23-
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
<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>
23+
</td>
24+
</tr>
25+
<tr class="help-info">
26+
<td>
27+
<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>
28+
</td>
29+
</tr>
30+
</table>
2431
{{template config_path="design/email/footer_template"}}

‎view/frontend/email/erase_pending_guest.html

+19-12
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,26 @@
66
-->
77
<!--@subject {{trans "Erase your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Guest Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
15-
16-
<p>
17-
{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
{{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}}
20-
</p>
21-
22-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
23-
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
<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>
23+
</td>
24+
</tr>
25+
<tr class="help-info">
26+
<td>
27+
<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>
28+
</td>
29+
</tr>
30+
</table>
2431
{{template config_path="design/email/footer_template"}}

‎view/frontend/email/erase_succeeded.html

+19-11
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,26 @@
66
-->
77
<!--@subject {{trans "Erasure of your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15-
16-
<p>
17-
{{trans "We have successfully erased the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
</p>
20-
21-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
22-
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
<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>
23+
</td>
24+
</tr>
25+
<tr class="help-info">
26+
<td>
27+
<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>
28+
</td>
29+
</tr>
30+
</table>
2331
{{template config_path="design/email/footer_template"}}

‎view/frontend/email/erase_succeeded_guest.html

+19-11
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,26 @@
66
-->
77
<!--@subject {{trans "Erasure of your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Guest Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
15-
16-
<p>
17-
{{trans "We have successfully erased the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
</p>
20-
21-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
22-
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
<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>
23+
</td>
24+
</tr>
25+
<tr class="help-info">
26+
<td>
27+
<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>
28+
</td>
29+
</tr>
30+
</table>
2331
{{template config_path="design/email/footer_template"}}

‎view/frontend/email/export_pending.html

+20-14
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,26 @@
66
-->
77
<!--@subject {{trans "Export your %store_name information" store_name=$store.getFrontendName()}} @-->
88
<!--@vars {
9-
"var customer.name":"Customer Name",
9+
"var customer_data.customer_name":"Customer Name"
1010
} @-->
1111

1212
{{template config_path="design/email/header_template"}}
13-
14-
<p class="greeting">{{trans "%name," name=$customer.name}}</p>
15-
16-
<p>
17-
{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}
18-
{{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}}.
19-
</p>
20-
21-
<p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
22-
23-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
24-
25-
{{template config_path="design/email/footer_template"}}
13+
<table border="0" cellspacing="0" width="100%" cellpadding="0">
14+
<tr class="email-intro">
15+
<td>
16+
<p class="greeting">{{trans "%name," name=$customer_data.customer_name}}</p>
17+
</td>
18+
</tr>
19+
<tr class="email-summary">
20+
<td>
21+
<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>
22+
<p>{{trans "We will notify you when the export will be ready. The action will be available in your account."}}</p>
23+
</td>
24+
</tr>
25+
<tr class="help-info">
26+
<td>
27+
<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>
28+
</td>
29+
</tr>
30+
</table>
31+
{{template config_path="design/email/footer_template"}}

0 commit comments

Comments
 (0)