fix issues with sort-order of status-changes

ratepay · Mar 27, 2024 · 683e582 · 683e582
1 parent 631a300
commit 683e582
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/Components/RatepayApi/Subscriber/AutoDeliverySubscriber.php b/src/Components/RatepayApi/Subscriber/AutoDeliverySubscriber.php
@@ -13,11 +13,9 @@
 
 use Exception;
 use Psr\Log\LoggerInterface;
+use Ratepay\RpayPayments\Components\PaymentHandler\Event\PaymentSuccessfulEvent;
 use Ratepay\RpayPayments\Components\RatepayApi\Dto\OrderOperationData;
-use Ratepay\RpayPayments\Components\RatepayApi\Dto\PaymentRequestData;
-use Ratepay\RpayPayments\Components\RatepayApi\Event\ResponseEvent;
 use Ratepay\RpayPayments\Components\RatepayApi\Service\Request\PaymentDeliverService;
-use Ratepay\RpayPayments\Components\RatepayApi\Service\Request\PaymentRequestService;
 use Ratepay\RpayPayments\Core\PluginConfigService;
 use Ratepay\RpayPayments\Util\CriteriaHelper;
 use Shopware\Core\Checkout\Order\OrderEntity;
@@ -38,19 +36,18 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            PaymentRequestService::EVENT_SUCCESSFUL => ['onSuccess', 5],
+            PaymentSuccessfulEvent::class => 'onSuccess',
         ];
     }
 
-    public function onSuccess(ResponseEvent $requestEvent): void
+    public function onSuccess(PaymentSuccessfulEvent $event): void
     {
         if ($this->configService->isAutoDeliveryOfVirtualProductsDisabled()) {
             return;
         }
 
-        /** @var PaymentRequestData $requestData */
-        $requestData = $requestEvent->getRequestData();
-        $order = $this->orderRepository->search(CriteriaHelper::getCriteriaForOrder($requestData->getOrder()->getId()), $requestData->getContext())->first();
+        // we will reload the order completely to have all extension-data
+        $order = $this->orderRepository->search(CriteriaHelper::getCriteriaForOrder($event->getOrder()->getId()), $event->getContext())->first();
 
         if (!$order instanceof OrderEntity) {
             return; // should never occur - just to be safe.
@@ -68,7 +65,7 @@ public function onSuccess(ResponseEvent $requestEvent): void
         if ($lineItemsToDeliver !== []) {
             try {
                 $this->deliverService->doRequest(new OrderOperationData(
-                    $requestEvent->getContext(),
+                    $event->getContext(),
                     $order,
                     OrderOperationData::OPERATION_DELIVER,
                     $lineItemsToDeliver,

diff --git a/src/Components/RatepayApi/Subscriber/PaymentRequestSubscriber.php b/src/Components/RatepayApi/Subscriber/PaymentRequestSubscriber.php
@@ -29,7 +29,7 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            PaymentRequestService::EVENT_SUCCESSFUL => ['onSuccess', 1000],
+            PaymentRequestService::EVENT_SUCCESSFUL => 'onSuccess',
             PaymentRequestService::EVENT_FAILED => 'onFailure',
         ];
     }

diff --git a/src/Components/StateMachine/Subscriber/PaymentSuccessfulSubscriber.php b/src/Components/StateMachine/Subscriber/PaymentSuccessfulSubscriber.php
@@ -30,7 +30,7 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            PaymentSuccessfulEvent::class => 'changeTransactionState',
+            PaymentSuccessfulEvent::class => ['changeTransactionState', 6000],
         ];
     }