ACP2E-1155: Refunding Issue Rest API

Author: Anna Bukatar

app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php

@@ -12,6 +12,7 @@
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\ValidatorInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 
 class CanRefund implements ValidatorInterface
@@ -27,23 +28,25 @@ class CanRefund implements ValidatorInterface
     private $orderRepository;
 
     /**
-     * @var ObjectManager
+     * @var ScopeConfigInterface
      */
-    private $objectManager;
+    private $scopeConfig;
 
     /**
      * CanRefund constructor.
      *
      * @param OrderPaymentRepositoryInterface $paymentRepository
      * @param OrderRepositoryInterface $orderRepository
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         OrderPaymentRepositoryInterface $paymentRepository,
-        OrderRepositoryInterface $orderRepository
+        OrderRepositoryInterface $orderRepository,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
-        $this->objectManager = ObjectManager::getInstance();
         $this->paymentRepository = $paymentRepository;
         $this->orderRepository = $orderRepository;
+        $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -89,7 +92,7 @@ private function isPaymentAllowRefund(InvoiceInterface $invoice)
      */
     private function isGrandTotalEnoughToRefund(InvoiceInterface $entity)
     {
-        $isAllowedZeroGrandTotal = $this->objectManager->get(ScopeConfigInterface::class)->getValue(
+        $isAllowedZeroGrandTotal = $this->scopeConfig->getValue(
             'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );

app/code/Magento/Sales/Model/Order/Validation/CanRefund.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Validation;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\OrderInterface;
@@ -19,20 +20,22 @@ class CanRefund implements ValidatorInterface
     private $priceCurrency;
 
     /**
-     * @var ObjectManager
+     * @var ScopeConfigInterface
      */
-    private $objectManager;
+    private $scopeConfig;
 
     /**
      * CanRefund constructor.
      *
      * @param PriceCurrencyInterface $priceCurrency
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
-        PriceCurrencyInterface $priceCurrency
+        PriceCurrencyInterface $priceCurrency,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
-        $this->objectManager = ObjectManager::getInstance();
         $this->priceCurrency = $priceCurrency;
+        $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -67,7 +70,7 @@ public function validate($entity)
      */
     private function isTotalPaidEnoughForRefund(OrderInterface $order)
     {
-        $isAllowedZeroGrandTotal = $this->objectManager->get(ScopeConfigInterface::class)->getValue(
+        $isAllowedZeroGrandTotal = $this->scopeConfig->getValue(
             'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );