Fix payment method entity extension

Adyen · Jun 9, 2021 · a678591 · a678591
1 parent 8758391
commit a678591
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php b/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php
@@ -28,8 +28,10 @@
 use Adyen\Shopware\Service\PaymentMethodsFilterService;
 use Adyen\Shopware\Service\PaymentMethodsService;
 use Adyen\Shopware\Struct\AdyenPaymentMethodDataStruct;
+use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
 use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
 use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult;
 use Shopware\Core\PlatformRequest;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -105,13 +107,25 @@ private function filterPaymentMethods(SalesChannelContext $context, ResponseEven
             return;
         }
 
-        $methods = $this->paymentMethodsFilterService->filterShopwarePaymentMethods(
-            $event->getResponse()->getPaymentMethods(),
+        /** @var EntitySearchResult $result */
+        $result = $event->getResponse()->getObject();
+        /** @var PaymentMethodCollection $paymentMethods */
+        $paymentMethods = $result->getEntities();
+        $filteredPaymentMethods = $this->paymentMethodsFilterService->filterShopwarePaymentMethods(
+            $paymentMethods,
             $context,
             $this->adyenPluginProvider->getAdyenPluginId()
         );
 
-        $response = new PaymentMethodRouteResponse($methods);
+        $result = new EntitySearchResult(
+            'payment_method',
+            count($filteredPaymentMethods),
+            $filteredPaymentMethods,
+            $result->getAggregations(),
+            $result->getCriteria(),
+            $result->getContext()
+        );
+        $response = new PaymentMethodRouteResponse($result);
         $event->setResponse($response);
     }