From 31bca48cacda1297bef910d5fb672753657f8666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kobierzy=C5=84ski?=
 <michal.kobierzynski@gmail.com>
Date: Thu, 5 Jun 2025 10:37:21 +0200
Subject: [PATCH] [ISSUE#153] Order states mixed with order statuses bugfix

---
 Model/Config.php                                          | 6 +++---
 .../{OrderPendingStates.php => OrderPendingStatuses.php}  | 2 +-
 Model/Customer/CustomerChecker.php                        | 2 +-
 Model/Order/OrderChecker.php                              | 2 +-
 Model/Order/SourceProvider/GuestFilterModifier.php        | 2 +-
 etc/adminhtml/system/erasure.xml                          | 8 ++++----
 etc/config.xml                                            | 2 +-
 i18n/bg_BG.csv                                            | 2 +-
 i18n/da_DK.csv                                            | 2 +-
 i18n/de_DE.csv                                            | 2 +-
 i18n/en_US.csv                                            | 2 +-
 i18n/fr_FR.csv                                            | 2 +-
 i18n/it_IT.csv                                            | 2 +-
 i18n/nl_NL.csv                                            | 2 +-
 i18n/pl_PL.csv                                            | 2 +-
 i18n/th_TH.csv                                            | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)
 rename Model/Config/Source/{OrderPendingStates.php => OrderPendingStatuses.php} (91%)

diff --git a/Model/Config.php b/Model/Config.php
index e8471aaa..3a5fa91e 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -18,7 +18,7 @@ final class Config
      */
     public const CONFIG_PATH_GENERAL_ENABLED = 'gdpr/general/enabled';
     public const CONFIG_PATH_ERASURE_ENABLED = 'gdpr/erasure/enabled';
-    public const CONFIG_PATH_ERASURE_ALLOWED_STATES = 'gdpr/erasure/allowed_states';
+    public const CONFIG_PATH_ERASURE_ALLOWED_STATUSES = 'gdpr/erasure/allowed_statuses';
     public const CONFIG_PATH_EXPORT_ENABLED = 'gdpr/export/enabled';
 
     private ScopeConfigInterface $scopeConfig;
@@ -48,10 +48,10 @@ public function isErasureEnabled(): bool
     /**
      * @return string[]
      */
-    public function getAllowedStatesToErase(): array
+    public function getAllowedStatusesToErase(): array
     {
         return explode(',', (string) $this->scopeConfig->getValue(
-            self::CONFIG_PATH_ERASURE_ALLOWED_STATES,
+            self::CONFIG_PATH_ERASURE_ALLOWED_STATUSES,
             ScopeInterface::SCOPE_STORE
         ));
     }
diff --git a/Model/Config/Source/OrderPendingStates.php b/Model/Config/Source/OrderPendingStatuses.php
similarity index 91%
rename from Model/Config/Source/OrderPendingStates.php
rename to Model/Config/Source/OrderPendingStatuses.php
index 00bc834e..cf4d1c7a 100644
--- a/Model/Config/Source/OrderPendingStates.php
+++ b/Model/Config/Source/OrderPendingStatuses.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
 
