Merge branch 'master' into magento2.1.x

opengento · Jul 31, 2018 · 387b3ac · 387b3ac
2 parents 617f6d6 + 9573482
commit 387b3ac
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/Block/Messages/PrivacyMessagePopup.php b/Block/Messages/PrivacyMessagePopup.php
@@ -7,6 +7,7 @@
 
 namespace Opengento\Gdpr\Block\Messages;
 
+use Magento\Cms\Block\Block;
 use Magento\Cms\Helper\Page as HelperPage;
 use Magento\Framework\Json\Encoder;
 use Magento\Framework\View\Element\Template;
@@ -68,7 +69,7 @@ public function getJsLayout()
         $this->jsLayout['components']['enhanced-privacy-cookie-policy']['config'] = [
             'cookieName' => self::COOKIE_NAME,
             'learnMore' => $this->helperPage->getPageUrl($this->config->getPrivacyInformationPageId()),
-            'notificationText' => $this->config->getCookieDisclosureInformationBlockId()
+            'notificationText' => $this->getCookieDisclosureInformation(),
         ];
 
         return $this->jsonEncoder->encode($this->jsLayout);
@@ -81,4 +82,23 @@ protected function _toHtml()
     {
         return $this->config->isCookieDisclosureEnabled() ? parent::_toHtml() : '';
     }
+
+    /**
+     * Retrieve the cookie disclosure information html
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getCookieDisclosureInformation(): string
+    {
+        if (!$this->hasData('cookie_disclosure_information')) {
+            $block = $this->getLayout()->createBlock(
+                Block::class,
+                ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
+            );
+            $this->setData('cookie_disclosure_information', $block);
+        }
+
+        return (string) $this->_getData('cookie_disclosure_information');
+    }
 }
diff --git a/README.md b/README.md
@@ -24,7 +24,9 @@ This extension allows customers to delete, anonymize, and export their personal
 Magento 2 Open Source or Commerce edition is required.
 
 The Version `2.x` is compliant with Magento `2.2.x`.  
-The Version `1.x` is compliant with Magento `2.0.x` and `2.1.x`.
+The Version `1.x` is compliant with Magento `2.1.x`.
+
+This module does not support Magento `2.0.x`, as this version is not anymore maintained.  
 
 ### Get the package
 

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -43,6 +43,7 @@ Anonymization,Anonymization
 "We will delete the customer if he has no orders.","We will delete the customer if he has no orders."
 "Apply Deletion Strategy","Apply Deletion Strategy"
 "This processors list allows to configure specific erasure strategy by component.","This processors list allows to configure specific erasure strategy by component."
+"Privacy Settings","Privacy Settings"
 "Export Settings","Export Settings"
 Export,Export
 Renderer,Renderer

diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
@@ -43,6 +43,7 @@ Anonymization,Anonymisation
 "We will delete the customer if he has no orders.","Nous allons supprimer le client si il n'a pas de commandes"
 "Apply Deletion Strategy","Appliquer la stratégie de suppression"
 "This processors list allows to configure specific erasure strategy by component.","This processors list allows to configure specific erasure strategy by component."
+"Privacy Settings","Paramètres de confidentialité"
 "Export Settings","Exporter les paramètres"
 Export,Exporter
 Renderer,Renderer

diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="after.body.start">
+        <referenceContainer name="before.body.end">
             <block class="Opengento\Gdpr\Block\Messages\PrivacyMessagePopup" name="privacy_message_popup" after="-" ifconfig="gdpr/general/enabled">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">