#145 - Fix Column 'state' in where clause is ambiguous

opengento · Aug 24, 2024 · 3b42fee · 3b42fee
1 parent d2eed19
commit 3b42fee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Model/Customer/CustomerChecker.php b/Model/Customer/CustomerChecker.php
@@ -8,6 +8,8 @@
 namespace Opengento\Gdpr\Model\Customer;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Opengento\Gdpr\Model\Config\Entity\Erasure as ErasureConfig;
@@ -21,6 +23,10 @@ public function __construct(
         private ErasureConfig $erasureConfig
     ) {}
 
+    /**
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
     public function canErase(int $entityId): bool
     {
         $customer = $this->customerRepository->getById($entityId);

diff --git a/Model/Order/SourceProvider/GuestFilterModifier.php b/Model/Order/SourceProvider/GuestFilterModifier.php
@@ -22,7 +22,7 @@ public function apply(AbstractDb $collection, WebsiteInterface $website): void
         $collection->addFieldToFilter(OrderInterface::CUSTOMER_ID, ['null' => true]);
         $collection->addFieldToFilter(OrderInterface::CUSTOMER_IS_GUEST, ['eq' => 1]);
         $collection->addFieldToFilter(
-            OrderInterface::STATE,
+            'main_table.' . OrderInterface::STATE,
             ['in' => $this->erasureConfig->getAllowedStatesToErase($website->getId())]
         );
     }