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\ObjectManager;
 
 class CanRefund implements ValidatorInterface
 {
@@ -27,6 +28,11 @@ class CanRefund implements ValidatorInterface
      */
     private $orderRepository;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
     /**
      * CanRefund constructor.
      *
@@ -37,6 +43,7 @@ public function __construct(
         OrderPaymentRepositoryInterface $paymentRepository,
         OrderRepositoryInterface $orderRepository
     ) {
+        $this->objectManager = ObjectManager::getInstance();
         $this->paymentRepository = $paymentRepository;
         $this->orderRepository = $orderRepository;
     }
@@ -103,7 +110,7 @@ private function canPartialRefund(MethodInterface $method, InfoInterface $paymen
     }
 
     /**
-     * validate if full refund is possible
+     * Validate if full refund is possible
      *
      * @param InvoiceInterface $invoice
      * @param MethodInterface $method

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Validation;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order;
@@ -19,6 +20,11 @@ class CanRefund implements ValidatorInterface
      */
     private $priceCurrency;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
     /**
      * CanRefund constructor.
      *
@@ -27,6 +33,7 @@ class CanRefund implements ValidatorInterface
     public function __construct(
         PriceCurrencyInterface $priceCurrency
     ) {
+        $this->objectManager = ObjectManager::getInstance();
         $this->priceCurrency = $priceCurrency;
     }
 

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

@@ -1,8 +1,10 @@
 <?php
-
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\Sales\Model\Order\Validation;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 trait CanRefundTrait
@@ -14,8 +16,7 @@ trait CanRefundTrait
      */
     private function isAllowZeroGrandTotal()
     {
-        $scopeConfig = ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-        $isAllowed = $scopeConfig->getValue(
+        $isAllowed = $this->objectManager->get(ScopeConfigInterface::class)->getValue(
             'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );