Release 6.1.16

CHANGELOG.md

@@ -1,5 +1,8 @@
-# 7.0.0
-- Compatibility with Shopware 6.7.0
+# 6.1.16
+- Fixed issue with pending orders remaining open
+
+# 6.1.15
+- Fixed issue with shipping costs not being processed correctly
 
 # 6.1.14
 - Disable Recreate Cart for Headless Storefront Order

CHANGELOG_de-DE.md

@@ -1,5 +1,8 @@
-# 7.0.0
-- Kompatibilität mit Shopware 6.7.0
+# 6.1.16
+- Problem behoben, bei dem die Versandkosten nicht korrekt verarbeitet wurden
+
+# 6.1.15
+- Problem behoben, bei dem ausstehende Bestellungen offen blieben
 
 # 6.1.14
 – Warenkorb neu erstellen für Headless Storefront Order deaktivieren

README.md

@@ -3,20 +3,21 @@
 VR Payment Integration for Shopware 6
 =============================
 
-The VR Payment plugin wraps around the VR Payment API. This library facilitates your interaction with various services such as transactions.
-Please note that this plugin is for versions 6.5, 6.6 or 6.7. For the 6.4 plugin please visit [our Shopware 6.4 plugin](https://github.com/vr-payment/shopware-6-4).
+## **Overview**  
+The VR Payment Payment Plugin integrates modern payment processing into Shopware 6, offering features like iFrame-based payments, refunds, captures, and PCI compliance. It supports seamless integration with the [VR Payment Portal](https://gateway.vr-payment.de/) for managing transactions and payment methods.
 
 ## Requirements
 
-- Shopware 6.7.x, 6.6.x or 6.5.x. See table below.
-- PHP minimum version supported by the each shop version.
+- **Shopware Version:** 6.5.x or 6.6.x (see [compatibility table](#compatibility)).  
+- **PHP:** Minimum version as required by your Shopware installation (e.g., 7.4+).  
+- **VR Payment Account:** Obtain `Space ID`, `User ID`, and `API Key` from the [VR Payment Dashboard](https://gateway.vr-payment.de/).
 
 ## Documentation
 
-- For English documentation click [here](https://plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.0.0/docs/en/documentation.html)
-- Für die deutsche Dokumentation klicken Sie [hier](https://plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.0.0/docs/de/documentation.html)
-- Pour la documentation Française, cliquez [ici](https://plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.0.0/docs/fr/documentation.html)
-- Per la documentazione in tedesco, clicca [qui](https://plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.0.0/docs/it/documentation.html)
+- For English documentation click [here](@WalleeDocPath(/docs/en/documentation.html))
+- Für die deutsche Dokumentation klicken Sie [hier](@WalleeDocPath(/docs/de/documentation.html))
+- Pour la documentation Française, cliquez [ici](@WalleeDocPath(/docs/fr/documentation.html))
+- Per la documentazione in tedesco, clicca [qui](@WalleeDocPath(/docs/it/documentation.html))
 
 ## Installation
 
@@ -66,8 +67,7 @@ Configure supported methods (e.g., credit cards, Apple Pay) via the [VR Payment
 ___________________________________________________________________________________
 | Shopware 6 version            | Plugin major version   | Supported until        |
 |-------------------------------|------------------------|------------------------|
-| Shopware 6.7.x                | 7.x                    | Further notice         |
-| Shopware 6.6.x                | 6.x                    | December 2025          |
+| Shopware 6.6.x                | 6.x                    | Further notice         |
 | Shopware 6.5.x                | 5.x                    | October 2024           |
 -----------------------------------------------------------------------------------
 

composer.json

@@ -53,11 +53,11 @@
 	"ext-json": "*",
 	"ext-mbstring": "*",
 	"php": ">=8.2",
-    "shopware/core": "~6.7.0",
-    "shopware/administration": "~6.7.0",
-    "shopware/storefront":"~6.7.0",
+    "shopware/core": "~6.6.0",
+    "shopware/administration": "~6.6.0",
+    "shopware/storefront":"~6.6.0",
     "vrpayment/sdk": "^4.0.0"
   },
   "type": "shopware-platform-plugin",
-  "version": "7.0.0"
+  "version": "6.1.16"
 }

docs/de/documentation.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<meta name="keywords" value="VR Payment, Shopware, Shopware Plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Shopware 6 plugin that enables processing payments with VR Payment.">		
-		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/VRPaymentPayment/docs/de/documentation.html" />
+		<link rel="canonical" href="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/de/documentation.html)" />
 		<title>VR Payment Zahlungs-Plugin für Shopware 6</title>
 		<link href="assets/monokai-sublime.css" rel="stylesheet" />
 		<link href="assets/base.css" rel="stylesheet" />
@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.0.0/">
+		<a href="@WalleeReleasePath()">
 			Source
 		</a>
 	</li>
@@ -185,7 +185,7 @@ php bin/console plugin:install --activate --clearCache VRPaymentPayment</code></
 	</div>
 	<div class="chapter-body">
 					<div class="paragraph">
-<p>Gehen Sie zu <a href="https://gateway.vr-payment.de/user/login/user/login">VR Payment</a> und erstellen Sie ein Konto, falls Sie noch keines haben.</p>
+<p>Gehen Sie zu <a href="https://gateway.vr-payment.de/user/login">VR Payment</a> und erstellen Sie ein Konto, falls Sie noch keines haben.</p>
 </div><div class="admonitionblock tip">
 <table>
 <tr>

docs/en/documentation.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<meta name="keywords" value="VR Payment, Shopware, Shopware Plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Shopware 6 plugin that enables processing payments with VR Payment.">		
-		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/VRPaymentPayment/docs/en/documentation.html" />
+		<link rel="canonical" href="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/en/documentation.html)" />
 		<title>VR Payment Shopware 6 Documentation</title>
 		<link href="assets/monokai-sublime.css" rel="stylesheet" />
 		<link href="assets/base.css" rel="stylesheet" />
@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.0.0/">
+		<a href="@WalleeReleasePath()">
 			Source
 		</a>
 	</li>
@@ -179,7 +179,7 @@ php bin/console plugin:install --activate --clearCache VRPaymentPayment</code></
 	</div>
 	<div class="chapter-body">
 					<div class="paragraph">
-<p>Go to <a href="https://gateway.vr-payment.de/user/login/user/login">VR Payment</a> and create an Account if you do not already have one.</p>
+<p>Go to <a href="https://gateway.vr-payment.de/user/login">VR Payment</a> and create an Account if you do not already have one.</p>
 </div><div class="admonitionblock tip">
 <table>
 <tr>

docs/fr/documentation.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<meta name="keywords" value="VR Payment, Shopware, Shopware Plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Shopware 6 plugin that enables processing payments with VR Payment.">		
-		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/VRPaymentPayment/docs/fr/documentation.html" />
+		<link rel="canonical" href="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/fr/documentation.html)" />
 		<title>Wallee Payment Plugin pour Shopware 6</title>
 		<link href="assets/monokai-sublime.css" rel="stylesheet" />
 		<link href="assets/base.css" rel="stylesheet" />
@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.0.0/">
+		<a href="@WalleeReleasePath()">
 			Source
 		</a>
 	</li>
@@ -172,7 +172,7 @@ php bin/console plugin:install --activate --clearCache VRPaymentPayment</code></
 	</div>
 	<div class="chapter-body">
 					<div class="paragraph">
-<p>Allez sur <a href="https://gateway.vr-payment.de/user/login/user/login">VR Payment</a> et créez un Compte si vous n’en avez pas déjà un</p>
+<p>Allez sur hhttps://gateway.vr-payment.de/user/login[VR Payment] et créez un Compte si vous n’en avez pas déjà un</p>
 </div><div class="admonitionblock tip">
 <table>
 <tr>

docs/it/documentation.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<meta name="keywords" value="VR Payment, Shopware, Shopware Plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Shopware 6 plugin that enables processing payments with VR Payment.">		
-		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/VRPaymentPayment/docs/it/documentation.html" />
+		<link rel="canonical" href="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/it/documentation.html)" />
 		<title>VR Payment Shopware 6 Documentation</title>
 		<link href="assets/monokai-sublime.css" rel="stylesheet" />
 		<link href="assets/base.css" rel="stylesheet" />
@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.0.0/">
+		<a href="@WalleeReleasePath()">
 			Source
 		</a>
 	</li>
@@ -179,7 +179,7 @@ php bin/console plugin:install --activate --clearCache VRPaymentPayment</code></
 	</div>
 	<div class="chapter-body">
 					<div class="paragraph">
-<p>Andate su <a href="https://gateway.vr-payment.de/user/login/user/login">VR Payment</a> e create un account se non ne avete già uno.</p>
+<p>Andate su <a href="https://gateway.vr-payment.de/user/login">VR Payment</a> e create un account se non ne avete già uno.</p>
 </div><div class="admonitionblock tip">
 <table>
 <tr>

src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php

@@ -499,7 +499,6 @@ class PaymentMethodConfigurationService {
 			'afterOrderEnabled'  => true,
 			'active'             => true,
 			'translations'       => $this->getPaymentMethodConfigurationTranslation($paymentMethodConfiguration, $context),
-			'technicalName'		 => $paymentMethodConfiguration->getName(),
 		];
 
 		$data['mediaId'] = $this->upsertMedia($id, $paymentMethodConfiguration, $context);

src/Core/Api/Transaction/Service/TransactionService.php

@@ -8,7 +8,7 @@ use Shopware\Core\{
     Checkout\Cart\CartException,
     Checkout\Cart\LineItem\LineItem,
     Checkout\Order\OrderEntity,
-    Checkout\Payment\Cart\PaymentTransactionStruct,
+    Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
     Framework\Context,
     Framework\DataAbstractionLayer\Search\Criteria,
     Framework\DataAbstractionLayer\Search\Filter\EqualsFilter,
@@ -115,7 +115,7 @@ class TransactionService
      *
      * A redirect to the url will be performed
      *
-     * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+     * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
      * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
      *
      * @return string
@@ -124,14 +124,10 @@ class TransactionService
      * @throws \VRPayment\Sdk\VersioningException
      */
     public function create(
-        PaymentTransactionStruct $transaction,
+        AsyncPaymentTransactionStruct $transaction,
         SalesChannelContext           $salesChannelContext
     ): string
     {
-        $criteria = new Criteria([$transaction->getOrderTransactionId()]);
-        $criteria->addAssociation('order');
-        $orderTransaction = $this->container->get('order_transaction.repository')->search($criteria, $salesChannelContext->getContext())->first();
-
         $salesChannelId = $salesChannelContext->getSalesChannel()->getId();
         $settings = $this->settingsService->getSettings($salesChannelId);
         $apiClient = $settings->getApiClient();
@@ -169,7 +165,7 @@ class TransactionService
 
         $redirectUrl = $this->container->get('router')->generate(
             'frontend.vrpayment.checkout.pay',
-            ['orderId' => $orderTransaction->getOrder()->getId(),],
+            ['orderId' => $transaction->getOrder()->getId(),],
             UrlGeneratorInterface::ABSOLUTE_URL
         );
 
@@ -181,8 +177,8 @@ class TransactionService
         $this->upsert(
             $createdTransaction,
             $salesChannelContext->getContext(),
-            $orderTransaction->getPaymentMethodId(),
-            $orderTransaction->getOrder()->getSalesChannelId()
+            $transaction->getOrderTransaction()->getPaymentMethodId(),
+            $transaction->getOrder()->getSalesChannelId()
         );
         $_SESSION['transactionId'] = null;
         $_SESSION['arrayOfPossibleMethods'] = null;
@@ -190,26 +186,26 @@ class TransactionService
         $_SESSION['currencyCheck'] = null;
 
 
-        $this->holdDelivery($orderTransaction->getOrder()->getId(), $salesChannelContext->getContext());
+        $this->holdDelivery($transaction->getOrder()->getId(), $salesChannelContext->getContext());
 
         return $redirectUrl;
     }
 
     /**
-     * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+     * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
      * @param \Shopware\Core\Framework\Context $context
      * @param int $vrpaymentTransactionId
      * @param int $spaceId
      */
     protected function addVRPaymentTransactionId(
-        PaymentTransactionStruct $transaction,
+        AsyncPaymentTransactionStruct $transaction,
         Context                       $context,
         int                           $vrpaymentTransactionId,
         int                           $spaceId
     ): void
     {
         $data = [
-            'id' => $transaction->getOrderTransactionId(),
+            'id' => $transaction->getOrderTransaction()->getId(),
             'customFields' => [
                 TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_TRANSACTION_ID => $vrpaymentTransactionId,
                 TransactionPayload::ORDER_TRANSACTION_CUSTOM_FIELDS_VRPAYMENT_SPACE_ID => $spaceId,
@@ -347,7 +343,7 @@ class TransactionService
      *
      * @return \Shopware\Core\Checkout\Order\OrderEntity
      */
-    protected function getOrderEntity(string $orderId, Context $context): OrderEntity
+    private function getOrderEntity(string $orderId, Context $context): OrderEntity
     {
         try {
             $criteria = (new Criteria([$orderId]))->addAssociations(['deliveries']);

src/Core/Checkout/Cart/CustomCartPersister.php

@@ -1,59 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace VRPaymentPayment\Core\Checkout\Cart;
-
-use Shopware\Core\Checkout\Cart\AbstractCartPersister;
-use Shopware\Core\Checkout\Cart\Cart;
-use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use VRPaymentPayment\Core\Checkout\PaymentHandler\VRPaymentPaymentHandler;
-
-class CustomCartPersister extends AbstractCartPersister
-{
-	private AbstractCartPersister $inner;
-
-	public function __construct(AbstractCartPersister $inner)
-	{
-		$this->inner = $inner;
-	}
-
-	public function delete(string $token, SalesChannelContext $context): void
-	{
-		if (!$context->getContext()->hasState('do-cart-delete') && $this->isWhiteLabelPayment($context)) {
-			return;
-		}
-
-		$this->inner->delete($token, $context);
-	}
-
-	public function load(string $token, SalesChannelContext $context): Cart
-	{
-		return $this->inner->load($token, $context);
-	}
-
-	public function save(Cart $cart, SalesChannelContext $context): void
-	{
-		$this->inner->save($cart, $context);
-	}
-
-	public function replace(string $oldToken, string $newToken, SalesChannelContext $context): void
-	{
-		$this->inner->replace($oldToken, $newToken, $context);
-	}
-
-	public function getDecorated(): AbstractCartPersister
-	{
-		return $this->inner;
-	}
-
-	private function isWhiteLabelPayment(SalesChannelContext $context): bool
-	{
-		$paymentMethod = $context->getPaymentMethod();
-
-		if (!$paymentMethod instanceof PaymentMethodEntity) {
-			return false;
-		}
-
-		return $paymentMethod->getHandlerIdentifier() === VRPaymentPaymentHandler::class;
-	}
-}

src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php

@@ -4,30 +4,16 @@ namespace VRPaymentPayment\Core\Checkout\PaymentHandler;
 
 use Psr\Log\LoggerInterface;
 use Shopware\Core\{
-    Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity,
     Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler,
-    Checkout\Payment\Cart\PaymentTransactionStruct,
-    Checkout\Payment\Cart\PaymentHandler\AbstractPaymentHandler,
-    Checkout\Payment\Cart\PaymentHandler\PaymentHandlerType,
+    Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
+    Checkout\Payment\Cart\PaymentHandler\AsynchronousPaymentHandlerInterface,
+    Checkout\Payment\Exception\AsyncPaymentFinalizeException,
+    Checkout\Payment\Exception\AsyncPaymentProcessException,
     Checkout\Payment\PaymentException,
     Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException,
-    Framework\App\AppException,
-    Framework\Api\Context\SalesChannelApiSource,
-    Framework\Context,
-    Framework\DataAbstractionLayer\EntityRepository,
-    Framework\DataAbstractionLayer\Search\Criteria,
-    Framework\DataAbstractionLayer\Search\Sorting\FieldSorting,
-    Framework\Struct\Struct,
     Framework\Validation\DataBag\RequestDataBag,
-    System\SalesChannel\Context\SalesChannelContextService,
-    System\SalesChannel\Context\SalesChannelContextServiceParameters
+    System\SalesChannel\SalesChannelContext
 };
-use Shopware\Core\Framework\Util\Random;
-use VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister;
-use Shopware\Core\Checkout\Cart\Cart;
-use Shopware\Core\Checkout\Cart\CartPersister;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-
 use Symfony\Component\{
     HttpFoundation\RedirectResponse,
     HttpFoundation\Request
@@ -41,14 +27,9 @@ use VRPaymentPayment\Core\Api\Transaction\Service\TransactionService;
  *
  * @package VRPaymentPayment\Core\Checkout\PaymentHandler
  */
-class VRPaymentPaymentHandler extends AbstractPaymentHandler
+class VRPaymentPaymentHandler implements AsynchronousPaymentHandlerInterface
 {
 
-    /**
-     * @var CustomCartPersister
-     */
-    private CustomCartPersister $cartPersister;
-
     /**
      * @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
      */
@@ -63,34 +44,22 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
      */
     private $orderTransactionStateHandler;
 
-    protected SalesChannelContextService $salesChannelContextService;
-
-    protected EntityRepository $orderTransactionRepository;
-
     /**
      * VRPaymentPaymentHandler constructor.
      *
      * @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
      * @param \Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler $orderTransactionStateHandler
-     * @param SalesChannelContextService $salesChannelContextService
-     * @param EntityRepository $orderTransactionRepository
      */
-    public function __construct(
-        CustomCartPersister $cartPersister,
-        TransactionService $transactionService,
-        OrderTransactionStateHandler $orderTransactionStateHandler,
-        SalesChannelContextService $salesChannelContextService,
-        EntityRepository $orderTransactionRepository
-    ) {
-        $this->cartPersister = $cartPersister;
+    public function __construct(TransactionService $transactionService, OrderTransactionStateHandler $orderTransactionStateHandler)
+    {
         $this->transactionService = $transactionService;
         $this->orderTransactionStateHandler = $orderTransactionStateHandler;
-        $this->salesChannelContextService = $salesChannelContextService;
-        $this->orderTransactionRepository = $orderTransactionRepository;
     }
 
     /**
      * @param \Psr\Log\LoggerInterface $logger
+     * @internal
+     * @required
      *
      */
     public function setLogger(LoggerInterface $logger): void
@@ -104,123 +73,78 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
      *
      * A redirect to the url will be performed
      *
-     * @param \Symfony\Component\HttpFoundation\Request
-     * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
-     * @param \Shopware\Core\Framework\Context $context
-     * @param \Shopware\Core\Framework\Struct\Struct $validateStruct
+     * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
+     * @param \Shopware\Core\Framework\Validation\DataBag\RequestDataBag $dataBag
+     * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function pay(
-        Request $request,
-        PaymentTransactionStruct $transaction,
-        Context           $context,
-        ?Struct $validateStruct
+        AsyncPaymentTransactionStruct $transaction,
+        RequestDataBag                $dataBag,
+        SalesChannelContext           $salesChannelContext
     ): RedirectResponse
     {
         try {
-            $orderTransactionId = $transaction->getOrderTransactionId();
-            $orderTransaction = $this->orderTransactionRepository->search(
-                (new Criteria([$orderTransactionId]))
-                    ->addAssociation('order'), $context
-            )->getEntities()->first();
-
-            $contextSource = $context->getSource();
-            if ($contextSource instanceof SalesChannelApiSource) {
-                $salesChannelContextId = $contextSource->getSalesChannelId();
-            }
-
-            $parameters = new SalesChannelContextServiceParameters($salesChannelContextId, $request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)), originalContext: $context);
-            $salesChannelContext = $this->salesChannelContextService->get($parameters);
             $redirectUrl = $transaction->getReturnUrl();
-
-            if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
+            if ($transaction->getOrder()->getAmountTotal() > 0) {
                 $transactionId = $_SESSION['transactionId'] ?? null;
                 if ($transactionId === null) {
-                    $this->transactionService->createPendingTransaction($transaction, $salesChannelContext);
+                    $this->transactionService->createPendingTransaction($salesChannelContext);
                 }
                 $redirectUrl = $this->transactionService->create($transaction, $salesChannelContext);
             }
             return new RedirectResponse($redirectUrl);
 
-        } catch (\Throwable $e) {
+        } catch (\Exception $e) {
             unset($_SESSION['transactionId']);
             $errorMessage = 'An error occurred during the communication with external payment gateway : ' . $e->getMessage();
             $this->logger->critical($errorMessage);
-            throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
+            throw new \Exception($transaction->getOrderTransaction()->getId() . ': ' . $errorMessage);
         }
     }
 
     /**
      * The finalize function will be called when the user is redirected back to shop from the payment gateway.
      *
+     * Throw a @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
-     * @param \Shopware\Core\Framework\Context $context
+     * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
      * @throws \VRPayment\Sdk\ApiException
      * @throws \VRPayment\Sdk\Http\ConnectionException
      * @throws \VRPayment\Sdk\VersioningException
-     * @throws \Exception when the payment was canceled by the customer
+     * @see AsyncPaymentFinalizeException exception if an error ocurres while calling an external payment API
+     * Throw a @see CustomerCanceledAsyncPaymentException exception if the customer canceled the payment process on
+     * payment provider page
+     *
      */
     public function finalize(
+        AsyncPaymentTransactionStruct $transaction,
         Request                       $request,
-        PaymentTransactionStruct $transaction,
-        Context                  $context
+        SalesChannelContext           $salesChannelContext
     ): void
     {
-        $orderTransactionId = $transaction->getOrderTransactionId();
-        $orderTransaction = $this->orderTransactionRepository->search(
-            (new Criteria([$orderTransactionId]))
-                ->addAssociation('order'), $context
-        )->getEntities()->first();
-
-        if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
+        if ($transaction->getOrder()->getAmountTotal() > 0) {
             $transactionEntity = $this->transactionService->getByOrderId(
-                $orderTransaction->getOrder()->getId(),
-                $context
+                $transaction->getOrder()->getId(),
+                $salesChannelContext->getContext()
             );
 
             $vRPaymentTransaction = $this->transactionService->read(
                 $transactionEntity->getTransactionId(),
-                $transactionEntity->getSalesChannelId()
+                $salesChannelContext->getSalesChannel()->getId()
             );
 
             if (in_array($vRPaymentTransaction->getState(), [TransactionState::FAILED])) {
                 $errorMessage = strtr('Customer canceled payment for :orderId on SalesChannel :salesChannelName', [
-                    ':orderId' => $orderTransaction->getOrder()->getId(),
-                    ':salesChannelName' => $transactionEntity->getSalesChannelId(),
+                    ':orderId' => $transaction->getOrder()->getId(),
+                    ':salesChannelName' => $salesChannelContext->getSalesChannel()->getName(),
                 ]);
                 unset($_SESSION['transactionId']);
                 $this->logger->info($errorMessage);
                 throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
             }
         } else {
-            $this->orderTransactionStateHandler->paid($orderTransaction->getId(), $context);
-        }
-
-        $token = $request->getSession()->get('sw-context-token');
-        if ($token) {
-            $salesChannelId = $transactionEntity->getSalesChannelId();
-            $parameters = new SalesChannelContextServiceParameters($salesChannelId, $token, originalContext: $context);
-            $salesChannelContext = $this->salesChannelContextService->get($parameters);
-
-            $salesChannelContext->getContext()->addState('do-cart-delete');
-            $this->logger->info('Clearing cart with token: ' . $token);
-            $this->cartPersister->delete($salesChannelContext->getToken(), $salesChannelContext);
+            $this->orderTransactionStateHandler->paid($transaction->getOrderTransaction()->getId(), $salesChannelContext->getContext());
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function supports(
-        PaymentHandlerType $type,
-        string $paymentMethodId,
-        Context $context
-        ): bool {
-        if ($type === PaymentHandlerType::RECURRING) {
-            return false;
-        }
-        return true;
-    }
-
 }

src/Core/Settings/Service/SettingsService.php

@@ -29,6 +29,31 @@ class SettingsService {
 	public const CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED  = 'storefrontWebhooksUpdateEnabled';
 	public const CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED  = 'storefrontPaymentsUpdateEnabled';
 
+	/**
+	 * List of config properties whose values allowed to be empty without triggering a warning in logger.
+	 * 
+	 * This list is derived from testing of all config properties. The plugin fails only when either spaceId, userId, applicationKey and/or integration is empty.
+	 * On top of that, spaceId, userId, applicationKey are marked as "required" input fields in admin interface.
+	 * 
+	 * It is worth considering updating this list whenever a new config is introduced in settings.
+	 * If new config is optional, left empty by design and not required for transactions to work, this list should be updated to avoid false-positive warnings.
+	 * 
+	 * @var array
+	 */
+	private const ALLOWED_EMPTY_CONFIGS = [
+		// Options
+		self::CONFIG_SPACE_VIEW_ID,
+		self::CONFIG_LINE_ITEM_CONSISTENCY_ENABLED,
+		self::CONFIG_EMAIL_ENABLED,
+		
+		// Storefront Options
+		self::CONFIG_STOREFRONT_INVOICE_DOWNLOAD_ENABLED,
+
+		// Advanced Options
+		self::CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED,
+		self::CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED
+	];
+
 	/**
 	 * @var \Shopware\Core\System\SystemConfig\SystemConfigService
 	 */
@@ -132,7 +157,13 @@ class SettingsService {
 			if ($property === '') {
 				continue;
 			}
-			if (!is_numeric($value) && empty($value)) {
+			// Space view id is only numeric setting which can be 0. If it is, rest of the loop is skipped.
+			if ($property === self::CONFIG_SPACE_VIEW_ID && $value === 0) {
+				$propertyValuePairs[$property] = $value;
+				continue;
+			}
+			// Check if $value is empty and is not in the list of configs which are allowed to be empty
+			if (empty($value) && !in_array($property, self::ALLOWED_EMPTY_CONFIGS, true)) {
 				$this->logger->warning(strtr('Empty value :value for settings :property.', [':property' => $property, ':value' => $value]));
 			}
 			$propertyValuePairs[$property] = $value;

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

@@ -10,7 +10,9 @@ use Shopware\Core\{
 	Checkout\Cart\SalesChannel\CartService,
 	Checkout\Order\Aggregate\OrderLineItem\OrderLineItemCollection,
 	Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity,
+	Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler,
 	Checkout\Order\OrderEntity,
+	Checkout\Order\OrderDefinition,
 	Checkout\Order\SalesChannel\AbstractOrderRoute,
 	Framework\Context,
 	Framework\DataAbstractionLayer\Search\Criteria,
@@ -21,7 +23,9 @@ use Shopware\Core\{
 	Framework\Uuid\Uuid,
 	Framework\Uuid\Exception\InvalidUuidException,
 	Framework\Validation\DataBag\RequestDataBag,
-	System\SalesChannel\SalesChannelContext
+	System\SalesChannel\SalesChannelContext,
+	System\StateMachine\StateMachineRegistry,
+	System\StateMachine\Transition,
 };
 use Shopware\Storefront\{
 	Controller\StorefrontController,
@@ -43,7 +47,8 @@ use VRPaymentPayment\Core\{
 	Settings\Options\Integration,
 	Settings\Service\SettingsService,
 	Storefront\Checkout\Struct\CheckoutPageData,
-	Util\Payload\CustomProducts\CustomProductsLineItemTypes
+	Util\Payload\CustomProducts\CustomProductsLineItemTypes,
+	Util\Payload\TransactionPayload
 };
 
 
@@ -57,6 +62,18 @@ use VRPaymentPayment\Core\{
 #[Route(defaults: ['_routeScope' => ['storefront']])]
 class CheckoutController extends StorefrontController {
 
+	public const ORDER_STATE_CANCEL = 'cancel';
+
+	/**
+	 * @var \Shopware\Core\System\StateMachine\StateMachineRegistry
+	 */
+	private $stateMachineRegistry;
+
+	/**
+	 * @var \Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler
+	 */
+	protected $orderTransactionStateHandler;
+
 	/**
 	 * @var \Shopware\Storefront\Page\GenericPageLoader
 	 */
@@ -106,6 +123,8 @@ class CheckoutController extends StorefrontController {
 	 * @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
 	 * @param \Shopware\Storefront\Page\GenericPageLoaderInterface                          $genericLoader
 	 * @param \Shopware\Core\Checkout\Order\SalesChannel\AbstractOrderRoute                 $orderRoute
+	 * @param \Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler $orderTransactionStateHandler
+	 * @param \Shopware\Core\System\StateMachine\StateMachineRegistry $stateMachineRegistry
 	 */
 	public function __construct(
 		LineItemFactoryRegistry $lineItemFactoryRegistry,
@@ -113,7 +132,9 @@ class CheckoutController extends StorefrontController {
 		SettingsService $settingsService,
 		TransactionService $transactionService,
 		GenericPageLoaderInterface $genericLoader,
-		AbstractOrderRoute $orderRoute
+		AbstractOrderRoute $orderRoute,
+		OrderTransactionStateHandler $orderTransactionStateHandler,
+		StateMachineRegistry $stateMachineRegistry
 	)
 	{
 		$this->cartService             = $cartService;
@@ -122,6 +143,8 @@ class CheckoutController extends StorefrontController {
 		$this->transactionService      = $transactionService;
 		$this->lineItemFactoryRegistry = $lineItemFactoryRegistry;
 		$this->orderRoute = $orderRoute;
+		$this->orderTransactionStateHandler = $orderTransactionStateHandler;
+		$this->stateMachineRegistry = $stateMachineRegistry;
 	}
 
 	/**
@@ -380,6 +403,7 @@ class CheckoutController extends StorefrontController {
 			}
 
 			$transaction = $this->getTransaction($orderId, $salesChannelContext->getContext());
+			$orderTransactionId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
 			if (!empty($transaction->getUserFailureMessage())) {
 				$this->addFlash('danger', $transaction->getUserFailureMessage());
 			}
@@ -414,6 +438,18 @@ class CheckoutController extends StorefrontController {
 
 			}
 
+			// Close the old, existing order to prevent confusion for the customer
+			$this->orderTransactionStateHandler->cancel($orderTransactionId, $salesChannelContext->getContext());
+			$this->stateMachineRegistry->transition(
+				new Transition(
+					OrderDefinition::ENTITY_NAME,
+					$orderId,
+					self::ORDER_STATE_CANCEL,
+					'stateId'
+				),
+				$salesChannelContext->getContext()
+			);
+
 		} catch (\Exception $exception) {
 			$this->addFlash('danger', $this->trans('error.addToCartError'));
 			$this->logger->critical($exception->getMessage());

src/Core/Util/Analytics/Analytics.php

@@ -14,6 +14,7 @@ class Analytics {
 	public const SHOP_SYSTEM             = 'x-meta-shop-system';
 	public const SHOP_SYSTEM_VERSION     = 'x-meta-shop-system-version';
 	public const SHOP_SYSTEM_AND_VERSION = 'x-meta-shop-system-and-version';
+	public const PLUGIN_SYSTEM_VERSION   = 'x-meta-plugin-version';
 
 	/**
 	 * @return array
@@ -24,6 +25,7 @@ class Analytics {
 			self::SHOP_SYSTEM             => 'shopware',
 			self::SHOP_SYSTEM_VERSION     => '6',
 			self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
+			self::PLUGIN_SYSTEM_VERSION   => '6.1.16',
 		];
 	}
 

src/Core/Util/Payload/TransactionPayload.php

@@ -8,14 +8,10 @@ use Shopware\Core\{Checkout\Cart\Tax\Struct\CalculatedTaxCollection,
     Checkout\Customer\Aggregate\CustomerAddress\CustomerAddressEntity,
     Checkout\Customer\CustomerEntity,
     Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity,
-    Checkout\Order\OrderEntity,
-    Checkout\Payment\Cart\PaymentTransactionStruct,
+    Checkout\Payment\Cart\AsyncPaymentTransactionStruct,
     Framework\DataAbstractionLayer\Search\Criteria,
     System\SalesChannel\SalesChannelContext
 };
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
-
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use VRPayment\Sdk\{Model\AddressCreate,
@@ -40,10 +36,6 @@ use VRPaymentPayment\Core\{Api\PaymentMethodConfiguration\Entity\PaymentMethodCo
     Util\Payload\CustomProducts\CustomProductsLineItemTypes
 };
 
-use Shopware\Core\System\SystemConfig\SystemConfigService;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\System\Tax\TaxEntity;
-
 /**
  * Class TransactionPayload
  *
@@ -69,7 +61,7 @@ class TransactionPayload extends AbstractPayload
     protected $salesChannelContext;
 
     /**
-     * @var \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct
+     * @var \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct
      */
     protected $transaction;
 
@@ -93,10 +85,6 @@ class TransactionPayload extends AbstractPayload
      */
     protected $translator;
 
-    protected EntityRepository $orderTransactionRepository;
-
-    protected OrderEntity $order;
-
     /**
      * TransactionPayload constructor.
      *
@@ -104,14 +92,14 @@ class TransactionPayload extends AbstractPayload
      * @param \VRPaymentPayment\Core\Util\LocaleCodeProvider $localeCodeProvider
      * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
      * @param \VRPaymentPayment\Core\Settings\Struct\Settings $settings
-     * @param \Shopware\Core\Checkout\Payment\Cart\PaymentTransactionStruct $transaction
+     * @param \Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct $transaction
      */
     public function __construct(
         ContainerInterface            $container,
         LocaleCodeProvider            $localeCodeProvider,
         SalesChannelContext           $salesChannelContext,
         Settings                      $settings,
-        PaymentTransactionStruct $transaction
+        AsyncPaymentTransactionStruct $transaction
     )
     {
         $this->localeCodeProvider = $localeCodeProvider;
@@ -120,23 +108,6 @@ class TransactionPayload extends AbstractPayload
         $this->transaction = $transaction;
         $this->container = $container;
         $this->translator = $this->container->get('translator');
-        $this->orderTransactionRepository = $this->container->get('order_transaction.repository');
-
-        $criteria = (new Criteria());
-        $criteria->addFilter(new EqualsFilter('id', $this->transaction->getOrderTransactionId()));
-
-        $orders = $this->orderTransactionRepository->search($criteria, $this->salesChannelContext->getContext())->getEntities();
-        $orderId = $orders->first()->getOrderId();
-
-        $criteria = new Criteria([$orderId]);
-        $criteria
-            ->addAssociation('lineItems')
-            ->addAssociation('orderCustomer')
-            ->addAssociation('transactions')
-            ->addAssociation('currency')
-            ;
-
-        $this->order = $this->container->get('order.repository')->search($criteria, $this->salesChannelContext->getContext())->getEntities()->first();
     }
 
     /**
@@ -147,21 +118,13 @@ class TransactionPayload extends AbstractPayload
      */
     public function get(int $version): TransactionPending
     {
-        $customerId = $this->order->getOrderCustomer()->getCustomerId();
-        $criteria = new Criteria([$customerId]);
-        $criteria->addAssociation('activeBillingAddress')
-            ->addAssociation('activeShippingAddress')
-            ->addAssociation('activeShippingAddress')
-            ->addAssociation('defaultBillingAddress')
-            ->addAssociation('defaultShippingAddress')
-            ->addAssociation('salutation');
-        $customer = $this->container->get('customer.repository')->search($criteria, $this->salesChannelContext->getContext())->getEntities()->first();
+        $customer = $this->salesChannelContext->getCustomer();
 
         $lineItems = $this->getLineItems();
-
         $billingAddress = $this->getAddressPayload($customer, $customer->getActiveBillingAddress());
         $shippingAddress = $this->getAddressPayload($customer, $customer->getActiveShippingAddress(), false);
 
+
         $customerId = null;
         $customerName = null;
         if ($customer->getGuest() === false) {
@@ -174,14 +137,14 @@ class TransactionPayload extends AbstractPayload
         }
 
         $transactionData = [
-            'currency' => $this->order->getCurrency()->getIsoCode(),
-            'customer_email_address' => $customer->getEmail(),
+            'currency' => $this->salesChannelContext->getCurrency()->getIsoCode(),
+            'customer_email_address' => $billingAddress->getEmailAddress(),
             'customer_id' => $customerId,
             'language' => $this->localeCodeProvider->getLocaleCodeFromContext($this->salesChannelContext->getContext()) ?? null,
-            'merchant_reference' => $this->fixLength($this->order->getOrderNumber(), 100),
+            'merchant_reference' => $this->fixLength($this->transaction->getOrder()->getOrderNumber(), 100),
             'meta_data' => [
-                self::VRPAYMENT_METADATA_ORDER_ID => $this->order->getId(),
-                self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->order->getTransactions()->first()->getId(),
+                self::VRPAYMENT_METADATA_ORDER_ID => $this->transaction->getOrder()->getId(),
+                self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->transaction->getOrderTransaction()->getId(),
                 self::VRPAYMENT_METADATA_SALES_CHANNEL_ID => $this->salesChannelContext->getSalesChannel()->getId(),
                 self::VRPAYMENT_METADATA_CUSTOMER_NAME => $customerName,
             ],
@@ -198,8 +161,8 @@ class TransactionPayload extends AbstractPayload
             $transactionData['meta_data']['additionalAddress2'] = $additionalAddress2;
         }
 
-        if (!empty($this->order->getCustomerComment())) {
-            $transactionData['meta_data']['customer_comment'] = $this->order->getCustomerComment();
+        if (!empty($this->transaction->getOrder()->getCustomerComment())) {
+            $transactionData['meta_data']['customer_comment'] = $this->transaction->getOrder()->getCustomerComment();
         }
 
         $vatIds = $customer->getVatIds();
@@ -235,7 +198,7 @@ class TransactionPayload extends AbstractPayload
         $transactionPayload->setAllowedPaymentMethodConfigurations([$paymentConfiguration->getPaymentMethodConfigurationId()]);
 
         $successUrl = $this->transaction->getReturnUrl() . '&status=paid';
-        $failedUrl = $this->getFailUrl($this->order->getId()) . '&status=fail';
+        $failedUrl = $this->getFailUrl($this->transaction->getOrder()->getId()) . '&status=fail';
         $transactionPayload->setSuccessUrl($successUrl)
             ->setFailedUrl($failedUrl);
 
@@ -256,7 +219,7 @@ class TransactionPayload extends AbstractPayload
     protected function getLineItems(): array
     {
         $lineItems = [];
-        $items = $this->order->getLineItems() ?? [];
+        $items = $this->transaction->getOrder()->getLineItems();
 
         foreach ($items as $shopLineItem) {
             if ($this->shouldSkipLineItem($shopLineItem)) {
@@ -344,90 +307,27 @@ class TransactionPayload extends AbstractPayload
     protected function addDiscountLineItem($discount, array &$lineItems): void
     {
         $calculatedPrice = $discount->getPrice();
-        $discountName = $discount->getLabel() ?? 'Unnamed';
-        $definition = $discount->getPriceDefinition();
-
-        if ($this->order->getTaxStatus() === 'net' || $definition instanceof \Shopware\Core\Checkout\Cart\Price\Struct\AbsolutePriceDefinition) {
         $calculatedTaxesCollection = $calculatedPrice->getCalculatedTaxes();
+
         foreach ($calculatedTaxesCollection as $calculatedTax) {
             $rate = $calculatedTax->getTaxRate();
+            $lineItem = new LineItemCreate();
             $amount = $this->calculateDiscountAmount($calculatedTax);
 
-                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
-            }
-        } else {
-            $taxRules = $calculatedPrice->getTaxRules();
-
-            if ($taxRules && $taxRules->count() > 0) {
-                foreach ($taxRules as $taxRule) {
-                    $rate = $taxRule->getTaxRate();
-                    $amount = $calculatedPrice->getTotalPrice();
-                    $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
-                }
-            } else {
-                $rate = $this->getDefaultTaxRate();
-                $amount = $calculatedPrice->getTotalPrice();
-                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
-            }
-        }
-    }
-
-    /**
-     * @param string $discountName
-     * @param float $amount
-     * @param float $rate
-     * @return LineItemCreate
-     */
-    private function createDiscountLineItem(string $discountName, float $amount, float $rate): LineItemCreate
-    {
-        $lineItem = new LineItemCreate();
-
-        $discountSkuName = 'sku-discount-' . $rate . '-' . $discountName;
-        $discountTitle = sprintf('DISCOUNT: %s (%s%% tax)', $discountName, $rate);
-        if ($this->order->getTaxStatus() === 'tax-free') {
-            $discountSkuName = 'sku-discount-' . $discountName;
-            $discountTitle = sprintf('DISCOUNT: %s', $discountName);
-        }
-
+            $discountName = $discount->getLabel();
             $lineItem->setAmountIncludingTax($amount)
-            ->setName($discountTitle)
+              ->setName(sprintf('DISCOUNT: %s (%s%% tax)', $discount->getLabel(), $rate))
               ->setQuantity(1)
               ->setShippingRequired(false)
-            ->setSku($discountSkuName, 200)
+              ->setSku('sku-discount-' . $rate . '-' . $discountName, 200)
               ->setType(LineItemType::DISCOUNT)
-            ->setUniqueId('coupon-' . $discountSkuName);
+              ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName);
 
-        $taxRate = new TaxCreate([
-            'title' => 'Discount Tax: ' . $rate,
-            'rate' => $rate,
-        ]);
-
-        if ($this->order->getTaxStatus() !== 'tax-free') {
+            $taxRate = new TaxCreate(['title' => 'Discount Tax: ' . $rate, 'rate' => $rate]);
             $lineItem->setTaxes([$taxRate]);
+
+            $lineItems[] = $lineItem;
         }
-
-        return $lineItem;
-    }
-
-    /**
-     * @return float
-     */
-    private function getDefaultTaxRate(): float
-    {
-        /** @var SystemConfigService $systemConfigService */
-        $systemConfigService = $this->container->get(SystemConfigService::class);
-        $taxId = $systemConfigService->get('core.tax.defaultTaxRate');
-
-        if (!$taxId || !is_string($taxId)) {
-            return 21.0;
-        }
-
-        $criteria = new Criteria([$taxId]);
-        /** @var TaxRepository $taxRepository */
-        $taxRepository = $this->container->get('tax.repository');
-        $tax = $taxRepository->search($criteria, Context::createDefaultContext())->get($taxId);
-
-        return $tax instanceof TaxEntity ? $tax->getTaxRate() : 21.0;
     }
 
     /**
@@ -436,7 +336,7 @@ class TransactionPayload extends AbstractPayload
     protected function calculateDiscountAmount($calculatedTax): float
     {
         $amount = self::round($calculatedTax->getPrice());
-        if ($this->order->getTaxStatus() === 'net') {
+        if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
             $amount = self::round($amount + $calculatedTax->getTax());
         }
         return $amount;
@@ -457,7 +357,9 @@ class TransactionPayload extends AbstractPayload
      */
     protected function addOptionalLineItems(array &$lineItems): void
     {
-        if (count($this->order->getShippingCosts()->getCalculatedTaxes()) === 1) {
+        $shippingCosts = $this->transaction->getOrder()->getShippingCosts();
+
+        if ($shippingCosts && $this->transaction->getOrder()->getShippingTotal() > 0) {
             if ($shippingLineItem = $this->getShippingLineItem()) {
                 $lineItems[] = $shippingLineItem;
             }
@@ -479,7 +381,7 @@ class TransactionPayload extends AbstractPayload
     protected function getCustomProductOptionLabel(string $lineItemParentId): string
     {
         $label = '';
-        foreach ($this->order->getLineItems() as $shopLineItem) {
+        foreach ($this->transaction->getOrder()->getLineItems() as $shopLineItem) {
             if ($shopLineItem->getParentId() === $lineItemParentId && $shopLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_PRODUCT) {
                 $label = $shopLineItem->getLabel();
                 break;
@@ -504,11 +406,10 @@ class TransactionPayload extends AbstractPayload
             $sku = $payLoad['productNumber'];
         }
         $sku = $this->fixLength($sku, 200);
-
         $amount = $shopLineItem->getTotalPrice() ? self::round($shopLineItem->getTotalPrice()) : 0;
 
         //include Tax Excluded for Net Tax display customer group
-        if ($this->order->getTaxStatus() === 'net') {
+        if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
             $amount = self::round($amount + $shopLineItem->getPrice()->getCalculatedTaxes()->getAmount());
         }
 
@@ -544,10 +445,8 @@ class TransactionPayload extends AbstractPayload
         }
 
         if (!empty($taxes)) {
-            if ($this->order->getTaxStatus() !== 'tax-free') {
             $lineItem->setTaxes($taxes);
         }
-        }
 
         if ($shopLineItem->getTotalPrice() >= 0) {
             $lineItem->setType(LineItemType::PRODUCT);
@@ -622,34 +521,31 @@ class TransactionPayload extends AbstractPayload
     {
         try {
 
-            $amount = $this->order->getShippingTotal();
+            $amount = $this->transaction->getOrder()->getShippingTotal();
             $amount = self::round($amount);
 
             if ($amount > 0) {
 
                 $shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
                 $taxes = $this->getTaxes(
-                    $this->order->getShippingCosts()->getCalculatedTaxes(),
+                    $this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes(),
                     $shippingName
                 );
-                if ($this->order->getTaxStatus() === 'net') {
-                    $amount = self::round($amount + $this->order->getShippingCosts()->getCalculatedTaxes()->getAmount());
+                if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
+                    $amount = self::round($amount + $this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes()->getAmount());
                 }
 
 
                 $lineItem = (new LineItemCreate())
                     ->setAmountIncludingTax($amount)
                     ->setName($this->fixLength($shippingName . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
-                    ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
+                    ->setQuantity($this->transaction->getOrder()->getShippingCosts()->getQuantity() ?? 1)
+                    ->setTaxes($taxes)
                     ->setSku($this->fixLength($shippingName . '-Shipping', 200))
                     /** @noinspection PhpParamsInspection */
                     ->setType(LineItemType::SHIPPING)
                     ->setUniqueId($this->fixLength($shippingName . '-Shipping', 200));
 
-                if ($this->order->getTaxStatus() !== 'tax-free') {
-                    $lineItem->setTaxes($taxes);
-                }
-
                 if (!$lineItem->valid()) {
                     $this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
                     throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
@@ -670,15 +566,15 @@ class TransactionPayload extends AbstractPayload
     protected function getMultipleShippingLineItems(): array
     {
         try {
-            if ($this->order->getShippingTotal() > 0) {
+            if ($this->transaction->getOrder()->getShippingTotal() > 0) {
                 $lineItems = [];
                 $shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
 
                 $isFirst = true;
 
-                foreach ($this->order->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
+                foreach ($this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
                     $amount = self::round($taxItem->getPrice());
-                    if ($this->order->getTaxStatus() === 'net') {
+                    if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
                         $amount = self::round($amount + $taxItem->getTax());
                     }
                     $taxRate = $taxItem->getTaxRate();
@@ -690,15 +586,12 @@ class TransactionPayload extends AbstractPayload
                     $lineItem = (new LineItemCreate())
                       ->setAmountIncludingTax($amount)
                       ->setName($this->fixLength($name . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
-                      ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
+                      ->setQuantity($this->transaction->getOrder()->getShippingCosts()->getQuantity() ?? 1)
+                      ->setTaxes([$tax])
                       ->setSku($this->fixLength($name . '-Shipping', 200))
                       ->setType($isFirst ? LineItemType::SHIPPING : LineItemType::FEE) // First item as SHIPPING, rest as FEE
                       ->setUniqueId($this->fixLength($name . '-Shipping', 200));
 
-                    if ($this->order->getTaxStatus() !== 'tax-free') {
-                        $lineItem->setTaxes([$tax]);
-                    }
-
                     if (!$lineItem->valid()) {
                         $this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
                         throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
@@ -728,18 +621,28 @@ class TransactionPayload extends AbstractPayload
     {
         $lineItem = null;
 
-        $lineItemPriceTotal = array_sum(array_map(static function (LineItemCreate $lineItem) {
-            return $lineItem->getAmountIncludingTax();
-        }, $lineItems));
+        // Calculate total of all current line items
+        $lineItemPriceTotal = array_sum(array_map(static fn(LineItemCreate $li) => $li->getAmountIncludingTax(), $lineItems));
 
-        $adjustmentPrice = $this->order->getAmountTotal() - $lineItemPriceTotal;
-        $adjustmentPrice = self::round($adjustmentPrice);
+        $this->logger->debug("LineItem price total before adjustment: $lineItemPriceTotal");
+
+        // Get shipping total including taxes from the order
+        $shippingCosts = $this->transaction->getOrder()->getShippingCosts();
+        $shippingTotal = $shippingCosts ? self::round($shippingCosts->getTotalPrice()) : 0.0;
+
+        // Add shipping to the line items total if it's not already included
+        $hasShippingLineItem = array_filter($lineItems, static fn(LineItemCreate $li) => $li->getType() === LineItemType::SHIPPING);
+        if (!$hasShippingLineItem && $shippingTotal > 0) {
+            $lineItemPriceTotal += $shippingTotal;
+        }
+
+        $adjustmentPrice = self::round($this->transaction->getOrder()->getAmountTotal() - $lineItemPriceTotal);
 
         if (abs($adjustmentPrice) != 0) {
             if ($this->settings->isLineItemConsistencyEnabled()) {
                 $error = strtr('LineItems total :lineItemTotal does not add up to order total :orderTotal', [
                     ':lineItemTotal' => $lineItemPriceTotal,
-                    ':orderTotal' => $this->order->getAmountTotal(),
+                    ':orderTotal' => $this->transaction->getOrder()->getAmountTotal(),
                 ]);
                 $this->logger->critical($error);
                 throw new \Exception($error);

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-completion/index.html.twig

@@ -4,21 +4,21 @@
 		  @modal-close="$emit('modal-close')">
 
 	{% block vrpayment_order_action_completion_amount %}
-		<mt-checkbox
+		<sw-checkbox-field
 				:label="$tc('vrpayment-order.captureAction.button.text')"
-				v-model:checked="isCompletion">
-        </mt-checkbox>
+				v-model:value="isCompletion">
+        </sw-checkbox-field>
 	{% endblock %}
 
 	{% block vrpayment_order_action_completion_confirm_button %}
 	<template #modal-footer>
-		<mt-button variant="primary"
+		<sw-button variant="primary"
 				   @click="completion">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-by-amount/index.html.twig

@@ -4,23 +4,23 @@
 		  @modal-close="$emit('modal-close')">
 
 	{% block vrpayment_order_action_refund_amount_by_amount %}
-		<mt-number-field
+		<sw-number-field
 		 :max="refundableAmount"
 		 :min="0"
-		 v-model="refundAmount"
+		 v-model:value="refundAmount"
 		 :label="$tc('vrpayment-order.refund.refundAmount.label')"
 		 :suffix="currency">
-		</mt-number-field>
+		</sw-number-field>
 	{% endblock %}
 
 	{% block vrpayment_order_action_refund_confirm_button_by_amount %}
 	<template #modal-footer>
-		<mt-button variant="primary" @click="refundByAmount()">
+		<sw-button variant="primary" @click="refundByAmount()">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-partial/index.html.twig

@@ -4,13 +4,13 @@
 		  @modal-close="$emit('modal-close')">
 
 	{% block vrpayment_order_action_refund_amount_partial %}
-		<mt-number-field
+		<sw-number-field
 		 :max="this.$parent.$parent.itemRefundableAmount"
 		 :min="0.00"
-		 v-model="refundAmount"
+		 v-model:value="refundAmount"
 		 :label="$tc('vrpayment-order.refund.refundAmount.label')"
 		 :suffix="currency">
-		</mt-number-field>
+		</sw-number-field>
 
 		<div>
 			{{ $tc('vrpayment-order.refundAction.maxAvailableAmountToRefund') }}:
@@ -20,12 +20,12 @@
 
 	{% block vrpayment_order_action_refund_confirm_button_partial %}
 	<template #modal-footer>
-		<mt-button variant="primary" @click="createPartialRefund(this.$parent.$parent.currentLineItem)">
+		<sw-button variant="primary" @click="createPartialRefund(this.$parent.$parent.currentLineItem)">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-partial/index.js

@@ -47,9 +47,7 @@ Component.register('vrpayment-order-action-refund-partial', {
         createdComponent() {
             this.isLoading = false;
             this.currency = this.transactionData.transactions[0].currency;
-            if (!this.refundAmount) {
             this.refundAmount = this.$parent.$parent.itemRefundableAmount;
-            }
         },
 
 		createPartialRefund(itemUniqueId) {

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-selected/index.html.twig

@@ -5,12 +5,12 @@
 
 	{% block vrpayment_order_action_refund_confirm_button_selected %}
 	<template #modal-footer>
-		<mt-button variant="primary" @click="refundSelected()">
+		<sw-button variant="primary" @click="refundSelected()">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund/index.html.twig

@@ -5,12 +5,12 @@
 
 	{% block vrpayment_order_action_refund_amount %}
 
-		<mt-number-field
+		<sw-number-field
 			:max="this.$parent.$parent.itemRefundableQuantity"
 			:min="0"
-			 v-model="refundQuantity"
+			 v-model:value="refundQuantity"
 			 :label="$tc('vrpayment-order.refund.refundQuantity.label')">
-		</mt-number-field>
+		</sw-number-field>
 
 		<div>
 			{{ $tc('vrpayment-order.refundAction.maxAvailableItemsToRefund') }}:
@@ -20,12 +20,12 @@
 
 	{% block vrpayment_order_action_refund_confirm_button %}
 	<template #modal-footer>
-		<mt-button variant="primary" @click="refund()">
+		<sw-button variant="primary" @click="refund()">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-void/index.html.twig

@@ -4,22 +4,21 @@
 		  @modal-close="$emit('modal-close')">
 
 	{% block vrpayment_order_action_void_amount %}
-        {# Review if this v-model:checked="isVoid" needs to change to checked #}
-		<mt-checkbox
+		<sw-checkbox-field
 				:label="$tc('vrpayment-order.voidAction.confirm.message')"
-				v-model:checked="isVoid">
-        </mt-checkbox>
+				v-model:value="isVoid">
+        </sw-checkbox-field>
 	{% endblock %}
 
 	{% block vrpayment_order_action_void_confirm_button %}
 	<template #modal-footer>
-		<mt-button variant="primary"
+		<sw-button variant="primary"
 				   @click="voidPayment">
 			{{ $tc('vrpayment-order.refundAction.confirmButton.text') }}
-		</mt-button>
+		</sw-button>
 	</template>
 	{% endblock %}
 
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </sw-modal>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.html.twig

@@ -1,7 +1,6 @@
 {% block sw_order_detail_content_tabs_general %}
     {% parent %}
 
-{# sw-tabs-item will dissappear. See: https://github.com/shopware/shopware/blob/trunk/UPGRADE-6.7.md#sw-tabs-is-removed #}
 <sw-tabs-item v-if="isVRPaymentPayment"
 			  :route="{ name: 'vrpayment.order.detail', params: { id: $route.params.id } }"
 			  :title="$tc('vrpayment-order.header')">

src/Resources/app/administration/src/module/vrpayment-order/extension/sw-order/sw-order.scss

@@ -3,7 +3,7 @@
 	margin-top: 40px;
   }
 
-  .sw-order-detail-base .mt-card-view__content {
+  .sw-order-detail-base .sw-card-view__content {
 	overflow-x: visible;
 	overflow-y: visible;
   }

src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig

@@ -1,61 +1,61 @@
 {% block vrpayment_order_detail %}
 <div class="vrpayment-order-detail">
 	<div v-if="!isLoading">
-		<mt-card :title="$tc('vrpayment-order.paymentDetails.cardTitle')">
+		<sw-card :title="$tc('vrpayment-order.paymentDetails.cardTitle')">
 			<template #grid>
 				{% block vrpayment_order_actions_section %}
-				<mt-card-section secondary slim>
+				<sw-card-section secondary slim>
 					{% block vrpayment_order_transaction_refunds_action_button %}
-						<mt-button
+						<sw-button
 								variant="primary"
 								size="small"
 								:disabled="transaction.state != 'FULFILL' || refundableAmount <= 0"
 								@click="spawnModal('refundByAmount')">
 							{{ $tc('vrpayment-order.buttons.label.refund') }}
-						</mt-button>
+						</sw-button>
 					{% endblock %}
 					{% block vrpayment_order_transaction_completion_action_button %}
-					<mt-button
+					<sw-button
 							variant="primary"
 							size="small"
 							:disabled="transaction.state != 'AUTHORIZED' || isLoading"
 							@click="spawnModal('completion')">
 						{{ $tc('vrpayment-order.buttons.label.completion') }}
-					</mt-button>
+					</sw-button>
 					{% endblock %}
 					{% block vrpayment_order_transaction_void_action_button %}
-					<mt-button
+					<sw-button
 							variant="primary"
 							size="small"
 							:disabled="transaction.state != 'AUTHORIZED' || isLoading"
 							@click="spawnModal('void')">
 						{{ $tc('vrpayment-order.buttons.label.void') }}
-					</mt-button>
+					</sw-button>
 					{% endblock %}
 					{% block vrpayment_order_transaction_download_invoice_action_button %}
-					<mt-button
+					<sw-button
 							variant="primary"
 							size="small"
 							:disabled="transaction.state != 'FULFILL'"
 							@click="downloadInvoice()">
 						{{ $tc('vrpayment-order.buttons.label.download-invoice') }}
-					</mt-button>
+					</sw-button>
 					{% endblock %}
 					{% block vrpayment_order_transaction_download_packing_slip_action_button %}
-					<mt-button
+					<sw-button
 							variant="primary"
 							size="small"
 							:disabled="transaction.state != 'FULFILL'"
 							@click="downloadPackingSlip()">
 						{{ $tc('vrpayment-order.buttons.label.download-packing-slip') }}
-					</mt-button>
+					</sw-button>
 					{% endblock %}
-				</mt-card-section>
+				</sw-card-section>
 				{% endblock %}
 			</template>
-		</mt-card>
+		</sw-card>
 		{% block vrpayment_order_transaction_history_card %}
-		<mt-card :title="$tc('vrpayment-order.transactionHistory.cardTitle')">
+		<sw-card :title="$tc('vrpayment-order.transactionHistory.cardTitle')">
 			<template #grid>
 
 				{% block vrpayment_order_transaction_history_grid %}
@@ -78,10 +78,10 @@
 				{% endblock %}
 			</template>
 
-		</mt-card>
+		</sw-card>
 		{% endblock %}
 		{% block vrpayment_order_transaction_line_items_card %}
-        <mt-card :title="$tc('vrpayment-order.lineItem.cardTitle')">
+        <sw-card :title="$tc('vrpayment-order.lineItem.cardTitle')">
             <template #grid>
 
                 {% block vrpayment_order_transaction_line_items_grid %}
@@ -131,10 +131,10 @@
                     </sw-data-grid>
                 {% endblock %}
             </template>
-        </mt-card>
+        </sw-card>
 		{% endblock %}
 		{% block vrpayment_order_transaction_refunds_card %}
-		<mt-card :title="$tc('vrpayment-order.refund.cardTitle')" v-if="transactionData.refunds.length > 0">
+		<sw-card :title="$tc('vrpayment-order.refund.cardTitle')" v-if="transactionData.refunds.length > 0">
 			<template #grid>
 
 				{% block vrpayment_order_transaction_refunds_grid %}
@@ -147,7 +147,7 @@
 				{% endblock %}
 			</template>
 
-		</mt-card>
+		</sw-card>
 		{% endblock %}
 		{% block vrpayment_order_actions_modal_refund_partial %}
 			<vrpayment-order-action-refund-partial
@@ -195,6 +195,6 @@
 		</vrpayment-order-action-void>
 		{% endblock %}
 	</div>
-	<mt-loader v-if="isLoading"></mt-loader>
+	<sw-loader v-if="isLoading"></sw-loader>
 </div>
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-advanced-options/index.html.twig

@@ -1,4 +1,4 @@
-<mt-card class="mt-card"
+<sw-card class="sw-card"
 		 :title="$tc('vrpayment-settings.settingForm.advancedOptions.cardTitle')">
 	<sw-container>
 		<div v-if="actualConfigData" class="vrpayment-settings-advanced-options-fields">
@@ -7,16 +7,16 @@
 					:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED]"
 					:customInheritationCheckFunction="checkBoolFieldInheritance">
 				<template #content="props">
-					<mt-switch
+					<sw-switch-field
 							:name="CONFIG_STOREFRONT_WEBHOOKS_UPDATE_ENABLED"
 							bordered
 							:mapInheritance="props"
 							:label="$tc('vrpayment-settings.settingForm.advancedOptions.webhooksUpdateEnabled.label')"
 							:helpText="$tc('vrpayment-settings.settingForm.advancedOptions.webhooksUpdateEnabled.tooltipText')"
 							:disabled="props.isInherited"
-							:checked="props.currentValue"
-							@update:checked="props.updateCurrentValue">
-					</mt-switch>
+							:value="props.currentValue"
+							@update:value="props.updateCurrentValue">
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 
@@ -25,19 +25,19 @@
 					:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED]"
 					:customInheritationCheckFunction="checkBoolFieldInheritance">
 				<template #content="props">
-					<mt-switch
+					<sw-switch-field
 							:name="CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED"
 							bordered
 							:mapInheritance="props"
 							:label="$tc('vrpayment-settings.settingForm.advancedOptions.paymentsUpdateEnabled.label')"
 							:helpText="$tc('vrpayment-settings.settingForm.advancedOptions.paymentsUpdateEnabled.tooltipText')"
 							:disabled="props.isInherited"
-							:checked="props.currentValue"
-							@update:checked="props.updateCurrentValue">
-					</mt-switch>
+							:value="props.currentValue"
+							@update:value="props.updateCurrentValue">
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 		</div>
 	</sw-container>
-</mt-card>
+</sw-card>
 

src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig

@@ -1,6 +1,6 @@
 {% block vrpayment_settings_content_card_channel_config_credentials %}
-	<mt-card
-			class="mt-card"
+	<sw-card
+			class="sw-card"
 			:title="$tc('vrpayment-settings.settingForm.credentials.cardTitle')"
 			v-if="actualConfigData"
 	>
@@ -17,17 +17,17 @@
 									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_SPACE_ID]"
 									:customInheritationCheckFunction="checkNumberFieldInheritance">
 								<template #content="props">
-									<mt-number-field
+									<sw-number-field
 											:name="CONFIG_SPACE_ID"
 											:required="true"
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.credentials.spaceId.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.credentials.spaceId.tooltipText')"
 											:disabled="props.isInherited || !acl.can('vrpayment.editor')"
-											:model-value="props.currentValue"
+											:value="props.currentValue"
 											:error="spaceIdErrorState"
-											@update:model-value="props.updateCurrentValue">
-									</mt-number-field>
+											@update:value="props.updateCurrentValue">
+									</sw-number-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
@@ -38,17 +38,17 @@
 									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_USER_ID]"
 									:customInheritationCheckFunction="checkNumberFieldInheritance">
 								<template #content="props">
-									<mt-number-field
+									<sw-number-field
 											:name="CONFIG_USER_ID"
 											:required="true"
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.credentials.userId.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.credentials.userId.tooltipText')"
 											:disabled="props.isInherited || !acl.can('vrpayment.editor')"
-											:model-value="props.currentValue"
+											:value="props.currentValue"
 											:error="userIdErrorState"
-											@update:model-value="props.updateCurrentValue">
-									</mt-number-field>
+											@update:value="props.updateCurrentValue">
+									</sw-number-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
@@ -59,7 +59,7 @@
 									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_APPLICATION_KEY]"
 									:customInheritationCheckFunction="checkTextFieldInheritance">
 								<template #content="props">
-									<mt-password-field
+									<sw-password-field
 											:name="CONFIG_APPLICATION_KEY"
 											:required="true"
 											:passwordToggleAble="true"
@@ -67,29 +67,26 @@
 											:label="$tc('vrpayment-settings.settingForm.credentials.applicationKey.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.credentials.applicationKey.tooltipText')"
 											:disabled="props.isInherited || !acl.can('vrpayment.editor')"
-											:model-value="props.currentValue"
+											:value="props.currentValue"
 											:error="applicationKeyErrorState"
-											@update:model-value="props.updateCurrentValue">
-									</mt-password-field>
+											@update:value="props.updateCurrentValue">
+									</sw-password-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
 					</div>
 				{% endblock %}
 
-				{% verbatim %}
 				<sw-container columns="1fr 1fr" gap="0px 30px">
-					<mt-button
-							variant="primary"
+					<sw-button-process
 							:isLoading="isTesting"
 							@click="emitCheckApiConnectionEvent">
 						{{ $tc('vrpayment-settings.settingForm.credentials.button.label') }}
-					</mt-button>
+					</sw-button-process>
 				</sw-container>
-				{% endverbatim %}
 
 			</sw-container>
 		{% endblock %}
-	</mt-card>
+	</sw-card>
 
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-options/index.html.twig

@@ -1,5 +1,5 @@
 {% block vrpayment_settings_content_card_channel_config_options %}
-	<mt-card class="mt-card"
+	<sw-card class="sw-card"
 			 :title="$tc('vrpayment-settings.settingForm.options.cardTitle')">
 
 		{% block vrpayment_settings_content_card_channel_config_credentials_card_container %}
@@ -14,15 +14,15 @@
 									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_SPACE_VIEW_ID]"
 									:customInheritationCheckFunction="checkNumberFieldInheritance">
 								<template #content="props">
-									<mt-number-field
+									<sw-number-field
 											:name="CONFIG_SPACE_VIEW_ID"
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.options.spaceViewId.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.options.spaceViewId.tooltipText')"
 											:disabled="props.isInherited"
-											:model-value="props.currentValue"
-											@update:model-value="props.updateCurrentValue">
-									</mt-number-field>
+											:value="props.currentValue"
+											@update:value="props.updateCurrentValue">
+									</sw-number-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
@@ -55,16 +55,16 @@
 									:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_LINE_ITEM_CONSISTENCY_ENABLED]"
 									:customInheritationCheckFunction="checkBoolFieldInheritance">
 								<template #content="props">
-									<mt-switch
+									<sw-switch-field
 											:name="CONFIG_LINE_ITEM_CONSISTENCY_ENABLED"
 											bordered
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.options.lineItemConsistencyEnabled.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.options.lineItemConsistencyEnabled.tooltipText')"
 											:disabled="props.isInherited"
-											:checked="props.currentValue"
-											@update:checked="props.updateCurrentValue">
-									</mt-switch>
+											:value="props.currentValue"
+											@update:value="props.updateCurrentValue">
+									</sw-switch-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
@@ -75,16 +75,16 @@
 									:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_EMAIL_ENABLED]"
 									:customInheritationCheckFunction="checkBoolFieldInheritance">
 								<template #content="props">
-									<mt-switch
+									<sw-switch-field
 											:name="CONFIG_EMAIL_ENABLED"
 											bordered
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.options.emailEnabled.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.options.emailEnabled.tooltipText')"
 											:disabled="props.isInherited"
-											:checked="props.currentValue"
-											@update:checked="props.updateCurrentValue">
-									</mt-switch>
+											:value="props.currentValue"
+											@update:value="props.updateCurrentValue">
+									</sw-switch-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}
@@ -92,6 +92,6 @@
 				{% endblock %}
 			</sw-container>
 		{% endblock %}
-	</mt-card>
+	</sw-card>
 
 {% endblock %}

src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-settings-icon/index.html.twig

@@ -1,5 +1,5 @@
 {% block vrpayment_settings_icon %}
-    <span class="mt-icon icon--vrpayment-multicolor mt-icon--multicolor" style="width: 16px; height: 16px;">
+    <span class="sw-icon icon--vrpayment-multicolor sw-icon--multicolor">
         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" contentScriptType="text/ecmascript" y="0px" zoomAndPan="magnify" style="enable-background:new 0 0 632.126 170.079;" contentStyleType="text/css" viewBox="0 0 632.126 170.079" preserveAspectRatio="xMidYMid meet" xml:space="preserve" version="1.1">
 <style type="text/css" xml:space="preserve">
 	.st0{fill:none;}

src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-storefront-options/index.html.twig

@@ -1,4 +1,4 @@
-<mt-card class="mt-card"
+<sw-card class="sw-card"
 		 :title="$tc('vrpayment-settings.settingForm.storefrontOptions.cardTitle')">
 	<sw-container>
 		<div v-if="actualConfigData" class="vrpayment-settings-storefront-options-fields">
@@ -7,19 +7,19 @@
 					:inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_STOREFRONT_INVOICE_DOWNLOAD_ENABLED]"
 					:customInheritationCheckFunction="checkBoolFieldInheritance">
 				<template #content="props">
-					<mt-switch
+					<sw-switch-field
 							:name="CONFIG_STOREFRONT_INVOICE_DOWNLOAD_ENABLED"
 							bordered
 							:mapInheritance="props"
 							:label="$tc('vrpayment-settings.settingForm.storefrontOptions.invoiceDownloadEnabled.label')"
 							:helpText="$tc('vrpayment-settings.settingForm.storefrontOptions.invoiceDownloadEnabled.tooltipText')"
 							:disabled="props.isInherited"
-							:checked="props.currentValue"
-							@update:checked="props.updateCurrentValue">
-					</mt-switch>
+							:value="props.currentValue"
+							@update:value="props.updateCurrentValue">
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 		</div>
 	</sw-container>
-</mt-card>
+</sw-card>
 

src/Resources/app/administration/src/module/vrpayment-settings/page/vrpayment-settings/index.html.twig

@@ -5,7 +5,7 @@
 	<template #smart-bar-header>
 		<h2>
 			{{ $tc('sw-settings.index.title') }}
-			<mt-icon name="small-arrow-medium-right" size="16px"></mt-icon>
+			<sw-icon name="small-arrow-medium-right" small></sw-icon>
 			{{ $tc('vrpayment-settings.header') }}
 		</h2>
 	</template>
@@ -14,7 +14,7 @@
 	{% block vrpayment_settings_actions %}
 	<template #smart-bar-actions>
 		{% block vrpayment_settings_actions_save %}
-		<mt-button
+		<sw-button-process
 				v-model:value="isSaveSuccessful"
 				class="sw-settings-login-registration__save-action"
 				variant="primary"
@@ -22,7 +22,7 @@
 				:disabled="isLoading"
 				@click="onSave">
 			{{ $tc('vrpayment-settings.settingForm.save') }}
-		</mt-button>
+		</sw-button-process>
 		{% endblock %}
 	</template>
 	{% endblock %}
@@ -31,7 +31,7 @@
 	<template #content>
 
 		{% block vrpayment_settings_content_card %}
-		<mt-card-view>
+		<sw-card-view>
 
 			{% block vrpayment_settings_content_card_channel_config %}
 			<sw-sales-channel-config v-model:value="config"
@@ -42,7 +42,7 @@
 				<template #select="{ onInput, selectedSalesChannelId, salesChannel }">
 
 					{% block vrpayment_settings_content_card_channel_config_sales_channel_card %}
-					<mt-card title="Sales Channel Switch">
+					<sw-card title="Sales Channel Switch">
 
 						{% block vrpayment_settings_content_card_channel_config_sales_channel_card_title %}
 						<sw-single-select
@@ -66,19 +66,18 @@
 								{% endblock %}
 
 								{% block vrpayment_settings_content_card_channel_config_sales_channel_card_footer_container_button %}
-								<sw-button
-										variant="primary"
+								<sw-button-process
 										v-model:value="isSetDefaultPaymentSuccessful"
 										:isLoading="isSettingDefaultPaymentMethods"
 										@click="onSetPaymentMethodDefault">
 									{{ $tc('vrpayment-settings.salesChannelCard.button.label') }}
-								</sw-button>
+								</sw-button-process>
 								{% endblock %}
 							</sw-container>
 							{% endblock %}
 						</template>
 						{% endblock %}
-					</mt-card>
+					</sw-card>
 					{% endblock %}
 				</template>
 				{% endblock %}
@@ -135,9 +134,9 @@
 			{% endblock %}
 
 			{% block vrpayment_settings_content_card_loading %}
-			<mt-loader v-if="isLoading"></mt-loader>
+			<sw-loader v-if="isLoading"></sw-loader>
 			{% endblock %}
-		</mt-card-view>
+		</sw-card-view>
 		{% endblock %}
 
 	</template>

src/Resources/app/administration/src/module/vrpayment-settings/page/vrpayment-settings/index.js

@@ -65,6 +65,18 @@ Component.register('vrpayment-settings', {
         };
     },
 
+    created() {
+        // Registers a listener for the 'check-api-connection-event'.
+        // Triggered when this event is emitted.
+        this.$on('check-api-connection-event', this.onCheckApiConnection);
+    },
+
+    beforeDestroy() {
+        // Removes the listener for the 'check-api-connection-event'
+        // before the component is destroyed to prevent memory leaks.
+        this.$off('check-api-connection-event', this.onCheckApiConnection);
+    },
+
     watch: {
         config: {
             handler(configData) {

src/Resources/config/services/core/checkout.xml

@@ -6,21 +6,12 @@
 
 	<services>
 		<service id="VRPaymentPayment\Core\Checkout\PaymentHandler\VRPaymentPaymentHandler">
-			<argument type="service" id="VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister"/>
 			<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
 			<argument type="service" id="Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler"/>
-			<argument type="service" id="Shopware\Core\System\SalesChannel\Context\SalesChannelContextService"/>
-            <argument type="service" id="order_transaction.repository"/>
 			<call method="setLogger">
 				<argument type="service" id="monolog.logger.vrpayment_payment"/>
 			</call>
-			<tag name="shopware.payment.method"/>
-		</service>
-
-		<service id="VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister"
-				 decorates="Shopware\Core\Checkout\Cart\CartPersister"
-				 decoration-inner-name="VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister.inner">
-			<argument type="service" id="VRPaymentPayment\Core\Checkout\Cart\CustomCartPersister.inner"/>
+			<tag name="shopware.payment.method.async"/>
 		</service>
 	</services>
 

src/Resources/config/services/core/storefront/checkout.xml

@@ -13,16 +13,17 @@
 			<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
 			<argument type="service" id="Shopware\Storefront\Page\GenericPageLoader"/>
 			<argument type="service" id="Shopware\Core\Checkout\Order\SalesChannel\OrderRoute"/>
+			<argument type="service" id="Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler"/>
+			<argument type="service" id="Shopware\Core\System\StateMachine\StateMachineRegistry"/>
 			<call method="setLogger">
 				<argument type="service" id="monolog.logger.vrpayment_payment"/>
 			</call>
 			<call method="setContainer">
 				<argument type="service" id="service_container"/>
 			</call>
-            <!-- Removed in 6.7 -->
-            <!-- <call method="setTwig">
+            <call method="setTwig">
                 <argument type="service" id="twig"/>
-            </call> -->
+            </call>
 		</service>
 
 		<!-- Subscribers -->

src/Resources/public/administration/.vite/entrypoints.json

@@ -1,25 +0,0 @@
-{
-  "base": "/bundles/vrpaymentpayment/administration/",
-  "entryPoints": {
-    "v-r-payment-payment": {
-      "css": [
-        "/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-D4AH6HY2.css"
-      ],
-      "dynamic": [],
-      "js": [
-        "/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-CRU13hxm.js"
-      ],
-      "legacy": false,
-      "preload": []
-    }
-  },
-  "legacy": false,
-  "metadatas": {},
-  "version": [
-    "7.1.0",
-    7,
-    1,
-    0
-  ],
-  "viteServer": null
-}

src/Resources/public/administration/.vite/manifest.json

@@ -1,11 +0,0 @@
-{
-  "main.js": {
-    "file": "assets/v-r-payment-payment-CRU13hxm.js",
-    "name": "v-r-payment-payment",
-    "src": "main.js",
-    "isEntry": true,
-    "css": [
-      "assets/v-r-payment-payment-D4AH6HY2.css"
-    ]
-  }
-}

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

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

src/Resources/public/storefront/js/app.js

@@ -29,7 +29,7 @@
         payment_method_handler_status: 'input[name="vrpayment_payment_handler_validation_status"]',
         payment_form_id: 'confirmOrderForm',
         button_cancel_id: 'vrpaymentOrderCancel',
-        // button_home_override: 'vrpaymentHomeLink',
+        button_home_override: 'vrpaymentHomeLink',
         loader_id: 'vrpaymentLoader',
         checkout_url: null,
         checkout_url_id: 'checkoutUrl',
@@ -46,7 +46,7 @@
             this.cart_recreate_url = document.getElementById(this.cart_recreate_url_id).value;
 
             document.getElementById(this.button_cancel_id).addEventListener('click', this.recreateCart, false);
-            // document.getElementById(this.button_home_override).addEventListener('click', this.recreateCart, false);
+            document.getElementById(this.button_home_override).addEventListener('click', this.recreateCart, false);
             document.getElementById(this.payment_form_id).addEventListener('submit', this.submitPayment, false);
 
             VRPaymentCheckout.getIframe();

src/Resources/views/storefront/page/checkout/order/vrpayment.html.twig

@@ -1,9 +1,13 @@
 {% sw_extends '@Storefront/storefront/page/checkout/_page.html.twig' %}
 
+{% block base_header %}
+	{% sw_include '@VRPaymentPayment/storefront/page/checkout/order/vrpayment_header.html.twig' %}
+{% endblock %}
+
+{% block base_navigation %}{% endblock %}
 {% block base_body_classes %}vrpayment-payment is-act-confirmpage{% endblock %}
 
 {% block page_checkout_main_content %}
-    <div id="vrpaymentOrderCancel"></div>
 	{% block page_checkout_pay %}
 		{% block page_checkout_confirm_header %}
             <h1 class="confirm-main-header">
@@ -140,6 +144,10 @@
     </div>
 {% endblock %}
 
+{% block base_footer %}
+	{% sw_include '@Storefront/storefront/layout/footer/footer-minimal.html.twig' %}
+{% endblock %}
+
 {% block base_body_script %}
 	{{ parent() }}
 	{% if page.extensions.vRPaymentData %}

src/Resources/views/storefront/page/checkout/order/vrpayment_header.html.twig

@@ -0,0 +1,53 @@
+{% sw_extends '@Storefront/storefront/layout/header/header-minimal.html.twig' %}
+
+{% block layout_header_minimal_logo %}
+    <div class="col-6 col-md-4 header-minimal-logo">
+        {% block layout_header_logo_inner %}
+            <div class="header-logo-main">
+                {% block layout_header_logo_link %}
+                    <a class="header-logo-main-link"
+                    id="vrpaymentHomeLink"
+                    href="{{ path('frontend.home.page') }}"
+                    title="{{ "header.logoLink"|trans|striptags }}">
+                        {% block layout_header_logo_image %}
+                            <picture class="header-logo-picture">
+                                    {% block layout_header_logo_image_tablet %}
+                                    {% if theme_config('sw-logo-tablet') and theme_config('sw-logo-tablet') != theme_config('sw-logo-desktop') %}
+                                        <source srcset="{{ theme_config('sw-logo-tablet') |sw_encode_url }}"
+                                                media="(min-width: {{ theme_config('breakpoint.md') }}px) and (max-width: {{ theme_config('breakpoint.lg') - 1 }}px)">
+                                    {% endif %}
+                                {% endblock %}
+
+                                {% block layout_header_logo_image_mobile %}
+                                    {% if theme_config('sw-logo-mobile') and theme_config('sw-logo-mobile') != theme_config('sw-logo-desktop') %}
+                                        <source srcset="{{ theme_config('sw-logo-mobile') |sw_encode_url }}"
+                                                media="(max-width: {{ theme_config('breakpoint.md') - 1 }}px)">
+                                    {% endif %}
+                                {% endblock %}
+
+                                {% block layout_header_logo_image_default %}
+                                    {% if theme_config('sw-logo-desktop') %}
+                                        <img src="{{ theme_config('sw-logo-desktop') |sw_encode_url }}"
+                                            alt="{{ "header.logoLink"|trans|striptags }}"
+                                            class="img-fluid header-logo-main-img"/>
+                                    {% endif %}
+                                {% endblock %}
+                            </picture>
+                        {% endblock %}
+                    </a>
+                {% endblock %}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}
+
+{% block layout_header_minimal_button %}
+    <div class="col-md-4 header-minimal-back-to-shop">
+        <button type="button"
+            id="vrpaymentOrderCancel"
+            class="btn btn-outline-primary header-minimal-back-to-shop-button"
+            title="{{ "checkout.finishButtonBackToShop"|trans|striptags }}">
+            {{ "checkout.finishButtonBackToShop"|trans|striptags }}
+        </button>
+    </div>
+{% endblock %}

src/VRPaymentPayment.php

@@ -3,7 +3,6 @@
 namespace VRPaymentPayment;
 
 use Shopware\Core\{
-  	Framework\Feature,
 	Framework\Plugin,
 	Framework\Plugin\Context\ActivateContext,
 	Framework\Plugin\Context\DeactivateContext,
@@ -22,7 +21,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
 use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 // expect the vendor folder on Shopware store releases
 if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
@@ -84,21 +82,19 @@ class VRPaymentPayment extends Plugin {
 	{
 		parent::build($container);
 
-		$confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
-		$locator = new FileLocator($confDir);
+		$locator = new FileLocator('Resources/config');
 
 		$resolver = new LoaderResolver([
 			new YamlFileLoader($container, $locator),
-		  new XmlFileLoader($container, $locator),
 			new GlobFileLoader($container, $locator),
 			new DirectoryLoader($container, $locator),
 		]);
 
 		$configLoader = new DelegatingLoader($resolver);
 
-		$configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
+		$confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
 
-		$configLoader->load('services/core/checkout.xml');
+		$configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
 	}
 
 	public function enrichPrivileges(): array