Merge pull request #99 from paynl/feature/PLUG-1355

PLUG-1355 - Exchange refactor object manager
paynl · Mar 23, 2023 · e6caac6 · e6caac6
2 parents fda2bc0 + bde0219
commit e6caac6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Model/PayPayment.php b/Model/PayPayment.php
@@ -45,6 +45,12 @@ class PayPayment
      */
     private $builderInterface;
 
+    /**
+     *
+     * @var Magento\Sales\Model\Order\PaymentFactory
+     */
+    private $paymentFactory;
+
     private $paynlConfig;
 
     /**
@@ -57,6 +63,7 @@ class PayPayment
      * @param OrderRepository $orderRepository
      * @param \Paynl\Payment\Model\Config $paynlConfig
      * @param \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $builderInterface
+     * @param \Magento\Sales\Model\Order\PaymentFactory $paymentFactory
      */
     public function __construct(
         \Paynl\Payment\Model\Config $config,
@@ -65,7 +72,8 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         OrderRepository $orderRepository,
         \Paynl\Payment\Model\Config $paynlConfig,
-        \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $builderInterface
+        \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $builderInterface,
+        \Magento\Sales\Model\Order\PaymentFactory $paymentFactory
     ) {
         $this->eventManager = $eventManager;
         $this->config = $config;
@@ -74,6 +82,7 @@ public function __construct(
         $this->orderRepository = $orderRepository;
         $this->paynlConfig = $paynlConfig;
         $this->builderInterface = $builderInterface;
+        $this->paymentFactory = $paymentFactory;
     }
 
     /**
@@ -254,9 +263,6 @@ private function processB2BPayment(Transaction $transaction, Order $order, Inter
     public function processPartiallyPaidOrder(Order $order, string $payOrderId)
     {
         $returnResult = false;
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $orderPaymentFactory = $objectManager->get(\Magento\Sales\Model\Order\PaymentFactory::class);
-
         try {
             $details = \Paynl\Transaction::details($payOrderId);
 
@@ -278,7 +284,7 @@ public function processPartiallyPaidOrder(Order $order, string $payOrderId)
 
             /** @var Interceptor $orderPayment */
             if (!$firstPayment) {
-                $orderPayment = $orderPaymentFactory->create();
+                $orderPayment = $this->paymentFactory->create();
             } else {
                 $orderPayment = $order->getPayment();
             }