-final class OrderPendingStates implements OptionSourceInterface
+final class OrderPendingStatuses implements OptionSourceInterface
 {
     private CollectionFactory $collectionFactory;
 
diff --git a/Model/Customer/CustomerChecker.php b/Model/Customer/CustomerChecker.php
index b2894c75..92741b5a 100644
--- a/Model/Customer/CustomerChecker.php
+++ b/Model/Customer/CustomerChecker.php
@@ -40,7 +40,7 @@ public function __construct(
     public function canErase(int $customerId): bool
     {
         if (!isset($this->cache[$customerId])) {
-            $this->criteriaBuilder->addFilter(OrderInterface::STATE, $this->config->getAllowedStatesToErase(), 'nin');
+            $this->criteriaBuilder->addFilter(OrderInterface::STATUS, $this->config->getAllowedStatusesToErase(), 'nin');
             $this->criteriaBuilder->addFilter(OrderInterface::CUSTOMER_ID, $customerId);
             $orderList = $this->orderRepository->getList($this->criteriaBuilder->create());
 
diff --git a/Model/Order/OrderChecker.php b/Model/Order/OrderChecker.php
index f021bae6..db4226d1 100644
--- a/Model/Order/OrderChecker.php
+++ b/Model/Order/OrderChecker.php
@@ -30,6 +30,6 @@ public function canErase(int $orderId): bool
     {
         $order = $this->orderRepository->get($orderId);
 
-        return in_array($order->getState(), $this->config->getAllowedStatesToErase(), true);
+        return in_array($order->getStatus(), $this->config->getAllowedStatusesToErase(), true);
     }
 }
diff --git a/Model/Order/SourceProvider/GuestFilterModifier.php b/Model/Order/SourceProvider/GuestFilterModifier.php
index 43ddbe75..7a1a6e75 100644
--- a/Model/Order/SourceProvider/GuestFilterModifier.php
+++ b/Model/Order/SourceProvider/GuestFilterModifier.php
@@ -31,6 +31,6 @@ public function apply(Collection $collection, Filter $filter): void
     {
         $collection->addFieldToFilter(OrderInterface::CUSTOMER_ID, ['null' => true]);
         $collection->addFieldToFilter(OrderInterface::CUSTOMER_IS_GUEST, ['eq' => 1]);
-        $collection->addFieldToFilter(OrderInterface::STATE, ['in' => $this->config->getAllowedStatesToErase()]);
+        $collection->addFieldToFilter(OrderInterface::STATUS, ['in' => $this->config->getAllowedStatusesToErase()]);
     }
 }
diff --git a/etc/adminhtml/system/erasure.xml b/etc/adminhtml/system/erasure.xml
index e586a386..0135e7a4 100644
--- a/etc/adminhtml/system/erasure.xml
+++ b/etc/adminhtml/system/erasure.xml
@@ -68,14 +68,14 @@
                 </depends>
                 <config_path>gdpr/erasure/sales_max_age</config_path>
             </field>
-            <field id="allowed_states" type="multiselect" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80" canRestore="1">
-                <label>Allowed Order States to Erase</label>
-                <source_model>Opengento\Gdpr\Model\Config\Source\OrderPendingStates</source_model>
+            <field id="allowed_statuses" type="multiselect" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80" canRestore="1">
+                <label>Allowed Order Statuses to Erase</label>
+                <source_model>Opengento\Gdpr\Model\Config\Source\OrderPendingStatuses</source_model>
                 <depends>
                     <field id="opengento_gdpr_erasure/erasure/enabled">1</field>
                 </depends>
                 <can_be_empty>0</can_be_empty>
-                <config_path>gdpr/erasure/allowed_states</config_path>
+                <config_path>gdpr/erasure/allowed_statuses</config_path>
             </field>
             <field id="customer_components_processors" type="text" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90" canRestore="1">
                 <label>Customer Component Erasure Strategy</label>
diff --git a/etc/config.xml b/etc/config.xml
index b03705ce..829845e5 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -126,7 +126,7 @@
                 <entity_max_age>1095</entity_max_age>
                 <entity_max_age_schedule>0 1 * * *</entity_max_age_schedule>
                 <sales_max_age>3650</sales_max_age>
-                <allowed_states>canceled,closed,complete</allowed_states>
+                <allowed_statuses>canceled,closed,complete</allowed_statuses>
                 <remove_customer>1</remove_customer>
                 <customer_components_processors>
                     <![CDATA[{
diff --git a/i18n/bg_BG.csv b/i18n/bg_BG.csv
index adbc8434..6c0a0443 100644
--- a/i18n/bg_BG.csv
+++ b/i18n/bg_BG.csv
@@ -103,7 +103,7 @@
 "The time is in days.","The time is in days."
 "Erase Old Entities Cron Schedule","Erase Old Entities Cron Schedule"
 "Sales Information Lifetime","Sales Information Lifetime"
-"Allowed Order States to Erase","Allowed Order States to Erase"
+"Allowed Order Statuses to Erase","Allowed Order Statuses to Erase"
 "Customer Component Erasure Strategy","Customer Component Erasure Strategy"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Defines the components erasure strategy with the component/erase processor mapper for the customers."
 "Guest Component Erasure Strategy","Guest Component Erasure Strategy"
diff --git a/i18n/da_DK.csv b/i18n/da_DK.csv
index b74329c6..c207993c 100644
--- a/i18n/da_DK.csv
+++ b/i18n/da_DK.csv
@@ -106,7 +106,7 @@
 "The time is in days.","Tiden er i dage."
 "Erase Old Entities Cron Schedule","Slet gamle gnheder cron tidsplan"
 "Sales Information Lifetime","Salgsinformation Levetid"
-"Allowed Order States to Erase","Tilladte Ordretilstande til Sletning"
+"Allowed Order Statuses to Erase","Tilladte Ordretilstande til Sletning"
 "Customer Component Erasure Strategy","Kunde Komponent Slette Strategi"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Definerer komponentens slettestrategi med komponent/slette processor for kunderne."
 "Guest Component Erasure Strategy","Gæst Komponent Slette Strategi"
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index a44e710a..bb04a0da 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -103,7 +103,7 @@
 "The time is in days.","Die Zeit wird in Tagen angegeben."
 "Erase Old Entities Cron Schedule","Alte Entitäten löschen Cron-Zeitplan"
 "Sales Information Lifetime","Lebensdauer der Verkaufsinformationen"
-"Allowed Order States to Erase","Erlaubte Bestellstatus zu löschen"
+"Allowed Order Statuses to Erase","Erlaubte Bestellstatus zu löschen"
 "Customer Component Erasure Strategy","Strategie zum Löschen von Kundenkomponenten"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Definiert die Komponentenlöschstrategie mit dem Komponenten-/Löschprozessor-Mapper für die Kunden."
 "Guest Component Erasure Strategy","Löschstrategie für die Gast-Komponente"
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index d6d23bd1..36713e72 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -106,7 +106,7 @@ Erasure,Erasure
 "The time is in days.","The time is in days."
 "Erase Old Entities Cron Schedule","Erase Old Entities Cron Schedule"
 "Sales Information Lifetime","Sales Information Lifetime"
-"Allowed Order States to Erase","Allowed Order States to Erase"
+"Allowed Order Statuses to Erase","Allowed Order Statuses to Erase"
 "Customer Component Erasure Strategy","Customer Component Erasure Strategy"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Defines the components erasure strategy with the component/erase processor mapper for the customers."
 "Guest Component Erasure Strategy","Guest Component Erasure Strategy"
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index 20b7a33b..b7b8669b 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -106,7 +106,7 @@
 "The time is in days.","La durée est en jours."
 "Erase Old Entities Cron Schedule","Planification du CRON pour l'effacement des vielles entités"
 "Sales Information Lifetime","Durée de vie des information de ventes"
-"Allowed Order States to Erase","État de commande autorisé pour le droit à l'oubli"
+"Allowed Order Statuses to Erase","État de commande autorisé pour le droit à l'oubli"
 "Customer Component Erasure Strategy","Stratégie d'effacement des entités pour les clients connectés"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Défini la stratégie d'effacement des composants à partir d'un mappage composant/processeur d'oubli pour les clients connectés."
 "Guest Component Erasure Strategy","Stratégie d'effacement pour les invités"
diff --git a/i18n/it_IT.csv b/i18n/it_IT.csv
index 5fea2efc..0aad591b 100644
--- a/i18n/it_IT.csv
+++ b/i18n/it_IT.csv
@@ -103,7 +103,7 @@
 "The time is in days.","Il tempo è in giorni."
 "Erase Old Entities Cron Schedule","Cron Schedule eliminazione vecchie entities"
 "Sales Information Lifetime","Durata informazioni vendite"
-"Allowed Order States to Erase","Stati Ordini permessi per l'eliminazione"
+"Allowed Order Statuses to Erase","Stati Ordini permessi per l'eliminazione"
 "Customer Component Erasure Strategy","Strategia eliminazione  Componenti Clienti"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Definisci la strategia di eliminazione dei componenti per i clienti."
 "Guest Component Erasure Strategy","Strategia eliminazione componenti guest"
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index f19f13c6..78d82ba4 100644
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -106,7 +106,7 @@
 "The time is in days.","De tijd is in dagen."
 "Erase Old Entities Cron Schedule","Verwijderen Van Oude Entiteiten (Geplande Taken)"
 "Sales Information Lifetime","Leeftijd van informatie over verkopen"
-"Allowed Order States to Erase","Toegestane statussen van bestelling om te verwijderen"
+"Allowed Order Statuses to Erase","Toegestane statussen van bestelling om te verwijderen"
 "Customer Component Erasure Strategy","Klant Component Verwijder Strategie"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Definieert de verwijder strategie van het component/verwijder processor koppeling voor de klanten"
 "Guest Component Erasure Strategy","Gast Component Verwijder Strategie"
diff --git a/i18n/pl_PL.csv b/i18n/pl_PL.csv
index 5575eea8..0f5350f3 100644
--- a/i18n/pl_PL.csv
+++ b/i18n/pl_PL.csv
@@ -106,7 +106,7 @@
 "The time is in days.","Czas w dniach."
 "Erase Old Entities Cron Schedule","Harmonogram CRON usuwania starych obiektów"
 "Sales Information Lifetime","Czas istnienia informacji sprzedażowch"
-"Allowed Order States to Erase","Statusy Zamówień możliwe do usunięcia"
+"Allowed Order Statuses to Erase","Statusy Zamówień możliwe do usunięcia"
 "Customer Component Erasure Strategy","Strategia czyszczenia komponentu Klienta"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","Defines the components erasure strategy with the component/erase processor mapper for the customers."
 "Guest Component Erasure Strategy","Strategia czyszczenia komponentu Gościa"
diff --git a/i18n/th_TH.csv b/i18n/th_TH.csv
index b8fb27f6..8f97475f 100644
--- a/i18n/th_TH.csv
+++ b/i18n/th_TH.csv
@@ -106,7 +106,7 @@
 "The time is in days.","เวลาเป็นวัน"
 "Erase Old Entities Cron Schedule","ลบกำหนดการ Cron ของข้อมุลเก่า"
 "Sales Information Lifetime","อายุข้อมูลการขาย"
-"Allowed Order States to Erase","อนุญาตให้ลบข้อมูลสั่งซื้อ"
+"Allowed Order Statuses to Erase","อนุญาตให้ลบข้อมูลสั่งซื้อ"
 "Customer Component Erasure Strategy","คอมโพเน้นท์เงื่อนไขการลบข้อมูลลูกค้า"
 "Defines the components erasure strategy with the component/erase processor mapper for the customers.","กำหนดกลยุทธ์การลบด้วยคอมโพเนนท์/ตัวประมวลผลข้อมูลสำหรับลูกค้า"
 "Guest Component Erasure Strategy","คอมโพเน้นท์เงื่อนไขการลบข้อมูล Guest"