Skip to content

Commit 7d7526d

Browse files
thomas-kl1thomas-kl1
authored
Merge pull request #158 from opengento/master
Synchronization
2 parents 4560978 + 2c7a1be commit 7d7526d

21 files changed

+537
-73
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# These are supported funding model platforms
22

33
#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4-
patreon: thomas_klein # Replace with a single Patreon username
4+
#patreon: # Replace with a single Patreon username
55
#open_collective: # Replace with a single Open Collective username
66
#ko_fi: # Replace with a single Ko-fi username
77
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
88
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
99
#liberapay: # Replace with a single Liberapay username
1010
#issuehunt: # Replace with a single IssueHunt username
1111
#otechie: # Replace with a single Otechie username
12-
custom: ['https://secure.payplug.com/p/jtN33xM']
12+
custom: ['https://www.helloasso.com/associations/opengento/formulaires/1']

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea/

‎Model/Export/ExportToFile.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __construct(
5454
public function export(ExportEntityInterface $exportEntity): string
5555
{
5656
$fileName = $this->prepareFileName($exportEntity);
57-
$archiveFileName = $fileName . 'zip';
57+
$archiveFileName = $fileName . '.zip';
5858
$data = $this->processorFactory->get($exportEntity->getEntityType())->execute($exportEntity->getEntityId(), []);
5959

6060
foreach ($this->resolveExportRendererCodes() as $rendererCode) {

‎README.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Packagist](https://img.shields.io/packagist/dm/opengento/module-gdpr.svg?style=flat-square)](https://packagist.org/packages/opengento/module-gdpr/stats)
77
[![Codacy Badge](https://img.shields.io/codacy/grade/e43739589ae249a58b4af6dfcd9c555a?style=flat-square)](https://www.codacy.com/gh/opengento/magento2-gdpr)
88

9-
This extension fullfill the GDPR requirements for Magento 2.
9+
This extension fulfill the GDPR requirements for Magento 2.
1010

1111
- [Setup](#setup)
1212
- [Composer installation](#composer-installation)
@@ -42,9 +42,9 @@ bin/magento setup:upgrade
4242

4343
## Features
4444

45-
Screenshots are available at: [https://opengento.fr/magento2-gdpr/features](https://opengento.fr/magento2-gdpr/features)
45+
**See the [screenshots](https://opengento.fr/magento2-gdpr/features) of the module's features.**
4646

47-
Users, guest and customer can:
47+
### Users, guest and customer can:
4848

4949
* **[Art. 16 GDPR](https://gdpr-info.eu/art-16-gdpr/)** Edit their personal data (native in vanilla)
5050

@@ -71,7 +71,7 @@ the idle time for the users before they are erase, and the sales information lif
7171
Personal data export can be done in the order view, they must fill the guest form first to show their order.
7272
* Cookie Policy in a disclosure popup are shown at the first time customer visit.
7373

74-
Details:
74+
### Details:
7575

7676
- [x] Erasure: delete or anonymize specific data thanks to configurable settings in admin ui.
7777
- [x] Configure which order can be erased, regarding their state and life time.
@@ -86,17 +86,21 @@ Details:
8686
- [x] Notify the user when a GDPR action is performed, configure the template and sending settings.
8787
- [x] Display the cookie disclosure pop-in and edit its content as you want.
8888

89-
Languages:
89+
### Languages:
9090

91-
Every translations must be done here https://www.transifex.com/opengento/opengentomagento2-gdpr/
91+
**Open contributions to translations can be done with [transifex](https://www.transifex.com/opengento/opengentomagento2-gdpr/).**
9292

93-
- [x] en_US ; English
93+
- [x] bg_BG ; Bulgarian
9494
- [x] de_DE ; German
95+
- [x] en_US ; English
9596
- [x] fr_FR ; French
96-
- [x] nl_NL ; Dutch
9797
- [x] it_IT ; Italian
98+
- [x] nl_NL ; Dutch
9899
- [x] pl_PL ; Polish
99100
- [x] th_TH ; Thai
101+
- [x] da_DK ; Danish
102+
103+
*Many thanks to the translators who contributed directly here or with transifex!*
100104

101105
## Settings
102106

‎etc/db_schema.xml‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" comment="Entity ID"/>
1212
<column xsi:type="varchar" name="entity_type" length="255" nullable="false" comment="Entity Type"/>
1313
<column xsi:type="timestamp" name="scheduled_at" nullable="false" comment="Scheduled At"/>
14-
<column xsi:type="varchar" name="state" length="255" nullable="false" comment="State"/>
15-
<column xsi:type="varchar" name="status" length="255" nullable="false" comment="Status"/>
14+
<column xsi:type="varchar" name="state" length="191" nullable="false" comment="State"/>
15+
<column xsi:type="varchar" name="status" length="191" nullable="false" comment="Status"/>
1616
<column xsi:type="text" name="message" nullable="true" comment="Message"/>
1717
<column xsi:type="timestamp" name="erased_at" nullable="true" comment="Erased At"/>
1818
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -22,17 +22,20 @@
2222
<column name="entity_id"/>
2323
<column name="entity_type"/>
2424
</constraint>-->
25-
<index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_ID" indexType="btree">
25+
<index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_IDENTITY" indexType="btree">
26+
<column name="entity_type"/>
2627
<column name="entity_id"/>
2728
</index>
28-
<index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE" indexType="btree">
29-
<column name="entity_type"/>
29+
<index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_SCHEDULED_EXPORT" indexType="btree">
30+
<column name="scheduled_at"/>
31+
<column name="state"/>
32+
<column name="status"/>
3033
</index>
3134
</table>
3235
<table name="opengento_gdpr_export_entity" resource="default" engine="innodb" comment="Export Entity">
3336
<column xsi:type="int" name="export_id" padding="11" unsigned="true" nullable="false" identity="true" comment="Export ID"/>
3437
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" comment="Entity ID"/>
35-
<column xsi:type="varchar" name="entity_type" length="255" nullable="false" comment="Entity Type"/>
38+
<column xsi:type="varchar" name="entity_type" length="191" nullable="false" comment="Entity Type"/>
3639
<column xsi:type="varchar" name="file_name" length="255" nullable="false" comment="File Name"/>
3740
<column xsi:type="text" name="file_path" nullable="true" comment="File Path"/>
3841
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
@@ -41,20 +44,24 @@
4144
<constraint xsi:type="primary" referenceId="PRIMARY">
4245
<column name="export_id"/>
4346
</constraint>
44-
<index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID" indexType="btree">
47+
<index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_IDENTITY" indexType="btree">
4548
<column name="entity_id"/>
46-
</index>
47-
<index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE" indexType="btree">
4849
<column name="entity_type"/>
4950
</index>
51+
<index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_EXPORTED_AT" indexType="btree">
52+
<column name="exported_at"/>
53+
</index>
54+
<index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_EXPIRED_AT" indexType="btree">
55+
<column name="expired_at"/>
56+
</index>
5057
</table>
5158
<table name="opengento_gdpr_action_entity" resource="default" engine="innodb" comment="Action Entity">
5259
<column xsi:type="int" name="action_id" padding="11" unsigned="true" nullable="false" identity="true" comment="Export ID"/>
53-
<column xsi:type="varchar" name="type" length="255" nullable="false" comment="Type"/>
60+
<column xsi:type="varchar" name="type" length="191" nullable="false" comment="Type"/>
5461
<column xsi:type="text" name="performed_from" nullable="false" comment="Performed From"/>
5562
<column xsi:type="text" name="performed_by" nullable="true" comment="Performed By"/>
5663
<column xsi:type="timestamp" name="performed_at" nullable="false" comment="Performed At"/>
57-
<column xsi:type="varchar" name="state" length="255" nullable="false" comment="State"/>
64+
<column xsi:type="varchar" name="state" length="191" nullable="false" comment="State"/>
5865
<column xsi:type="text" name="message" nullable="false" comment="Message"/>
5966
<column xsi:type="text" name="parameters" nullable="false" comment="Parameters"/>
6067
<constraint xsi:type="primary" referenceId="PRIMARY">

‎etc/db_schema_whitelist.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
},
1313
"index": {
1414
"OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_ID": true,
15-
"OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE": true
15+
"OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE": true,
16+
"OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE_ENTITY_ID": true,
17+
"OPENGENTO_GDPR_ERASE_ENTITY_SCHEDULED_AT_STATE_STATUS": true
1618
},
1719
"constraint": {
1820
"PRIMARY": true,
@@ -32,7 +34,10 @@
3234
},
3335
"index": {
3436
"OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID": true,
35-
"OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE": true
37+
"OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE": true,
38+
"OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID_ENTITY_TYPE": true,
39+
"OPENGENTO_GDPR_EXPORT_ENTITY_EXPORTED_AT": true,
40+
"OPENGENTO_GDPR_EXPORT_ENTITY_EXPIRED_AT": true
3641
},
3742
"constraint": {
3843
"PRIMARY": true

0 commit comments

Comments
 (0)