Merge pull request #359 from Adyen/develop

Release 3.10.1
Adyen · Mar 9, 2023 · f7d633d · f7d633d
2 parents bff64bf + b4594ce
commit f7d633d
Show file tree

Hide file tree

Showing 16 changed files with 584 additions and 500 deletions.
diff --git a/README.md b/README.md
@@ -66,6 +66,7 @@ The plugin integrates card component (Secured Fields) using Adyen Checkout for a
  - Twint
  - Vipps
  - WeChat Pay
+ - Open Banking / Pay by Bank
 
 ## API Library
 This module is using the Adyen APIs Library for PHP for all (API) connections to Adyen.

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "3.10.0",
+    "version": "3.10.1",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Controller/StoreApi/Donate/DonateController.php b/src/Controller/StoreApi/Donate/DonateController.php
@@ -99,7 +99,7 @@ public function donate(
         Request $request,
         SalesChannelContext $salesChannelContext
     ): JsonResponse {
-        $payload = $request->get('payload');
+        $payload = $request->request->get('payload');
 
         $orderId = $payload['orderId'];
         $currency = $payload['amount']['currency'];

diff --git a/src/Controller/StoreApi/Payment/PaymentController.php b/src/Controller/StoreApi/Payment/PaymentController.php
@@ -33,9 +33,11 @@
 use Adyen\Shopware\Service\PaymentResponseService;
 use Adyen\Shopware\Service\PaymentStatusService;
 use Adyen\Shopware\Service\Repository\OrderRepository;
+use Petstore30\Order;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Cart\Price\Struct\CalculatedPrice;
 use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionDefinition;
+use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler;
 use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStates;
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Checkout\Order\SalesChannel\OrderService;
@@ -108,6 +110,10 @@ class PaymentController
      * @var ConfigurationService
      */
     private $configurationService;
+    /**
+     * @var OrderTransactionStateHandler
+     */
+    private $orderTransactionStateHandler;
 
     /**
      * StoreApiController constructor.
@@ -137,7 +143,8 @@ public function __construct(
         StateMachineRegistry $stateMachineRegistry,
         LoggerInterface $logger,
         EntityRepositoryInterface $orderTransactionRepository,
-        ConfigurationService $configurationService
+        ConfigurationService $configurationService,
+        OrderTransactionStateHandler $orderTransactionStateHandler
     ) {
         $this->paymentMethodsService = $paymentMethodsService;
         $this->paymentDetailsService = $paymentDetailsService;
@@ -151,6 +158,7 @@ public function __construct(
         $this->logger = $logger;
         $this->orderTransactionRepository = $orderTransactionRepository;
         $this->configurationService = $configurationService;
+        $this->orderTransactionStateHandler = $orderTransactionStateHandler;
     }
 
     /**
@@ -265,7 +273,7 @@ function (Context $context) use ($orderTransactionId, $customFields) {
      */
     public function getPaymentStatus(Request $request, SalesChannelContext $context): JsonResponse
     {
-        $orderId = $request->get('orderId');
+        $orderId = $request->request->get('orderId');
         if (empty($orderId)) {
             return new JsonResponse('Order ID not provided', 400);
         }
@@ -315,7 +323,11 @@ public function getPaymentStatus(Request $request, SalesChannelContext $context)
      */
     public function updatePaymentMethod(Request $request, SalesChannelContext $context): SetPaymentOrderRouteResponse
     {
-        $this->setPaymentMethod($request->get('paymentMethodId'), $request->get('orderId'), $context);
+        $this->setPaymentMethod(
+            $request->request->get('paymentMethodId'),
+            $request->request->get('orderId'),
+            $context
+        );
         return new SetPaymentOrderRouteResponse();
     }
 
@@ -337,10 +349,8 @@ function () use ($order, $initialState, $orderId, $paymentMethodId, $context): v
                     foreach ($order->getTransactions() as $transaction) {
                         if ($transaction->getStateMachineState()->getTechnicalName()
                             !== OrderTransactionStates::STATE_CANCELLED) {
-                            $this->orderService->orderTransactionStateTransition(
+                            $this->orderTransactionStateHandler->cancel(
                                 $transaction->getId(),
-                                'cancel',
-                                new ParameterBag(),
                                 $context
                             );
                         }
@@ -385,7 +395,7 @@ public function cancelOrderTransaction(
         SalesChannelContext $salesChannelContext
     ): JsonResponse {
         $context = $salesChannelContext->getContext();
-        $orderId = $request->get('orderId');
+        $orderId = $request->request->get('orderId');
         $order = $this->orderRepository->getOrder($orderId, $context, ['transactions']);
 
         $transaction = $order->getTransactions()->filterByState(OrderTransactionStates::STATE_IN_PROGRESS)->first();