Merge pull request #158 from opengento/master

Synchronization

Author: thomas-kl1

.github/FUNDING.yml

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

.gitignore

@@ -0,0 +1 @@
+.idea/

Model/Export/ExportToFile.php

@@ -54,7 +54,7 @@ public function __construct(
     public function export(ExportEntityInterface $exportEntity): string
     {
         $fileName = $this->prepareFileName($exportEntity);
-        $archiveFileName = $fileName . 'zip';
+        $archiveFileName = $fileName . '.zip';
         $data = $this->processorFactory->get($exportEntity->getEntityType())->execute($exportEntity->getEntityId(), []);
 
         foreach ($this->resolveExportRendererCodes() as $rendererCode) {

README.md

@@ -6,7 +6,7 @@
 [![Packagist](https://img.shields.io/packagist/dm/opengento/module-gdpr.svg?style=flat-square)](https://packagist.org/packages/opengento/module-gdpr/stats)
 [![Codacy Badge](https://img.shields.io/codacy/grade/e43739589ae249a58b4af6dfcd9c555a?style=flat-square)](https://www.codacy.com/gh/opengento/magento2-gdpr)
 
-This extension fullfill the GDPR requirements for Magento 2.
+This extension fulfill the GDPR requirements for Magento 2.
 
  - [Setup](#setup)
    - [Composer installation](#composer-installation)
@@ -42,9 +42,9 @@ bin/magento setup:upgrade
 
 ## Features
 
-Screenshots are available at: [https://opengento.fr/magento2-gdpr/features](https://opengento.fr/magento2-gdpr/features)
+**See the [screenshots](https://opengento.fr/magento2-gdpr/features) of the module's features.**
 
-Users, guest and customer can:
+### Users, guest and customer can:
 
 * **[Art. 16 GDPR](https://gdpr-info.eu/art-16-gdpr/)** Edit their personal data (native in vanilla)
 
@@ -71,7 +71,7 @@ the idle time for the users before they are erase, and the sales information lif
     Personal data export can be done in the order view, they must fill the guest form first to show their order.
 * Cookie Policy in a disclosure popup are shown at the first time customer visit.
 
-Details:
+### Details:
 
 - [x] Erasure: delete or anonymize specific data thanks to configurable settings in admin ui.
 - [x] Configure which order can be erased, regarding their state and life time.
@@ -86,17 +86,21 @@ Details:
 - [x] Notify the user when a GDPR action is performed, configure the template and sending settings.
 - [x] Display the cookie disclosure pop-in and edit its content as you want.
 
-Languages:
+### Languages:
 
-Every translations must be done here https://www.transifex.com/opengento/opengentomagento2-gdpr/
+**Open contributions to translations can be done with [transifex](https://www.transifex.com/opengento/opengentomagento2-gdpr/).**
 
-- [x] en_US ; English
+- [x] bg_BG ; Bulgarian
 - [x] de_DE ; German
+- [x] en_US ; English
 - [x] fr_FR ; French
-- [x] nl_NL ; Dutch
 - [x] it_IT ; Italian
+- [x] nl_NL ; Dutch
 - [x] pl_PL ; Polish
 - [x] th_TH ; Thai
+- [x] da_DK ; Danish
+
+*Many thanks to the translators who contributed directly here or with transifex!*
 
 ## Settings
 

etc/db_schema.xml

@@ -11,8 +11,8 @@
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" comment="Entity ID"/>
         <column xsi:type="varchar" name="entity_type" length="255" nullable="false" comment="Entity Type"/>
         <column xsi:type="timestamp" name="scheduled_at" nullable="false" comment="Scheduled At"/>
-        <column xsi:type="varchar" name="state" length="255" nullable="false" comment="State"/>
-        <column xsi:type="varchar" name="status" length="255" nullable="false" comment="Status"/>
+        <column xsi:type="varchar" name="state" length="191" nullable="false" comment="State"/>
+        <column xsi:type="varchar" name="status" length="191" nullable="false" comment="Status"/>
         <column xsi:type="text" name="message" nullable="true" comment="Message"/>
         <column xsi:type="timestamp" name="erased_at" nullable="true" comment="Erased At"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
@@ -22,17 +22,20 @@
             <column name="entity_id"/>
             <column name="entity_type"/>
         </constraint>-->
-        <index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_ID" indexType="btree">
+        <index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_IDENTITY" indexType="btree">
+            <column name="entity_type"/>
             <column name="entity_id"/>
         </index>
-        <index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE" indexType="btree">
-            <column name="entity_type"/>
+        <index referenceId="OPENGENTO_GDPR_ERASE_ENTITY_SCHEDULED_EXPORT" indexType="btree">
+            <column name="scheduled_at"/>
+            <column name="state"/>
+            <column name="status"/>
         </index>
     </table>
     <table name="opengento_gdpr_export_entity" resource="default" engine="innodb" comment="Export Entity">
         <column xsi:type="int" name="export_id" padding="11" unsigned="true" nullable="false" identity="true" comment="Export ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" comment="Entity ID"/>
-        <column xsi:type="varchar" name="entity_type" length="255" nullable="false" comment="Entity Type"/>
+        <column xsi:type="varchar" name="entity_type" length="191" nullable="false" comment="Entity Type"/>
         <column xsi:type="varchar" name="file_name" length="255" nullable="false" comment="File Name"/>
         <column xsi:type="text" name="file_path" nullable="true" comment="File Path"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
@@ -41,20 +44,24 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="export_id"/>
         </constraint>
-        <index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID" indexType="btree">
+        <index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_IDENTITY" indexType="btree">
             <column name="entity_id"/>
-        </index>
-        <index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE" indexType="btree">
             <column name="entity_type"/>
         </index>
+        <index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_EXPORTED_AT" indexType="btree">
+            <column name="exported_at"/>
+        </index>
+        <index referenceId="OPENGENTO_GDPR_EXPORT_ENTITY_EXPIRED_AT" indexType="btree">
+            <column name="expired_at"/>
+        </index>
     </table>
     <table name="opengento_gdpr_action_entity" resource="default" engine="innodb" comment="Action Entity">
         <column xsi:type="int" name="action_id" padding="11" unsigned="true" nullable="false" identity="true" comment="Export ID"/>
-        <column xsi:type="varchar" name="type" length="255" nullable="false" comment="Type"/>
+        <column xsi:type="varchar" name="type" length="191" nullable="false" comment="Type"/>
         <column xsi:type="text" name="performed_from" nullable="false" comment="Performed From"/>
         <column xsi:type="text" name="performed_by" nullable="true" comment="Performed By"/>
         <column xsi:type="timestamp" name="performed_at" nullable="false" comment="Performed At"/>
-        <column xsi:type="varchar" name="state" length="255" nullable="false" comment="State"/>
+        <column xsi:type="varchar" name="state" length="191" nullable="false" comment="State"/>
         <column xsi:type="text" name="message" nullable="false" comment="Message"/>
         <column xsi:type="text" name="parameters" nullable="false" comment="Parameters"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">

etc/db_schema_whitelist.json

@@ -12,7 +12,9 @@
         },
         "index": {
             "OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_ID": true,
-            "OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE": true
+            "OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE": true,
+            "OPENGENTO_GDPR_ERASE_ENTITY_ENTITY_TYPE_ENTITY_ID": true,
+            "OPENGENTO_GDPR_ERASE_ENTITY_SCHEDULED_AT_STATE_STATUS": true
         },
         "constraint": {
             "PRIMARY": true,
@@ -32,7 +34,10 @@
         },
         "index": {
             "OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID": true,
-            "OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE": true
+            "OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_TYPE": true,
+            "OPENGENTO_GDPR_EXPORT_ENTITY_ENTITY_ID_ENTITY_TYPE": true,
+            "OPENGENTO_GDPR_EXPORT_ENTITY_EXPORTED_AT": true,
+            "OPENGENTO_GDPR_EXPORT_ENTITY_EXPIRED_AT": true
         },
         "constraint": {
             "PRIMARY": true