Skip to content

Commit 9ec6596

Browse files
committed
Fix link to actions in emails + Fix cli invalid types
1 parent 4b78afe commit 9ec6596

8 files changed

+12
-8
lines changed

Console/Command/EraseCommand.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7777

7878
try {
7979
foreach ($entityIds as $entityId) {
80-
$this->eraseEntityManagement->process($this->fetchEntity($entityType, $entityId));
80+
$this->eraseEntityManagement->process($this->fetchEntity((int)$entityId, $entityType));
8181
$progressBar->advance();
8282
}
8383
$progressBar->finish();
84+
$output->writeln('');
8485
$output->writeln('<info>Entities has been erased.</info>');
8586
} catch (LocalizedException $e) {
87+
$output->writeln('');
8688
$output->writeln('<error>' . $e->getMessage() . '</error>');
8789
$returnCode = Cli::RETURN_FAILURE;
8890
}

Console/Command/ExportCommand.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7676

7777
try {
7878
foreach ($entityIds as $entityId) {
79-
$exportEntity = $this->fetchEntity($entityId, $entityType);
79+
$exportEntity = $this->fetchEntity((int)$entityId, $entityType);
8080
$this->exportEntityManagement->export($exportEntity);
8181
$files[] = $exportEntity->getFilePath();
8282
$progressBar->advance();
8383
}
8484
$progressBar->finish();
85+
$output->writeln('');
8586
$output->writeln('<info>Entities data have been exported to:</info>');
8687
foreach ($files as $file) {
8788
$output->writeln($file);
8889
}
8990
} catch (Exception $e) {
91+
$output->writeln('');
9092
$output->writeln('<error>' . $e->getMessage() . '</error>');
9193
$resultCode = Cli::RETURN_FAILURE;
9294
}

view/frontend/email/erase_pending.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
22-
<p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
22+
<p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

view/frontend/email/erase_pending_guest.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to erase the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
22-
<p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
22+
<p>{{trans 'You can cancel the erase within %delay hours by <a href="%account_url">logging into your account</a>.' delay=$delay account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

view/frontend/email/export_pending.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to export 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>
22+
<p>{{trans "We will notify you when the export will be ready. The action will be available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

view/frontend/email/export_pending_guest.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to export 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>
22+
<p>{{trans "We will notify you when the export will be ready. The action will be available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

view/frontend/email/export_ready.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
22-
<p>{{trans "The export of you personal data is ready. The action is now available in your account."}}</p>
22+
<p>{{trans "The export of you personal data is ready. The action is now available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'customer/privacy/settings',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

view/frontend/email/export_ready_guest.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tr class="email-summary">
2020
<td>
2121
<p>{{trans "We have received a request to export the information associated with your account at %store_name." store_name=$store.getFrontendName()}}</p>
22-
<p>{{trans "The export of you personal data is ready. The action is now available in your account."}}</p>
22+
<p>{{trans "The export of you personal data is ready. The action is now available by <a href="%account_url">logging into your account</a>." account_url=$this.getUrl($store,'sales/guest/form',[_nosid:1]) |raw}}</p>
2323
</td>
2424
</tr>
2525
<tr class="help-info">

0 commit comments

Comments
 (0)