Release 6.1.14

src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php

@@ -9,6 +9,7 @@ use Shopware\Core\{
     Checkout\Payment\Cart\PaymentHandler\AsynchronousPaymentHandlerInterface,
     Checkout\Payment\Exception\AsyncPaymentFinalizeException,
     Checkout\Payment\Exception\AsyncPaymentProcessException,
+    Checkout\Payment\PaymentException,
     Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException,
     Framework\Validation\DataBag\RequestDataBag,
     System\SalesChannel\SalesChannelContext
@@ -140,7 +141,7 @@ class VRPaymentPaymentHandler implements AsynchronousPaymentHandlerInterface
                 ]);
                 unset($_SESSION['transactionId']);
                 $this->logger->info($errorMessage);
-                throw new \Exception($transaction->getOrder()->getId());
+                throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
             }
         } else {
             $this->orderTransactionStateHandler->paid($transaction->getOrderTransaction()->getId(), $salesChannelContext->getContext());

src/Core/Storefront/Checkout/Controller/CheckoutController.php

@@ -354,6 +354,19 @@ class CheckoutController extends StorefrontController {
 			throw new MissingRequestParameterException('orderId');
 		}
 
+		// Adoption for Headless Storefronts
+		$orderRepo = $this->container->get('order.repository');
+		$criteria = new Criteria([$orderId]);
+
+		$orderEntity = $orderRepo->search($criteria, $salesChannelContext->getContext())->first();
+
+		if($orderEntity->getSalesChannelId() !== $salesChannelContext->getSalesChannelId()) {
+			$this->settings = $this->settingsService->getSettings($orderEntity->getSalesChannelId());
+			$trans = $this->getTransaction($orderId, $salesChannelContext->getContext());
+			return $this->redirect($trans->getSuccessUrl());
+		}
+		// End Adoption for Headless Storefronts
+
 		try {
 			$this->cartService->deleteCart($salesChannelContext);
 			$cart = $this->cartService->createNew($salesChannelContext->getToken());

src/Resources/public/administration/css/v-r-payment-payment.css

@@ -1,2 +0,0 @@
-.sw-order-detail .sw-tabs{margin-top:40px}.sw-order-detail .sw-order-detail-base .sw-card-view__content{overflow-x:visible;overflow-y:visible}
-.vrpayment-order-detail__data{display:grid}.vrpayment-order-detail__heading{padding-top:15px}