Skip to content

Commit 02c211b

Browse files
committed
Remove deprecated code
1 parent 9ec6596 commit 02c211b

File tree

11 files changed

+2
-23
lines changed

11 files changed

+2
-23
lines changed

Model/Erase/EraseSalesInformation.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Magento\Framework\App\Config\ScopeConfigInterface;
1414
use Magento\Framework\Exception\CouldNotSaveException;
1515
use Magento\Framework\Stdlib\DateTime;
16-
use Magento\Store\Model\ScopeInterface;
1716
use Opengento\Gdpr\Api\Data\EraseEntityInterface;
1817
use Opengento\Gdpr\Api\Data\EraseEntityInterfaceFactory;
1918
use Opengento\Gdpr\Api\EraseEntityRepositoryInterface;
@@ -30,7 +29,6 @@ public function __construct(
3029
) {}
3130

3231
/**
33-
* @inheritdoc
3432
* @throws CouldNotSaveException
3533
*/
3634
public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeInterface $lastActive): EraseEntityInterface
@@ -52,7 +50,6 @@ public function scheduleEraseEntity(int $entityId, string $entityType, DateTimeI
5250
}
5351

5452
/**
55-
* @inheritdoc
5653
* @throws Exception
5754
*/
5855
public function isAlive(DateTimeInterface $lastActive): bool
@@ -62,6 +59,6 @@ public function isAlive(DateTimeInterface $lastActive): bool
6259

6360
private function resolveErasureSalesMaxAge(): int
6461
{
65-
return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE, ScopeInterface::SCOPE_STORE);//Todo scope website
62+
return (int)$this->scopeConfig->getValue(self::CONFIG_PATH_ERASURE_SALES_MAX_AGE);
6663
}
6764
}

etc/adminhtml/system/erasure.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</depends>
6060
<config_path>gdpr/erasure/entity_max_age_schedule</config_path>
6161
</field>
62-
<field id="sales_max_age" type="text" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="70" canRestore="1">
62+
<field id="sales_max_age" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="70" canRestore="1">
6363
<label>Sales Information Lifetime</label>
6464
<comment>The time is in days.</comment>
6565
<validate>validate-number validate-number-range number-range-0-3650</validate>

view/frontend/templates/account/erase.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var SettingsDataProvider $settingsDataProvider */
1715
$settingsDataProvider = $block->getData('settingsDataProvider');
1816
?>

view/frontend/templates/account/privacy/erase.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider;
1212

1313
/** @var Template $block */
1414
/** @var Escaper $escaper */
15-
$escaper = $escaper ?? $block;
16-
1715
/** @var EraseDataProvider $eraseDataProvider */
1816
$eraseDataProvider = $block->getData('eraseDataProvider');
1917
/** @var EraseCustomerDataProvider $eraseCustomerDataProvider */

view/frontend/templates/account/privacy/export.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider;
1212

1313
/** @var Template $block */
1414
/** @var Escaper $escaper */
15-
$escaper = $escaper ?? $block;
16-
1715
/** @var ExportDataProvider $exportDataProvider */
1816
$exportDataProvider = $block->getData('exportDataProvider');
1917
/** @var ExportCustomerDataProvider $exportCustomerDataProvider */

view/frontend/templates/account/settings.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\SettingsDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var SettingsDataProvider $settingsDataProvider */
1715
$settingsDataProvider = $block->getData('settingsDataProvider');
1816
?>

view/frontend/templates/order/info/buttons/download.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var ExportDataProvider $exportDataProvider */
1715
$exportDataProvider = $block->getData('exportDataProvider');
1816
?>

view/frontend/templates/order/info/buttons/erase.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\EraseDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var EraseDataProvider $eraseDataProvider */
1715
$eraseDataProvider = $block->getData('eraseDataProvider');
1816
?>

view/frontend/templates/order/info/buttons/export.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Guest\ExportDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var ExportDataProvider $exportDataProvider */
1715
$exportDataProvider = $block->getData('exportDataProvider');
1816
?>

view/frontend/templates/order/info/erase.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\EraseDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var EraseDataProvider $eraseDataProvider */
1715
$eraseDataProvider = $block->getData('eraseDataProvider');
1816
?>

view/frontend/templates/order/info/export.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use Opengento\Gdpr\ViewModel\Customer\Privacy\ExportDataProvider;
1111

1212
/** @var Template $block */
1313
/** @var Escaper $escaper */
14-
$escaper = $escaper ?? $block;
15-
1614
/** @var ExportDataProvider $exportDataProvider */
1715
$exportDataProvider = $block->getData('exportDataProvider');
1816
?>

0 commit comments

Comments
 (0)