return only used payment method for refund form

TheGrimmChester · TheGrimmChester · commit 1a3ac722afbf · 2020-10-23T16:39:48.000+02:00
diff --git a/features/admin/refunding_payplug_payment.feature b/features/admin/refunding_payplug_payment.feature
@@ -62,7 +62,7 @@ Feature: Refunding order's PayPlug payment
     Scenario: Should be able to refund using payplug payment
         When I want to refund some units of order "00000001"
         Then there should be "PayPlug" payment method
-        Then there should be "Cash on delivery" payment method
+        Then there should not be "Cash on delivery" payment method
         Then I should still be able to refund order shipment with "PayPlug" payment
         When For this order I decide to refund 1st "Green Arrow" product with "PayPlug" payment
         Then this order refunded total should be "$10.00"
@@ -72,7 +72,7 @@ Feature: Refunding order's PayPlug payment
     Scenario: Should be able to refund using payplug payment
         When I want to refund some units of order "00000001"
         Then there should be "PayPlug" payment method
-        Then there should be "Cash on delivery" payment method
+        Then there should not be "Cash on delivery" payment method
         Then I should still be able to refund order shipment with "PayPlug" payment
         When For this order I decide to refund 1st "Green Arrow" product with "PayPlug" payment
         Then this order refunded total should be "$10.00"
diff --git a/src/Provider/SupportedRefundPaymentMethodsProviderDecorator.php b/src/Provider/SupportedRefundPaymentMethodsProviderDecorator.php
@@ -5,6 +5,7 @@
 namespace PayPlug\SyliusPayPlugPlugin\Provider;
 
 use PayPlug\SyliusPayPlugPlugin\PayPlugGatewayFactory;
+use Payum\Core\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
@@ -57,10 +58,25 @@ public function findForChannel(ChannelInterface $channel): array
         /** @var OrderInterface|null $order */
         $order = $this->orderRepository->findOneByNumber($request->get('orderNumber'));
 
-        if (!$order instanceof OrderInterface || $this->isPayPlugPayment($order)) {
+        if (!$order instanceof OrderInterface) {
             return $paymentMethods;
         }
 
+        if ($this->isPayPlugPayment($order)) {
+            return array_filter($paymentMethods, function (PaymentMethodInterface $paymentMethod) use ($order): bool {
+                $lastPayment = $order->getLastPayment();
+                if (!$lastPayment instanceof PaymentInterface) {
+                    return false;
+                }
+                $lastPaymentMethod = $lastPayment->getMethod();
+                if (!$lastPaymentMethod instanceof PaymentMethodInterface) {
+                    return false;
+                }
+
+                return $paymentMethod->getId() === $lastPaymentMethod->getId();
+            });
+        }
+
         if (null !== $order->getLastPayment() &&
             null !== $order->getLastPayment()->getMethod() &&
             $order->getLastPayment()->getMethod()->getCode() === PayPlugGatewayFactory::FACTORY_NAME &&
@@ -80,17 +96,23 @@ public function findForChannel(ChannelInterface $channel): array
 
     private function isPayPlugPayment(OrderInterface $order): bool
     {
-        $firstPayment = $order->getPayments()->first();
-        if (!$firstPayment instanceof PaymentInterface) {
+        $lastPayment = $order->getLastPayment();
+        if (!$lastPayment instanceof PaymentInterface) {
+            return false;
+        }
+
+        $paymentMethod = $lastPayment->getMethod();
+        if (!$paymentMethod instanceof PaymentMethodInterface) {
             return false;
         }
 
-        $firstPaymentMethod = $firstPayment->getMethod();
-        if (!$firstPaymentMethod instanceof PaymentMethodInterface) {
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+
+        if (!$gatewayConfig instanceof GatewayConfigInterface) {
             return false;
         }
 
-        if (PayPlugGatewayFactory::FACTORY_NAME !== $firstPaymentMethod->getCode()) {
+        if (PayPlugGatewayFactory::FACTORY_NAME !== $gatewayConfig->getFactoryName()) {
             return false;
         }
 
