Fix settings scope + notifications

Author: thomas-kl1

Block/Adminhtml/Order/Edit/EraseButton.php

@@ -8,46 +8,62 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Guest;
 
 use Exception;
-use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Phrase;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Opengento\Gdpr\Api\EraseEntityManagementInterface;
 use Opengento\Gdpr\Api\EraseEntityRepositoryInterface;
-use Opengento\Gdpr\Controller\Adminhtml\AbstractAction;
 use Opengento\Gdpr\Model\Config;
 
-class Erase extends AbstractAction implements HttpPostActionInterface
+class Erase implements HttpPostActionInterface
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::order_erase';
 
     public function __construct(
-        Context $context,
-        Config $config,
+        private RequestInterface $request,
+        private ManagerInterface $messageManager,
+        private StoreManagerInterface $storeManager,
+        private OrderRepositoryInterface $orderRepository,
         private EraseEntityManagementInterface $eraseEntityManagement,
         private EraseEntityRepositoryInterface $eraseEntityRepository,
-    ) {
-        parent::__construct($context, $config);
-    }
+        private Config $config,
+        private RedirectFactory $redirectFactory,
+    ) {}
 
-    protected function executeAction()
+    public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $this->eraseEntityManagement->process(
-                $this->eraseEntityRepository->getByEntity((int)$this->getRequest()->getParam('id'), 'order')
-            );
-            $this->messageManager->addSuccessMessage(new Phrase('You erased the order.'));
+            $orderId = (int)$this->request->getParam('id');
+            if ($this->isOrderErasureEnabled($orderId)) {
+                $this->eraseEntityManagement->process(
+                    $this->eraseEntityRepository->getByEntity($orderId, 'order')
+                );
+                $this->messageManager->addSuccessMessage(new Phrase('You erased the order.'));
+            }
         } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (Exception $e) {
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        /** @var Redirect $resultRedirect */
-        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        return $this->redirectFactory->create()->setPath('sales/order/index');
+    }
 
-        return $resultRedirect->setPath('sales/order/index');
+    /**
+     * @throws NoSuchEntityException
+     */
+    private function isOrderErasureEnabled(int $orderId): bool
+    {
+        return $this->config->isErasureEnabled(
+            $this->storeManager->getStore($this->orderRepository->get($orderId)->getStoreId())->getWebsiteId()
+        );
     }
 }

Block/Adminhtml/Order/Edit/ExportButton.php

@@ -8,58 +8,73 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Guest;
 
 use Exception;
-use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Phrase;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Opengento\Gdpr\Api\ExportEntityManagementInterface;
 use Opengento\Gdpr\Api\ExportEntityRepositoryInterface;
-use Opengento\Gdpr\Controller\Adminhtml\AbstractAction;
 use Opengento\Gdpr\Model\Config;
 
-class Export extends AbstractAction
+class Export implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::order_export';
 
     public function __construct(
-        Context $context,
-        Config $config,
+        private RequestInterface $request,
+        private ManagerInterface $messageManager,
+        private StoreManagerInterface $storeManager,
+        private OrderRepositoryInterface $orderRepository,
         private ExportEntityManagementInterface $exportEntityManagement,
         private ExportEntityRepositoryInterface $exportEntityRepository,
+        private Config $config,
+        private RedirectFactory $redirectFactory,
         private FileFactory $fileFactory
-    ) {
-        parent::__construct($context, $config);
-    }
+    ) {}
 
-    protected function executeAction(): ResultInterface|ResponseInterface
+    public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $exportEntity = $this->exportEntityManagement->export(
-                $this->exportEntityRepository->getByEntity((int)$this->getRequest()->getParam('id'), 'order')
-            );
+            $orderId = (int)$this->request->getParam('id');
+            if ($this->isOrderExportEnabled($orderId)) {
+                $exportEntity = $this->exportEntityManagement->export(
+                    $this->exportEntityRepository->getByEntity($orderId, 'order')
+                );
 
-            return $this->fileFactory->create(
-                'guest_privacy_data_' . $exportEntity->getEntityId() . '.zip',
-                [
-                    'type' => 'filename',
-                    'value' => $exportEntity->getFilePath(),
-                ],
-                DirectoryList::TMP
-            );
+                return $this->fileFactory->create(
+                    'guest_privacy_data_' . $exportEntity->getEntityId() . '.zip',
+                    [
+                        'type' => 'filename',
+                        'value' => $exportEntity->getFilePath(),
+                    ],
+                    DirectoryList::TMP
+                );
+            }
         } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (Exception $e) {
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        /** @var Redirect $resultRedirect */
-        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        return $this->redirectFactory->create()->setRefererOrBaseUrl();
+    }
 
-        return $resultRedirect->setRefererOrBaseUrl();
+    /**
+     * @throws NoSuchEntityException
+     */
+    private function isOrderExportEnabled(int $orderId): bool
+    {
+        return $this->config->isErasureEnabled(
+            $this->storeManager->getStore($this->orderRepository->get($orderId)->getStoreId())->getWebsiteId()
+        );
     }
 }