Fixes #17 Use succesfull notification for refunds

Adyen · Aug 28, 2020 · 60088f7 · 60088f7
1 parent e89487b
commit 60088f7
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 38 deletions.
diff --git a/Components/Adyen/RefundService.php b/Components/Adyen/RefundService.php
@@ -7,6 +7,7 @@
 use Adyen\AdyenException;
 use Adyen\Service\Modification;
 use AdyenPayment\Components\NotificationManager;
+use AdyenPayment\Models\PaymentInfo;
 use AdyenPayment\Models\Refund;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Order\Order;
@@ -27,6 +28,10 @@ class RefundService
      * @var NotificationManager
      */
     private $notificationManager;
+    /**
+     * @var \Doctrine\Common\Persistence\ObjectRepository|\Doctrine\ORM\EntityRepository
+     */
+    private $paymentInfoRepository;
 
     /**
      * PaymentMethodService constructor.
@@ -42,6 +47,7 @@ public function __construct(
         $this->apiFactory = $apiFactory;
         $this->modelManager = $modelManager;
         $this->notificationManager = $notificationManager;
+        $this->paymentInfoRepository = $modelManager->getRepository(PaymentInfo::class);
     }
 
     /**
@@ -53,11 +59,23 @@ public function __construct(
      */
     public function doRefund(int $orderId): Refund
     {
+        /** @var Order $order */
         $order = $this->modelManager->find(Order::class, $orderId);
         $apiClient = $this->apiFactory->create($order->getShop());
         $modification = new Modification($apiClient);
 
-        $notification = $this->notificationManager->getLastNotificationForOrderId($orderId);
+        /** @var PaymentInfo $paymentInfo */
+        $paymentInfo = $this->paymentInfoRepository->findOneBy([
+            'orderId' => $orderId
+        ]);
+
+        if ($paymentInfo && !empty($paymentInfo->getPspReference())) {
+            $notification = $this->notificationManager->getLastNotificationForPspReference(
+                $paymentInfo->getPspReference()
+            );
+        } else {
+            $notification = $this->notificationManager->getLastNotificationForOrderId($orderId);
+        }
 
         $request = [
             'originalReference' => $notification->getPspReference(),

diff --git a/Components/NotificationManager.php b/Components/NotificationManager.php
@@ -77,4 +77,25 @@ public function getLastNotificationForOrderId(int $orderId)
             return null;
         }
     }
+
+    /**
+     * @param string $pspReference
+     * @return mixed|null
+     * @throws NonUniqueResultException
+     */
+    public function getLastNotificationForPspReference(string $pspReference)
+    {
+        try {
+            $lastNotification = $this->notificationRepository->createQueryBuilder('n')
+                ->where('n.pspReference = :pspReference')
+                ->setMaxResults(1)
+                ->orderBy('n.createdAt', 'ASC')
+				->setParameter('pspReference', $pspReference)
+				->getQuery()
+				->getSingleResult();
+			return $lastNotification;
+		} catch (NoResultException $ex) {
+			return null;
+		}
+	}
 }
diff --git a/Components/NotificationProcessor/Authorisation.php b/Components/NotificationProcessor/Authorisation.php
@@ -31,16 +31,16 @@ class Authorisation implements NotificationProcessorInterface
      * @var PaymentStatusUpdate
      */
     private $paymentStatusUpdate;
-	/**
-	 * @var ModelManager
-	 */
-	private $modelManager;
-	/**
-	 * @var \Doctrine\Common\Persistence\ObjectRepository|\Doctrine\ORM\EntityRepository
-	 */
-	private $paymentInfoRepository;
+    /**
+     * @var ModelManager
+     */
+    private $modelManager;
+    /**
+     * @var \Doctrine\Common\Persistence\ObjectRepository|\Doctrine\ORM\EntityRepository
+     */
+    private $paymentInfoRepository;
 
