Remove deprecated code

thomas-kl1 · thomas-kl1 · commit 02c211bca90c · 2024-08-26T22:44:35.000+02:00
diff --git a/Model/Erase/EraseSalesInformation.php b/Model/Erase/EraseSalesInformation.php
@@ -13,7 +13,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Store\Model\ScopeInterface;
 use Opengento\Gdpr\Api\Data\EraseEntityInterface;
 use Opengento\Gdpr\Api\Data\EraseEntityInterfaceFactory;
 use Opengento\Gdpr\Api\EraseEntityRepositoryInterface;
@@ -30,7 +29,6 @@ public function __construct(
     ) {}
 
     /**
-     * @inheritdoc
      * @throws CouldNotSaveException
      */
     public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeInterface $lastActive): EraseEntityInterface
@@ -52,7 +50,6 @@ public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeI
     }
 
     /**
-     * @inheritdoc
      * @throws Exception
      */
     public function isAlive(DateTimeInterface $lastActive): bool
@@ -62,6 +59,6 @@ public function isAlive(DateTimeInterface $lastActive): bool
 
     private function resolveErasureSalesMaxAge(): int
     {
-        return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE, ScopeInterface::SCOPE_STORE);//Todo scope website
+        return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE);
     }
 }
diff --git a/etc/adminhtml/system/erasure.xml b/etc/adminhtml/system/erasure.xml
@@ -59,7 +59,7 @@
                 </depends>
                 <config_path>gdpr/erasure/entity_max_age_schedule</config_path>
             </field>
-            <field id="sales_max_age" type="text" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="70" canRestore="1">
+            <field id="sales_max_age" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="70" canRestore="1">
                 <label>Sales Information Lifetime</label>
                 <comment>The time is in days.</comment>
                 <validate>validate-number validate-number-range number-range-0-3650</validate>
diff --git a/view/frontend/templates/account/erase.phtml b/view/frontend/templates/account/erase.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var SettingsDataProvider $settingsDataProvider */
 $settingsDataProvider = $block->getData('settingsDataProvider');
 ?>
diff --git a/view/frontend/templates/account/privacy/erase.phtml b/view/frontend/templates/account/privacy/erase.phtml
@@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var EraseDataProvider $eraseDataProvider */
 $eraseDataProvider = $block->getData('eraseDataProvider');
 /** @var EraseCustomerDataProvider $eraseCustomerDataProvider */
diff --git a/view/frontend/templates/account/privacy/export.phtml b/view/frontend/templates/account/privacy/export.phtml
@@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var ExportDataProvider $exportDataProvider */
 $exportDataProvider = $block->getData('exportDataProvider');
 /** @var ExportCustomerDataProvider $exportCustomerDataProvider */
diff --git a/view/frontend/templates/account/settings.phtml b/view/frontend/templates/account/settings.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var SettingsDataProvider $settingsDataProvider */
 $settingsDataProvider = $block->getData('settingsDataProvider');
 ?>
diff --git a/view/frontend/templates/order/info/buttons/download.phtml b/view/frontend/templates/order/info/buttons/download.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var ExportDataProvider $exportDataProvider */
 $exportDataProvider = $block->getData('exportDataProvider');
 ?>
diff --git a/view/frontend/templates/order/info/buttons/erase.phtml b/view/frontend/templates/order/info/buttons/erase.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\EraseDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var EraseDataProvider $eraseDataProvider */
 $eraseDataProvider = $block->getData('eraseDataProvider');
 ?>
diff --git a/view/frontend/templates/order/info/buttons/export.phtml b/view/frontend/templates/order/info/buttons/export.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var ExportDataProvider $exportDataProvider */
 $exportDataProvider = $block->getData('exportDataProvider');
 ?>
diff --git a/view/frontend/templates/order/info/erase.phtml b/view/frontend/templates/order/info/erase.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var EraseDataProvider $eraseDataProvider */
 $eraseDataProvider = $block->getData('eraseDataProvider');
 ?>
diff --git a/view/frontend/templates/order/info/export.phtml b/view/frontend/templates/order/info/export.phtml
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
-$escaper = $escaper ?? $block;
-
 /** @var ExportDataProvider $exportDataProvider */
 $exportDataProvider = $block->getData('exportDataProvider');
 ?>
