Fix order state change after refund

PrestaShopCorp · Aug 7, 2024 · 9ddb3da · 9ddb3da
1 parent 8fc6169
commit 9ddb3da
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/config/common.yml b/config/common.yml
@@ -519,8 +519,6 @@ services:
     class: 'PrestaShop\Module\PrestashopCheckout\PayPal\Payment\Refund\EventSubscriber\PayPalRefundEventSubscriber'
     arguments:
       - '@ps_checkout.module'
-      - '@ps_checkout.order.service.check_order_amount'
-      - '@ps_checkout.cache.paypal.capture'
       - '@ps_checkout.cache.paypal.order'
       - '@ps_checkout.order.state.service.order_state_mapper'
       - '@ps_checkout.paypal.provider.order'

diff --git a/src/Order/Query/GetOrderForPaymentRefundedQueryResult.php b/src/Order/Query/GetOrderForPaymentRefundedQueryResult.php
@@ -42,6 +42,11 @@ class GetOrderForPaymentRefundedQueryResult
      */
     private $hasBeenPaid;
 
+    /**
+     * @var bool
+     */
+    private $hasBeenPartiallyRefund;
+
     /**
      * @var bool
      */
@@ -66,6 +71,7 @@ class GetOrderForPaymentRefundedQueryResult
      * @param int $orderId
      * @param int $currentStateId
      * @param bool $hasBeenPaid
+     * @param bool $hasBeenPartiallyRefund
      * @param bool $hasBeenTotallyRefund
      * @param string $totalAmount
      * @param string $totalRefund
@@ -78,6 +84,7 @@ public function __construct(
         $orderId,
         $currentStateId,
         $hasBeenPaid,
+        $hasBeenPartiallyRefund,
         $hasBeenTotallyRefund,
         $totalAmount,
         $totalRefund,
@@ -86,6 +93,7 @@ public function __construct(
         $this->orderId = new OrderId($orderId);
         $this->currentStateId = new OrderStateId($currentStateId);
         $this->hasBeenPaid = $hasBeenPaid;
+        $this->hasBeenPartiallyRefund = $hasBeenPartiallyRefund;
         $this->hasBeenTotallyRefund = $hasBeenTotallyRefund;
         $this->totalAmount = $totalAmount;
         $this->totalRefund = $totalRefund;
@@ -116,6 +124,11 @@ public function hasBeenPaid()
         return $this->hasBeenPaid;
     }
 
+    public function hasBeenPartiallyRefund()
+    {
+        return $this->hasBeenPartiallyRefund;
+    }
+
     /**
      * @return bool
      */

diff --git a/src/Order/QueryHandler/GetOrderForPaymentRefundedQueryHandler.php b/src/Order/QueryHandler/GetOrderForPaymentRefundedQueryHandler.php
@@ -85,18 +85,14 @@ public function handle(GetOrderForPaymentRefundedQuery $query)
             (int) $order->id,
             (int) $order->getCurrentState(),
             (bool) $order->hasBeenPaid(),
-            $this->hasBeenTotallyRefunded($totalRefund, $order),
+            (bool) count($order->getHistory((int) $order->id_lang, (int) \Configuration::get('PS_CHECKOUT_STATE_PARTIALLY_REFUNDED'))),
+            (bool) count($order->getHistory((int) $order->id_lang, (int) \Configuration::get('PS_CHECKOUT_STATE_REFUNDED'))),
             (string) $order->getTotalPaid(),
             (string) $totalRefund,
             (int) $order->id_currency
         );
     }
 
-    private function hasBeenTotallyRefunded($refundAmount, $order)
-    {
-        return $refundAmount >= $order->total_paid;
-    }
-
     private function getTotalRefund(Order $order)
     {
         /** @var OrderSlip[] $orderSlips */

diff --git a/src/PayPal/Payment/Refund/EventSubscriber/PayPalRefundEventSubscriber.php b/src/PayPal/Payment/Refund/EventSubscriber/PayPalRefundEventSubscriber.php
@@ -25,7 +25,6 @@
 use PrestaShop\Module\PrestashopCheckout\Order\Exception\OrderNotFoundException;
 use PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForPaymentRefundedQuery;
 use PrestaShop\Module\PrestashopCheckout\Order\Query\GetOrderForPaymentRefundedQueryResult;
-use PrestaShop\Module\PrestashopCheckout\Order\Service\CheckOrderAmount;
 use PrestaShop\Module\PrestashopCheckout\Order\State\OrderStateConfigurationKeys;
 use PrestaShop\Module\PrestashopCheckout\Order\State\Service\OrderStateMapper;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Payment\Refund\Event\PayPalCaptureRefundedEvent;
@@ -42,21 +41,11 @@ class PayPalRefundEventSubscriber implements EventSubscriberInterface
      */
     private $module;
 
-    /**
-     * @var CheckOrderAmount
-     */
-    private $checkOrderAmount;
-
     /**
      * @var CommandBusInterface
      */
     private $commandBus;
 
-    /**
-     * @var CacheInterface
-     */
-    private $capturePayPalCache;
-
     /**
      * @var CacheInterface
      */
@@ -73,16 +62,12 @@ class PayPalRefundEventSubscriber implements EventSubscriberInterface
 
     public function __construct(
         Ps_checkout $module,
-        CheckOrderAmount $checkOrderAmount,
-        CacheInterface $capturePayPalCache,
         CacheInterface $orderPayPalCache,
         OrderStateMapper $orderStateMapper,
         PayPalOrderProvider $orderProvider
     ) {
         $this->module = $module;
-        $this->checkOrderAmount = $checkOrderAmount;
         $this->commandBus = $this->module->getService('ps_checkout.bus.command');
-        $this->capturePayPalCache = $capturePayPalCache;
         $this->orderPayPalCache = $orderPayPalCache;
         $this->orderStateMapper = $orderStateMapper;
         $this->orderProvider = $orderProvider;
@@ -129,11 +114,22 @@ public function setPaymentRefundedOrderStatus(PayPalCaptureRefundedEvent $event)
         });
 
         $orderFullyRefunded = (float) $order->getTotalAmount() <= (float) $totalRefunded;
+        $orderStateRefunded = $this->orderStateMapper->getIdByKey(OrderStateConfigurationKeys::PS_CHECKOUT_STATE_REFUNDED);
+        $orderStatePartiallyRefunded = $this->orderStateMapper->getIdByKey(OrderStateConfigurationKeys::PS_CHECKOUT_STATE_PARTIALLY_REFUNDED);
+        $newOrderState = $orderFullyRefunded ? $orderStateRefunded : $orderStatePartiallyRefunded;
+
+        if ($order->hasBeenPartiallyRefund() && $newOrderState === $orderStatePartiallyRefunded) {
+            return;
+        }
+
+        if ($order->getCurrentStateId()->getValue() === $newOrderState) {
+            return;
+        }
 
         $this->commandBus->handle(
             new UpdateOrderStatusCommand(
                 $order->getOrderId()->getValue(),
-                $this->orderStateMapper->getIdByKey($orderFullyRefunded ? OrderStateConfigurationKeys::PS_CHECKOUT_STATE_REFUNDED : OrderStateConfigurationKeys::PS_CHECKOUT_STATE_PARTIALLY_REFUNDED)
+                $newOrderState
             )
         );
     }