1.3.4 (FINAL RELEASE)

m2epro · May 28, 2018 · 5dbbdc1 · 5dbbdc1
1 parent 45162e8
commit 5dbbdc1
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/Block/Adminhtml/Wizard/Installation/Registration/Content.php b/Block/Adminhtml/Wizard/Installation/Registration/Content.php
@@ -170,6 +170,35 @@ protected function _prepareForm()
             ]
         );
 
+        if (!$this->getData('isLicenseStepFinished')) {
+            $this->css->add(
+                <<<CSS
+#licence_agreement .admin__field {
+    padding-top: 8px;
+}
+CSS
+            );
+
+            $fieldset->addField(
+                'licence_agreement',
+                'checkbox',
+                [
+                    'field_extra_attributes' => 'id="licence_agreement"',
+                    'name' => 'licence_agreement',
+                    'class' => 'admin__control-checkbox',
+                    'style' => 'padding-top: 8px;',
+                    'label' => $this->__('Terms and Privacy'),
+                    'checked' => false,
+                    'value' => 1,
+                    'required' => true,
+                    'after_element_html' => $this->__(<<<HTML
+&nbsp; I agree to terms and <a href="https://m2epro.com/privacy-policy" target="_blank">privacy policy</a>
+HTML
+                    )
+                ]
+            );
+        }
+
         $form->setUseContainer(true);
         $this->setForm($form);
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.3.4 (r2539) (24/05/2018)
+
+* Added: Compliance with the General Data Protection Regulation (GDPR)
+
 * 1.3.3 (r2494) (20/03/2018)
 
 * Fix: 'Magento Order was not created' error even if Magento Order was actually created in some cases

diff --git a/Helper/Module.php b/Helper/Module.php
@@ -91,7 +91,7 @@ public function getName()
 
     public function getPublicVersion()
     {
-        return '1.3.3';
+        return '1.3.4';
     }
 
     public function getSetupVersion()

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "m2e/ebay-amazon-magento2",
     "description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Rakuten.com platforms.",
     "type": "magento2-module",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "license": "proprietary",
     "keywords": ["ebay", "amazon", "rakuten", "magento"],
     "homepage": "http://www.m2epro.com/",

diff --git a/versions_history.json b/versions_history.json
@@ -1,4 +1,13 @@
 {
+    "1.3.4": {
+        "versions": {
+            "setup": "1.3.3",
+            "files": "1.3.4"
+        },
+        "revisions": {
+            "svn": "2539"
+        }
+    },
     "1.3.3": {
         "versions": {
             "setup": "1.3.3",