-	/**
+    /**
      * Authorisation constructor.
      * @param LoggerInterface $logger
      * @param ContainerAwareEventManager $eventManager
@@ -50,14 +50,14 @@ public function __construct(
         LoggerInterface $logger,
         ContainerAwareEventManager $eventManager,
         PaymentStatusUpdate $paymentStatusUpdate,
-		ModelManager $modelManager
+        ModelManager $modelManager
     ) {
         $this->logger = $logger;
         $this->eventManager = $eventManager;
         $this->paymentStatusUpdate = $paymentStatusUpdate->setLogger($this->logger);
-		$this->modelManager = $modelManager;
-		$this->paymentInfoRepository = $modelManager->getRepository(PaymentInfo::class);
-	}
+        $this->modelManager = $modelManager;
+        $this->paymentInfoRepository = $modelManager->getRepository(PaymentInfo::class);
+    }
 
     /**
      * Returns boolean on whether this processor can process the Notification object
@@ -97,14 +97,14 @@ public function process(Notification $notification)
         $this->paymentStatusUpdate->updatePaymentStatus($order, $status);
 
         if ($notification->isSuccess()) {
-        	/** @var PaymentInfo $paymentInfo */
-        	$paymentInfo = $this->paymentInfoRepository->findOneBy([
-        		'orderId' => $order->getId()
-			]);
+            /** @var PaymentInfo $paymentInfo */
+            $paymentInfo = $this->paymentInfoRepository->findOneBy([
+                'orderId' => $order->getId()
+            ]);
 
-        	$paymentInfo->setPspReference($notification->getPspReference());
-        	$this->modelManager->persist($paymentInfo);
-        	$this->modelManager->flush($paymentInfo);
-		}
+            $paymentInfo->setPspReference($notification->getPspReference());
+            $this->modelManager->persist($paymentInfo);
+            $this->modelManager->flush($paymentInfo);
+        }
     }
 }
diff --git a/Components/NotificationProcessor/Capture.php b/Components/NotificationProcessor/Capture.php
@@ -35,17 +35,17 @@ class Capture implements NotificationProcessorInterface
      * @var PaymentStatusUpdate
      */
     private $paymentStatusUpdate;
-	/**
-	 * @var ModelManager
-	 */
-	private $modelManager;
-	/**
-	 * @var \Doctrine\Common\Persistence\ObjectRepository|\Doctrine\ORM\EntityRepository
-	 */
-	private $paymentInfoRepository;
+    /**
+     * @var ModelManager
+     */
+    private $modelManager;
+    /**
+     * @var \Doctrine\Common\Persistence\ObjectRepository|\Doctrine\ORM\EntityRepository
+     */
+    private $paymentInfoRepository;
 
 
-	/**
+    /**
      * Capture constructor.
      * @param LoggerInterface $logger
      * @param ContainerAwareEventManager $eventManager
@@ -55,14 +55,14 @@ public function __construct(
         LoggerInterface $logger,
         ContainerAwareEventManager $eventManager,
         PaymentStatusUpdate $paymentStatusUpdate,
-		ModelManager $modelManager
+        ModelManager $modelManager
     ) {
         $this->logger = $logger;
         $this->eventManager = $eventManager;
         $this->paymentStatusUpdate = $paymentStatusUpdate->setLogger($this->logger);
-		$this->modelManager = $modelManager;
-		$this->paymentInfoRepository = $modelManager->getRepository(PaymentInfo::class);
-	}
+        $this->modelManager = $modelManager;
+        $this->paymentInfoRepository = $modelManager->getRepository(PaymentInfo::class);
+    }
 
     /**
      * Returns boolean on whether this processor can process the Notification object
@@ -101,9 +101,9 @@ public function process(Notification $notification)
                 Status::PAYMENT_STATE_COMPLETELY_PAID
             );
 
-			/** @var PaymentInfo $paymentInfo */
-			$paymentInfo = $this->paymentInfoRepository->findOneBy([
-				'orderId' => $order->getId()
+            /** @var PaymentInfo $paymentInfo */
+            $paymentInfo = $this->paymentInfoRepository->findOneBy([
+    			'orderId' => $order->getId()
 			]);
 
 			$paymentInfo->setPspReference($notification->getPspReference());