Merge branch 'master' into magento2.1.x

opengento · Jul 31, 2018 · c505bbd · c505bbd
2 parents 1398cd1 + d8934eb
commit c505bbd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/Model/EraseCustomerRepository.php b/Model/EraseCustomerRepository.php
@@ -173,7 +173,7 @@ public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsI
         $collection->setPageSize($searchCriteria->getPageSize());
 
         $searchResults->setItems($collection->getItems());
-        $searchResults->setTotalCount($collection->count());
+        $searchResults->setTotalCount($collection->getSize());
 
         return $searchResults;
     }

diff --git a/etc/adminhtml/system/cookie.xml b/etc/adminhtml/system/cookie.xml
@@ -9,7 +9,7 @@
     <group id="cookie" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Cookie Settings</label>
         <depends>
-            <field id="gdpr/general/enabled">1</field>
+            <field id="customer/gdpr/general/enabled">1</field>
         </depends>
         <field id="enabled" type="select" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Cookie Disclosure</label>
@@ -20,7 +20,7 @@
             <label>Information</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\Block</source_model>
             <depends>
-                <field id="*/*/cookie/enabled">1</field>
+                <field id="customer/gdpr/cookie/enabled">1</field>
             </depends>
             <config_path>gdpr/cookie/block_id</config_path>
         </field>

diff --git a/etc/adminhtml/system/erasure.xml b/etc/adminhtml/system/erasure.xml
@@ -9,7 +9,7 @@
     <group id="erasure" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Right To Erasure</label>
         <depends>
-            <field id="gdpr/general/enabled">1</field>
+            <field id="customer/gdpr/general/enabled">1</field>
         </depends>
         <field id="enabled" type="select" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Erasure</label>
@@ -20,7 +20,7 @@
             <label>Default Erasure Strategy</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\EraseStrategy</source_model>
             <depends>
-                <field id="gdpr/erasure/enabled">1</field>
+                <field id="customer/gdpr/erasure/enabled">1</field>
             </depends>
             <config_path>gdpr/erasure/strategy</config_path>
         </field>
@@ -29,30 +29,30 @@
             <comment>Erasure time lapse in seconds before the execution</comment>
             <frontend_class>validate-number</frontend_class>
             <depends>
-                <field id="gdpr/erasure/enabled">1</field>
+                <field id="customer/gdpr/erasure/enabled">1</field>
             </depends>
             <config_path>gdpr/erasure/time_lapse</config_path>
         </field>
         <field id="schedule" type="text" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Cron Schedule</label>
             <depends>
-                <field id="gdpr/erasure/enabled">1</field>
+                <field id="customer/gdpr/erasure/enabled">1</field>
             </depends>
             <config_path>gdpr/erasure/schedule</config_path>
         </field>
         <field id="block_id" type="select" translate="label" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Information</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\Block</source_model>
             <depends>
-                <field id="gdpr/erasure/enabled">1</field>
+                <field id="customer/gdpr/erasure/enabled">1</field>
             </depends>
             <config_path>gdpr/erasure/block_id</config_path>
         </field>
         <group id="anonymize" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Anonymization</label>
             <depends>
-                <field id="gdpr/erasure/enabled">1</field>
-                <field id="gdpr/erasure/strategy">anonymize</field>
+                <field id="customer/gdpr/erasure/enabled">1</field>
+                <field id="customer/gdpr/erasure/strategy">anonymize</field>
             </depends>
             <field id="block_id" type="select" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Information</label>

diff --git a/etc/adminhtml/system/export.xml b/etc/adminhtml/system/export.xml
@@ -9,7 +9,7 @@
     <group id="export" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Export Settings</label>
         <depends>
-            <field id="gdpr/general/enabled">1</field>
+            <field id="customer/gdpr/general/enabled">1</field>
         </depends>
         <field id="enabled" type="select" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Export</label>
@@ -20,15 +20,15 @@
             <label>Information</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\Block</source_model>
             <depends>
-                <field id="gdpr/export/enabled">1</field>
+                <field id="customer/gdpr/export/enabled">1</field>
             </depends>
             <config_path>gdpr/export/block_id</config_path>
         </field>
         <field id="renderer" type="select" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Renderer</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\ExportRenderer</source_model>
             <depends>
-                <field id="gdpr/export/enabled">1</field>
+                <field id="customer/gdpr/export/enabled">1</field>
             </depends>
             <config_path>gdpr/export/renderer</config_path>
         </field>
@@ -38,7 +38,7 @@
             <source_model>Opengento\Gdpr\Model\Config\Source\CustomerAttributes</source_model>
             <can_be_empty>1</can_be_empty>
             <depends>
-                <field id="gdpr/export/enabled">1</field>
+                <field id="customer/gdpr/export/enabled">1</field>
             </depends>
             <config_path>gdpr/export/customer_attributes</config_path>
         </field>
@@ -48,7 +48,7 @@
             <source_model>Opengento\Gdpr\Model\Config\Source\CustomerAddressAttributes</source_model>
             <can_be_empty>1</can_be_empty>
             <depends>
-                <field id="gdpr/export/enabled">1</field>
+                <field id="customer/gdpr/export/enabled">1</field>
             </depends>
             <config_path>gdpr/export/customer_address_attributes</config_path>
         </field>

diff --git a/etc/adminhtml/system/general.xml b/etc/adminhtml/system/general.xml
@@ -18,15 +18,15 @@
             <comment>This page should store information about privacy and GDPR policy.</comment>
             <source_model>Magento\Cms\Model\Config\Source\Page</source_model>
             <depends>
-                <field id="gdpr/general/enabled">1</field>
+                <field id="customer/gdpr/general/enabled">1</field>
             </depends>
             <config_path>gdpr/general/page_id</config_path>
         </field>
         <field id="information" type="select" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Information</label>
             <source_model>Opengento\Gdpr\Model\Config\Source\Block</source_model>
             <depends>
-                <field id="gdpr/general/enabled">1</field>
+                <field id="customer/gdpr/general/enabled">1</field>
             </depends>
             <config_path>gdpr/general/block_id</config_path>
         </field>