Release 7.1.3

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 7.1.3
+- Fixed issue with radio button/switch settings not saving
+- Fixed issue with error screen sporadically happening after failed payments
+
+# 7.1.2
+- Support the ability to have different spaces for differet sales channels
+- Fixed issue where Twint would not appear sometimes
+
+# 7.1.1
+- Updated documentation
+- Fixed issue with addresses not being correctly synced
+
 # 7.1.0
 ## Feature
 - Support subscription payment methods

CHANGELOG_de-DE.md

@@ -1,3 +1,15 @@
+# 7.1.3
+– Problem behoben, bei dem die Einstellungen von Optionsfeldern/Schaltern nicht gespeichert wurden.
+– Problem behoben, bei dem nach fehlgeschlagenen Zahlungen sporadisch ein Fehlerbildschirm angezeigt wurde.
+
+# 7.1.2
+- Unterstützung der Möglichkeit, unterschiedliche Bereiche für verschiedene Vertriebskanäle zu nutzen.
+- Problem behoben, bei dem Twint manchmal nicht angezeigt wurde.
+
+# 7.1.1
+- Dokumentation aktualisiert
+- Problem behoben, bei dem Adressen nicht korrekt synchronisiert wurden.
+
 # 7.1.0
 – Unterstützung für Abonnement-Zahlungsmethoden
 – Support für Shopware 6.7.2.0

README.md

@@ -13,10 +13,10 @@ Please note that this plugin is for versions 6.5, 6.6 or 6.7. For the 6.4 plugin
 
 ## Documentation
 
-- For English documentation click [here](@WalleeDocPath(/docs/en/documentation.html))
+- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/en/documentation.html)
-- Für die deutsche Dokumentation klicken Sie [hier](@WalleeDocPath(/docs/de/documentation.html))
+- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/de/documentation.html)
-- Pour la documentation Française, cliquez [ici](@WalleeDocPath(/docs/fr/documentation.html))
+- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/fr/documentation.html)
-- Per la documentazione in tedesco, clicca [qui](@WalleeDocPath(/docs/it/documentation.html))
+- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/it/documentation.html)
 
 ## Installation
 
@@ -48,6 +48,15 @@ bin/console plugin:install --activate --clearCache VRPayment
 1. Navigate to Shopware Admin > Settings > VRPayment.
 2. Enter your Space ID, User ID, and API Key (obtained from the [VR Payment Portal](https://gateway.vr-payment.de/)).
 
+### VRPayment does not appear in Settings
+
+1. You should run the following commmand
+
+```bash
+Copy
+bin/build-administration.sh
+```
+
 ### Payment Methods
 
 Configure supported methods (e.g., credit cards, Apple Pay) via the [VR Payment Portal](https://gateway.vr-payment.de/).

composer.json

@@ -59,5 +59,5 @@
     "vrpayment/sdk": "^4.0.0"
   },
   "type": "shopware-platform-plugin",
-  "version": "7.1.1"
+  "version": "7.1.3"
 }

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="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/de/documentation.html)" />
+		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/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="@WalleeReleasePath()">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.3/">
 			Source
 		</a>
 	</li>
@@ -183,6 +183,19 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
 </li>
 </ol>
 </div>					</div>
+</div>					<div class="section" id="_vrpayment_erscheint_nicht_in_den_einstellungen">
+	<div class="section-title">
+		<h2>
+			<span class="title-number">4.4</span>VRPayment erscheint nicht in den Einstellungen					</h2>
+	</div>
+	<div class="section-body">
+					<div class="paragraph">
+<p>Folgender Befehl muss ausgeführt werden</p>
+</div><div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">bin/build-administration.sh</code></pre>
+</div>
+</div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="portal-startup-guide">
 	<div class="chapter-title">
@@ -888,6 +901,11 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.</p>
 		<span class="item-number">4.3</span>
 		<span class="item-title">Via Composer (Recommended)</span>
 			</a>
+    </li>    		    			<li class="nav-level-2">
+	<a href="#_vrpayment_erscheint_nicht_in_den_einstellungen">
+		<span class="item-number">4.4</span>
+		<span class="item-title">VRPayment erscheint nicht in den Einstellungen</span>
+			</a>
     </li>    		    	</ul>
     </li>					<li class="nav-level-1">
 	<a href="#portal-startup-guide">

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="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/en/documentation.html)" />
+		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/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="@WalleeReleasePath()">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.3/">
 			Source
 		</a>
 	</li>
@@ -179,6 +179,19 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
 </li>
 </ol>
 </div>					</div>
+</div>					<div class="section" id="_vrpayment_does_not_appear_in_settings">
+	<div class="section-title">
+		<h2>
+			<span class="title-number">4.4</span>VRPayment does not appear in Settings					</h2>
+	</div>
+	<div class="section-body">
+					<div class="paragraph">
+<p>You should run the following commmand</p>
+</div><div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">bin/build-administration.sh</code></pre>
+</div>
+</div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="portal-startup-guide">
 	<div class="chapter-title">
@@ -905,6 +918,11 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m
 		<span class="item-number">4.3</span>
 		<span class="item-title">Manual Installation</span>
 			</a>
+    </li>    		    			<li class="nav-level-2">
+	<a href="#_vrpayment_does_not_appear_in_settings">
+		<span class="item-number">4.4</span>
+		<span class="item-title">VRPayment does not appear in Settings</span>
+			</a>
     </li>    		    	</ul>
     </li>					<li class="nav-level-1">
 	<a href="#portal-startup-guide">

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="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/fr/documentation.html)" />
+		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/VRPaymentPayment/docs/fr/documentation.html" />
 		<title>VR 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="@WalleeReleasePath()">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.3/">
 			Source
 		</a>
 	</li>
@@ -170,6 +170,19 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
 php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
 </div>
 </div>					</div>
+</div>					<div class="section" id="_si_vrpayment_n_apparaît_pas_dans_les_paramètres">
+	<div class="section-title">
+		<h2>
+			<span class="title-number">4.4</span>Si VRPayment n&#8217;apparaît pas dans les paramètres					</h2>
+	</div>
+	<div class="section-body">
+					<div class="paragraph">
+<p>Vous devez exécuter la commande suivante</p>
+</div><div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">bin/build-administration.sh</code></pre>
+</div>
+</div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="portal-startup-guide">
 	<div class="chapter-title">
@@ -876,6 +889,11 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.</p>
 		<span class="item-number">4.3</span>
 		<span class="item-title">Via Composer (Recommended)</span>
 			</a>
+    </li>    		    			<li class="nav-level-2">
+	<a href="#_si_vrpayment_n_apparaît_pas_dans_les_paramètres">
+		<span class="item-number">4.4</span>
+		<span class="item-title">Si VRPayment n&amp;#8217;apparaît pas dans les paramètres</span>
+			</a>
     </li>    		    	</ul>
     </li>					<li class="nav-level-1">
 	<a href="#portal-startup-guide">

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="@WalleeCanonicalPath(https://plugin-documentation.wallee.com/wallee-payment, VRPaymentPayment/docs/it/documentation.html)" />
+		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/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="@WalleeReleasePath()">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.3/">
 			Source
 		</a>
 	</li>
@@ -177,6 +177,19 @@ php bin/console plugin:install --activate --clearCache VRPayment</code></pre>
 </li>
 </ol>
 </div>					</div>
+</div>					<div class="section" id="_vrpayment_non_appare_nelle_impostazioni">
+	<div class="section-title">
+		<h2>
+			<span class="title-number">4.4</span>VRPayment non appare nelle impostazioni					</h2>
+	</div>
+	<div class="section-body">
+					<div class="paragraph">
+<p>Dovrebbe eseguire il seguente comando</p>
+</div><div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">bin/build-administration.sh</code></pre>
+</div>
+</div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="portal-startup-guide">
 	<div class="chapter-title">
@@ -887,6 +900,11 @@ La tokenizzazione non è disponibile per i checkout degli ospiti.
 		<span class="item-number">4.3</span>
 		<span class="item-title">Installazione manuale</span>
 			</a>
+    </li>    		    			<li class="nav-level-2">
+	<a href="#_vrpayment_non_appare_nelle_impostazioni">
+		<span class="item-number">4.4</span>
+		<span class="item-title">VRPayment non appare nelle impostazioni</span>
+			</a>
     </li>    		    	</ul>
     </li>					<li class="nav-level-1">
 	<a href="#portal-startup-guide">

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

@@ -251,9 +251,9 @@ class PaymentMethodConfigurationService {
 	{
 		$data                          = [];
 		$paymentMethodData             = [];
-		$salesChannelPaymentMethodData = [];
 
-		$criteria = (new Criteria())->addFilter(new EqualsFilter('state', 'ACTIVE'));
+		$criteria = (new Criteria())->addFilter(new EqualsFilter('state', 'ACTIVE'))
+		  ->addFilter(new EqualsFilter('spaceId', $this->getSpaceId()));
 
 		/**
 		 * @var $vRPaymentPMConfigurationRepository
@@ -344,40 +344,67 @@ class PaymentMethodConfigurationService {
 		$paymentMethodConfigurations = $this->getPaymentMethodConfigurations();
 		$this->logger->debug('Updating payment methods', $paymentMethodConfigurations);
 
-		/**
-		 * @var $paymentMethodConfiguration \VRPayment\Sdk\Model\PaymentMethodConfiguration
-		 */
 		foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
-
+			$entity = $this->getPaymentMethodConfigurationEntity(
-			$paymentMethodConfigurationEntity = $this->getPaymentMethodConfigurationEntity(
 			  $paymentMethodConfiguration->getSpaceId(),
 			  $paymentMethodConfiguration->getId(),
 			  $context
 			);
 
-			$id = is_null($paymentMethodConfigurationEntity) ? Uuid::randomHex() : $paymentMethodConfigurationEntity->getId();
+			$configId = $entity ? $entity->getId() : Uuid::randomHex();
+			$technicalName = $paymentMethodConfiguration->getName();
+
+			$paymentMethodId = $this->getOrCreatePaymentMethodId(
+			  $technicalName,
+			  VRPaymentPaymentHandler::class,
+			  $context
+			);
 
 			$data = [
-				'id'                           => $id,
+			  'id'                           => $configId,
 			  'paymentMethodConfigurationId' => $paymentMethodConfiguration->getId(),
-				'paymentMethodId'              => $id,
+			  'paymentMethodId'              => $paymentMethodId,
 			  'data'                         => json_decode(strval($paymentMethodConfiguration), true),
 			  'sortOrder'                    => $paymentMethodConfiguration->getSortOrder(),
 			  'spaceId'                      => $paymentMethodConfiguration->getSpaceId(),
 			  'state'                        => CreationEntityState::ACTIVE,
 			];
 
-			$this->upsertPaymentMethod($id, $paymentMethodConfiguration, $context);
-
 			try {
-                $this->container->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository')->upsert([$data], $context);
+				$this->upsertPaymentMethod($paymentMethodId, $paymentMethodConfiguration, $context);
+				$this->container
+				  ->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository')
+				  ->upsert([$data], $context);
 			} catch (\Exception $e) {
 				$this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
 			}
-
 		}
 	}
 
+	private function getOrCreatePaymentMethodId(string $technicalName, string $handlerIdentifier, Context $context): string
+	{
+		$criteria = new Criteria();
+		$criteria->addFilter(new EqualsFilter('technicalName', $technicalName));
+		$criteria->setLimit(1);
+
+		$existing = $this->paymentMethodRepository->search($criteria, $context)->first();
+		if ($existing !== null) {
+			return $existing->getId();
+		}
+
+		$paymentMethodId = Uuid::randomHex();
+
+		$this->paymentMethodRepository->upsert([[
+		  'id' => $paymentMethodId,
+		  'handlerIdentifier' => $handlerIdentifier,
+		  'technicalName' => $technicalName,
+		  'name' => $technicalName,
+		  'active' => false,
+		]], $context);
+
+		return $paymentMethodId;
+	}
+
 	/**
 	 * Fetch active merchant payment methods from VRPayment API
 	 *
@@ -467,53 +494,6 @@ class PaymentMethodConfigurationService {
 		return $configurations->getElements();
 	}
 
-	/**
-	 * Update or insert Payment Method
-	 *
-	 * @param string                                                      $id
-	 * @param \VRPayment\Sdk\Model\PaymentMethodConfiguration $paymentMethodConfiguration
-	 * @param \Shopware\Core\Framework\Context                            $context
-	 *
-	 * @throws \VRPayment\Sdk\ApiException
-	 * @throws \VRPayment\Sdk\Http\ConnectionException
-	 * @throws \VRPayment\Sdk\VersioningException
-	 */
-	protected function upsertPaymentMethod(
-		string $id,
-		PaymentMethodConfiguration $paymentMethodConfiguration,
-		Context $context
-	): void
-	{
-		/** @var PluginIdProvider $pluginIdProvider */
-		$pluginIdProvider = $this->container->get(PluginIdProvider::class);
-		$pluginId         = $pluginIdProvider->getPluginIdByBaseClass(
-			VRPaymentPayment::class,
-			$context
-		);
-
-		$data = [
-			'id'                 => $id,
-			'handlerIdentifier'  => VRPaymentPaymentHandler::class,
-			'pluginId'           => $pluginId,
-			'position'           => $paymentMethodConfiguration->getSortOrder() - 100,
-			'afterOrderEnabled'  => true,
-			'active'             => true,
-			'translations'       => $this->getPaymentMethodConfigurationTranslation($paymentMethodConfiguration, $context),
-			'technicalName'		 => $paymentMethodConfiguration->getName(),
-		];
-
-		$data['mediaId'] = $this->upsertMedia($id, $paymentMethodConfiguration, $context);
-
-		$data = array_filter($data);
-
-        try {
-            $this->paymentMethodRepository->upsert([$data], $context);
-        } catch (\Exception $e) {
-            $this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
-        }
-
-	}
-
 	/**
 	 * @param \VRPayment\Sdk\Model\PaymentMethodConfiguration $paymentMethodConfiguration
 	 * @param \Shopware\Core\Framework\Context                            $context
@@ -605,54 +585,95 @@ class PaymentMethodConfigurationService {
 	}
 
 	/**
-	 * Upload Payment Method icons
+	 * Update or insert Payment Method
-	 *
+	 */
-	 * @param string                                                      $id
+	protected function upsertPaymentMethod(
-	 * @param \VRPayment\Sdk\Model\PaymentMethodConfiguration $paymentMethodConfiguration
+	  string $id,
-	 * @param \Shopware\Core\Framework\Context                            $context
+	  PaymentMethodConfiguration $paymentMethodConfiguration,
-	 *
+	  Context $context
-	 * @return string|null
+	): void {
+		/** @var PluginIdProvider $pluginIdProvider */
+		$pluginIdProvider = $this->container->get(PluginIdProvider::class);
+		$pluginId = $pluginIdProvider->getPluginIdByBaseClass(
+		  VRPaymentPayment::class,
+		  $context
+		);
+
+		$data = [
+		  'id'                => $id,
+		  'handlerIdentifier' => VRPaymentPaymentHandler::class,
+		  'pluginId'          => $pluginId,
+		  'position'          => $paymentMethodConfiguration->getSortOrder() - 100,
+		  'afterOrderEnabled' => true,
+		  'active'            => true,
+		  'translations'      => $this->getPaymentMethodConfigurationTranslation($paymentMethodConfiguration, $context),
+		  'technicalName'     => $paymentMethodConfiguration->getName(),
+		];
+
+		$mediaId = $this->upsertMedia($id, $paymentMethodConfiguration, $context);
+		if ($mediaId) {
+			$data['mediaId'] = $mediaId;
+		}
+
+		try {
+			$this->paymentMethodRepository->upsert([$data], $context);
+		} catch (\Exception $e) {
+			$this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
+		}
+	}
+
+	/**
+	 * Upload or update Payment Method icons
 	 */
 	protected function upsertMedia(string $id, PaymentMethodConfiguration $paymentMethodConfiguration, Context $context): ?string
 	{
 		try {
-			$existingRecord = $this->getMediaDefaultFolderForPaymentMethod($paymentMethodConfiguration, $context);
+			$folderKey = 'payment_method_' . $paymentMethodConfiguration->getId();
 
-			if ($existingRecord->count() > 0) {
+			// Check existing default folder
-				$id = $existingRecord->first()->getId();
+			$criteria = new Criteria();
+			$criteria->addFilter(new EqualsFilter('entity', $folderKey));
+			$existingFolder = $this->mediaDefaultFolderRepository->search($criteria, $context);
+
+			$folderId = $id;
+			if ($existingFolder->count() > 0) {
+				$folderId = $existingFolder->first()->getId();
 			}
 
+			// Ensure default folder
 			$this->mediaDefaultFolderRepository->upsert([
 			  [
-					'id'                => $id,
+				'id'                => $folderId,
 				'associationFields' => [],
-					'entity'            => 'payment_method_' . $paymentMethodConfiguration->getId(),
+				'entity'            => $folderKey,
 			  ],
 			], $context);
 
+			// Ensure media folder
 			$this->mediaFolderRepository->upsert([
 			  [
-					'id'                     => $id,
+				'id'                     => $folderId,
-					'defaultFolderId'        => $id,
+				'defaultFolderId'        => $folderId,
 				'name'                   => $paymentMethodConfiguration->getName(),
 				'useParentConfiguration' => false,
 				'configuration'          => [],
 			  ],
 			], $context);
 
-			/**
+			// Media insert/update
-			 * @var \Shopware\Core\Content\Media\MediaDefinition
-			 */
 			$mediaDefinition = $this->container->get(MediaDefinition::class);
 			$this->mediaSerializer->setRegistry($this->serializerRegistry);
+
 			$data = [
 			  'id'            => $id,
 			  'title'         => $paymentMethodConfiguration->getName(),
 			  'url'           => $paymentMethodConfiguration->getResolvedImageUrl(),
-				'mediaFolderId' => $id,
+			  'mediaFolderId' => $folderId,
 			];
+
 			$data = $this->mediaSerializer->deserialize(new Config([], [], []), $mediaDefinition, $data);
 			$this->mediaRepository->upsert([$data], $context);
+
 			return $id;
 		} catch (\Exception $e) {
 			$this->logger->critical($e->getMessage(), [$e->getTraceAsString()]);

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

@@ -15,6 +15,7 @@ use Shopware\Core\{
     System\SalesChannel\SalesChannelContext
 };
 use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
+use Shopware\Storefront\Page\Account\Order\AccountEditOrderPageLoadedEvent;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use VRPayment\Sdk\Model\{
     AddressCreate,
@@ -46,6 +47,9 @@ use VRPaymentPayment\Core\{
     Util\Payload\CustomProducts\CustomProductsLineItemTypes,
     Util\Payload\TransactionPayload
 };
+use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity;
+use Shopware\Core\Framework\Struct\ArrayEntity;
+use Shopware\Commercial\Subscription\Framework\Struct\SubscriptionContextStruct;
 
 /**
  * Class TransactionService
@@ -185,10 +189,20 @@ class TransactionService
             $orderTransaction->getPaymentMethodId(),
             $orderTransaction->getOrder()->getSalesChannelId()
         );
-        $_SESSION['transactionId'] = null;
+
-        $_SESSION['arrayOfPossibleMethods'] = null;
+        $salesChannelContext->getContext()->addExtension(
-        $_SESSION['addressCheck'] = null;
+            'checkoutState',
-        $_SESSION['currencyCheck'] = null;
+            new ArrayEntity([
+                'transactionId' => null,
+                'addressHash'   => null,
+                'currency'      => null,
+            ])
+        );
+
+        $salesChannelContext->getContext()->addExtension(
+            'possibleMethods',
+            new ArrayEntity(['ids' => []])
+        );
 
 
         $this->holdDelivery($orderTransaction->getOrder()->getId(), $salesChannelContext->getContext());
@@ -502,24 +516,22 @@ class TransactionService
 
     /**
      * @param SalesChannelContext $salesChannelContext
-     * @param CheckoutConfirmPageLoadedEvent|null $event
+     *
      * @return int
      */
-    public function createPendingTransaction(SalesChannelContext $salesChannelContext, ?CheckoutConfirmPageLoadedEvent $event = null): int
+    public function createPendingTransaction(SalesChannelContext $salesChannelContext, $event = null): int
     {
         $expiredTransaction = true;
         $transactionId = $_SESSION['transactionId'] ?? null;
         $settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
+        if (!$settings) {
+            throw new \Exception('Space settings not configured');
+        }
 
         if ($transactionId) {
             $transactionService = $settings->getApiClient()->getTransactionService();
             $pendingTransaction = $transactionService->read($settings->getSpaceId(), $transactionId);
-            $failedStates = [
+            if ($pendingTransaction->getState() === TransactionState::PENDING) {
-                TransactionState::DECLINE,
-                TransactionState::FAILED,
-                TransactionState::VOIDED,
-            ];
-            if (!in_array($pendingTransaction->getState(), $failedStates)) {
                 $expiredTransaction = false;
             }
         }
@@ -530,6 +542,7 @@ class TransactionService
             $customer = $salesChannelContext->getCustomer();
             $lineItems = [];
             if ($event) {
+                if ($event instanceof CheckoutConfirmPageLoadedEvent) {
                     $cartLineItems = $event->getPage()->getCart()->getLineItems()->getElements();
                     foreach ($cartLineItems as $cartLineItem) {
                         if ($cartLineItem->getType() === CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
@@ -537,6 +550,12 @@ class TransactionService
                         }
                         $lineItems[] = $this->createTempLineItem($cartLineItem);
                     }
+                } elseif ($event instanceof AccountEditOrderPageLoadedEvent) {
+                    $order = $event->getPage()->getOrder();
+                    foreach ($order->getLineItems() as $orderLineItem) {
+                        $lineItems[] = $this->createTempLineItem($orderLineItem);
+                    }
+                }
             }
 
             $customerId = "";
@@ -551,6 +570,10 @@ class TransactionService
             $billingAddress = $this->buildAddress($salesChannelContext, $customer->getActiveBillingAddress());
             $shippingAddress = $this->buildAddress($salesChannelContext, $customer->getActiveShippingAddress());
 
+            if (!$settings) {
+                throw new \Exception('Space settings not configured');
+            }
+
             $transactionPayload = (new TransactionCreate())
                 ->setBillingAddress($billingAddress)
                 ->setShippingAddress($shippingAddress)
@@ -562,8 +585,11 @@ class TransactionService
                 ->setCustomerEmailAddress($customer->getEmail())
                 ->setCustomerId($customerId)
                 ->setSuccessUrl($homeUrl . '?success')
-                ->setFailedUrl($homeUrl . '?fail')
+                ->setFailedUrl($homeUrl . '?fail');
-                ->setTokenizationMode(TokenizationMode::FORCE_CREATION);
+
+            if($this->isSubscription($salesChannelContext)) {
+                $transactionPayload->setTokenizationMode(TokenizationMode::FORCE_CREATION);
+            }
 
             $transactionService = $settings->getApiClient()->getTransactionService();
             $transaction = $transactionService->create($settings->getSpaceId(), $transactionPayload);
@@ -685,18 +711,26 @@ class TransactionService
         return $chargeAttempts ? $chargeAttempts[0] : null;
     }
 
-    /**
+	private function createTempLineItem($productData): LineItemCreate
-     * @param LineItem $productData
-     * @return LineItemCreate
-     */
-    private function createTempLineItem(LineItem $productData): LineItemCreate
 	{
 		$lineItem = new LineItemCreate();
+
+		if ($productData instanceof LineItem) {
 			$lineItem->setName($productData->getLabel());
 			$lineItem->setUniqueId($productData->getId());
-        $lineItem->setSku($productData->getId());
+			$lineItem->setSku($productData->getReferencedId() ?? $productData->getId());
 			$lineItem->setQuantity($productData->getQuantity());
 			$lineItem->setAmountIncludingTax($productData->getPrice()->getUnitPrice());
+		} elseif ($productData instanceof OrderLineItemEntity) {
+			$lineItem->setName($productData->getLabel());
+			$lineItem->setUniqueId($productData->getId());
+			$lineItem->setSku($productData->getProductId() ?? $productData->getIdentifier() ?? $productData->getId());
+			$lineItem->setQuantity($productData->getQuantity());
+			$lineItem->setAmountIncludingTax($productData->getUnitPrice());
+		} else {
+			throw new \InvalidArgumentException('Unsupported line item type: ' . get_class($productData));
+		}
+
 		$lineItem->setType(LineItemType::PRODUCT);
 
 		return $lineItem;
@@ -749,4 +783,21 @@ class TransactionService
 
         return $address;
     }
+
+    /**
+     * Checks if it's subscription context.
+     *
+     * @param \Shopware\Core\System\SalesChannel\SalesChannelContext $salesChannelContext
+     * @return bool
+     */
+    private function isSubscription(SalesChannelContext $salesChannelContext): bool {
+        $extensionName = 'subscription';
+        if (class_exists(\Shopware\Commercial\Subscription\Framework\Struct\SubscriptionContextStruct::class)) {
+            $extensionName = SubscriptionContextStruct::SUBSCRIPTION_EXTENSION;
+        }
+        if ($salesChannelContext->hasExtension($extensionName)) {
+            return true;
+        }
+        return false;
+    }
 }

src/Core/Api/WebHooks/Controller/WebHookController.php

@@ -224,8 +224,18 @@ class WebHookController extends AbstractController {
 			// Configuration
 			$salesChannelId = $salesChannelId == 'null' ? null : $salesChannelId;
 			$this->settings = $this->settingsService->getSettings($salesChannelId);
+
 			$signature      = $request->server->get('HTTP_X_SIGNATURE');
 			$requestJson    = json_decode($request->getContent(), true);
+
+			if ($requestJson['eventId'] == null && $requestJson['entityId'] == null && $requestJson['listenerEntityId'] == null && $requestJson['listenerEntityId'] == null && $requestJson['listenerEntityTechnicalName'] == null && $requestJson['spaceId'] == null) {
+				throw new \InvalidArgumentException('Empty webhook');
+			}
+
+			if (!$this->settings->getSpaceId() || !$this->settings->getUserId() || !$this->settings->getApplicationKey()) {
+				throw new \InvalidArgumentException('Not correct webhook configuration for salesChannelId: ' . $salesChannelId . ' Debug: ' . var_dump($requestJson));
+			}
+
 			$apiClient      = $this->settings->getApiClient();
 			$callBackData->assign($requestJson);
 

src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php

@@ -133,7 +133,20 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
                 $salesChannelContextId = $contextSource->getSalesChannelId();
             }
 
-            $parameters = new SalesChannelContextServiceParameters($salesChannelContextId, $request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)), originalContext: $context);
+            $orderCustomer = $orderTransaction->getOrder()?->getOrderCustomer();
+            
+            if ($orderCustomer) {
+                $customerId = $orderCustomer->getCustomerId();
+            } else {
+                $customerId = null;
+            }
+
+            $parameters = new SalesChannelContextServiceParameters(
+                $salesChannelContextId, 
+                $request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)), 
+                originalContext: $context,
+                customerId: $customerId
+            );
             $salesChannelContext = $this->salesChannelContextService->get($parameters);
             $redirectUrl = $transaction->getReturnUrl();
 
@@ -149,7 +162,7 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
             $request->getSession()->remove('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 PaymentException::customerCanceled($orderTransactionId, $errorMessage);
         }
     }
 
@@ -194,7 +207,7 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
                 ]);
                 $request->getSession()->remove('transactionId');
                 $this->logger->info($errorMessage);
-                throw PaymentException::customerCanceled($transaction->getOrderTransaction()->getId(), $errorMessage);
+                throw PaymentException::customerCanceled($orderTransactionId, $errorMessage);
             }
         } else {
             $this->orderTransactionStateHandler->paid($orderTransaction->getId(), $context);

src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php

@@ -7,11 +7,18 @@ use Shopware\Core\{Checkout\Order\Aggregate\OrderTransaction\OrderTransactionCol
   Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStates,
   Checkout\Order\OrderEntity,
   Content\MailTemplate\Service\Event\MailBeforeValidateEvent};
+use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Shopware\Storefront\Page\Account\Order\AccountEditOrderPageLoadedEvent;
+use Shopware\Storefront\Page\Account\PaymentMethod\AccountPaymentMethodPageLoadedEvent;
 use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
+use Shopware\Storefront\Page\Checkout\Finish\CheckoutFinishPageLoadedEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use VRPaymentPayment\Core\{Api\Transaction\Service\OrderMailService,
+use VRPaymentPayment\Core\{Api\Transaction\Service\TransactionService,
-    Api\Transaction\Service\TransactionService,
   Checkout\PaymentHandler\VRPaymentPaymentHandler,
   Settings\Service\SettingsService,
   Settings\Struct\Settings,
@@ -31,6 +38,7 @@ use VRPaymentPayment\Sdk\{Model\AddressCreate,
   Model\Transaction,
   Model\TransactionCreate,
   Model\TransactionPending};
+use Shopware\Core\Framework\Struct\ArrayEntity;
 
 /**
  * Class CheckoutSubscriber
@@ -65,6 +73,9 @@ class CheckoutSubscriber implements EventSubscriberInterface
      */
     private $paymentMethodUtil;
 
+	/** @var EntityRepository  */
+	private EntityRepository $paymentMethodRepository;
+
     /**
      * CheckoutSubscriber constructor.
      *
@@ -72,13 +83,15 @@ class CheckoutSubscriber implements EventSubscriberInterface
      * @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
      * @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
      * @param \VRPaymentPayment\Core\Util\PaymentMethodUtil $paymentMethodUtil
+     * @param EntityRepository $paymentMethodRepository
      */
-    public function __construct(PaymentMethodConfigurationService $paymentMethodConfigurationService, TransactionService $transactionService, SettingsService $settingsService, PaymentMethodUtil $paymentMethodUtil)
+    public function __construct(PaymentMethodConfigurationService $paymentMethodConfigurationService, TransactionService $transactionService, SettingsService $settingsService, PaymentMethodUtil $paymentMethodUtil, EntityRepository $paymentMethodRepository)
     {
 		$this->paymentMethodConfigurationService = $paymentMethodConfigurationService;
 		$this->transactionService = $transactionService;
 		$this->settingsService = $settingsService;
 		$this->paymentMethodUtil = $paymentMethodUtil;
+		$this->paymentMethodRepository = $paymentMethodRepository;
     }
 
     /**
@@ -99,7 +112,9 @@ class CheckoutSubscriber implements EventSubscriberInterface
     public static function getSubscribedEvents(): array
     {
         return [
-            CheckoutConfirmPageLoadedEvent::class => ['onConfirmPageLoaded', 1],
+            CheckoutConfirmPageLoadedEvent::class      => 'onCheckoutConfirmLoaded',
+            AccountEditOrderPageLoadedEvent::class     => 'onAccountOrderEditLoaded',
+            AccountPaymentMethodPageLoadedEvent::class => 'onAccountPaymentMethodLoaded',
             "subscription." . CheckoutConfirmPageLoadedEvent::class => ['onConfirmPageLoaded', 1],
             MailBeforeValidateEvent::class => ['onMailBeforeValidate', 1],
         ];
@@ -154,9 +169,10 @@ class CheckoutSubscriber implements EventSubscriberInterface
     }
 
     /**
-     * @param \Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent $event
+     * @param CheckoutConfirmPageLoadedEvent $event
+     * @return void
      */
-    public function onConfirmPageLoaded(CheckoutConfirmPageLoadedEvent $event): void
+    public function onCheckoutConfirmLoaded(CheckoutConfirmPageLoadedEvent $event): void
     {
         try {
             $salesChannelContext = $event->getSalesChannelContext();
@@ -169,7 +185,7 @@ class CheckoutSubscriber implements EventSubscriberInterface
             $createdTransactionId = $this->transactionService->createPendingTransaction($salesChannelContext, $event);
             $this->updateTempTransactionIfNeeded($salesChannelContext, $createdTransactionId);
 
-            $this->getAvailablePaymentMethods($settings, $createdTransactionId);
+            $this->getAvailablePaymentMethods($settings, $createdTransactionId, $salesChannelContext);
             $this->setPossiblePaymentMethods($settings->getSpaceId(), $event);
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
@@ -177,10 +193,74 @@ class CheckoutSubscriber implements EventSubscriberInterface
         }
     }
 
+    /**
+     * @param AccountEditOrderPageLoadedEvent $event
+     * @return void
+     */
+    public function onAccountOrderEditLoaded(AccountEditOrderPageLoadedEvent $event): void
+    {
+        try {
+            $this->handlePaymentMethodFiltering($event);
+        } catch (\Throwable $e) {
+            $this->logger->error($e->getMessage());
+            $this->removeVRPaymentPaymentMethodFromConfirmPage($event);
+        }
+    }
+
+    /**
+     * @param AccountPaymentMethodPageLoadedEvent $event
+     * @return void
+     */
+    public function onAccountPaymentMethodLoaded(AccountPaymentMethodPageLoadedEvent $event): void
+    {
+        try {
+            $this->handlePaymentMethodFiltering($event);
+        } catch (\Throwable $e) {
+            $this->logger->error($e->getMessage());
+            $this->removeVRPaymentPaymentMethodFromConfirmPage($event);
+        }
+    }
+
     /**
      * @param \Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent $event
      */
-    private function removeVRPaymentPaymentMethodFromConfirmPage(CheckoutConfirmPageLoadedEvent $event): void
+    public function onConfirmPageLoaded(CheckoutConfirmPageLoadedEvent $event): void
+    {
+        try {
+            $this->handlePaymentMethodFiltering($event);
+        } catch (\Throwable $e) {
+            $this->logger->error($e->getMessage());
+            $this->removeVRPaymentPaymentMethodFromConfirmPage($event);
+        }
+    }
+
+    /**
+     * @param $event
+     * @return void
+     */
+    private function handlePaymentMethodFiltering($event): void
+    {
+        $salesChannelContext = $event->getSalesChannelContext();
+        $settings = $this->settingsService->getValidSettings($salesChannelContext->getSalesChannel()->getId());
+
+        if (is_null($settings)) {
+            $this->logger->notice('Removing payment methods because settings are invalid');
+            $this->removeVRPaymentPaymentMethodFromConfirmPage($event);
+            return;
+        }
+
+        $createdTransactionId = $this->transactionService->createPendingTransaction($salesChannelContext, $event);
+        $this->updateTempTransactionIfNeeded($salesChannelContext, $createdTransactionId);
+
+        $this->getAvailablePaymentMethods($settings, $createdTransactionId, $salesChannelContext);
+        $this->setPossiblePaymentMethods($settings->getSpaceId(), $event);
+    }
+
+    /**
+     * @param $event
+     * @return void
+     */
+    private function removeVRPaymentPaymentMethodFromConfirmPage($event): void
     {
         $paymentMethodCollection = $event->getPage()->getPaymentMethods();
         $paymentMethodIds = $this->paymentMethodUtil->getVRPaymentPaymentMethodIds($event->getContext());
@@ -194,7 +274,7 @@ class CheckoutSubscriber implements EventSubscriberInterface
      * @param int $createdTransactionId
      * @return void
      */
-    private function getAvailablePaymentMethods(Settings $settings, int $createdTransactionId): void
+    private function getAvailablePaymentMethods(Settings $settings, int $createdTransactionId, SalesChannelContext $salesChannelContext): void
     {
         $transactionService = $settings->getApiClient()->getTransactionService();
         $possiblePaymentMethods = $transactionService->fetchPaymentMethods(
@@ -204,9 +284,13 @@ class CheckoutSubscriber implements EventSubscriberInterface
         );
         $arrayOfPossibleMethods = [];
         foreach ($possiblePaymentMethods as $possiblePaymentMethod) {
-            $arrayOfPossibleMethods[] = $possiblePaymentMethod->getid();
+            $arrayOfPossibleMethods[] = $possiblePaymentMethod->getId();
         }
-        $_SESSION['arrayOfPossibleMethods'] = $arrayOfPossibleMethods;
+
+        $salesChannelContext->getContext()->addExtension(
+            'possibleMethods',
+            new ArrayEntity(['ids' => $arrayOfPossibleMethods])
+        );
     }
 
     /**
@@ -214,26 +298,55 @@ class CheckoutSubscriber implements EventSubscriberInterface
      * @param CheckoutConfirmPageLoadedEvent $event
      * @return void
      */
-    private function setPossiblePaymentMethods(int $spaceId, CheckoutConfirmPageLoadedEvent $event): void
+    private function setPossiblePaymentMethods(int $spaceId, $event): void
     {
-        $localPaymentMethods = [];
+        $paymentIds = [];
-        $paymentMethodConfigurations = $this->paymentMethodConfigurationService->getAllPaymentMethodConfigurations($spaceId, $event->getSalesChannelContext()->getContext());
+        $paymentMethodCollection = $event->getPage()->getPaymentMethods();
-        foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
+
-            $localPaymentMethods[$paymentMethodConfiguration->getId()] = $paymentMethodConfiguration->getPaymentMethodConfigurationId();
+        foreach ($paymentMethodCollection as $paymentMethodCollectionItem) {
+            $isVRPaymentPM = VRPaymentPaymentHandler::class === $paymentMethodCollectionItem->getHandlerIdentifier();
+            if (!$isVRPaymentPM) {
+                $paymentIds[] = $paymentMethodCollectionItem->getId();
+            }
         }
 
-        $paymentMethodCollection = $event->getPage()->getPaymentMethods();
+        $allowedWLMethods = [];
-        foreach ($paymentMethodCollection as $paymentMethodCollectionItem) {
+        $paymentMethodConfigurations = $this->paymentMethodConfigurationService
-            $isVRPaymentPM = VRPaymentPaymentHandler::class == $paymentMethodCollectionItem->getHandlerIdentifier();
+            ->getAllPaymentMethodConfigurations($spaceId, $event->getSalesChannelContext()->getContext());
-            if (!$isVRPaymentPM) {
+
+        foreach ($paymentMethodConfigurations as $paymentMethodConfiguration) {
+            if ($paymentMethodConfiguration->getPaymentMethod() === null) {
                 continue;
             }
 
-            $paymentMethodConfigurationId = $localPaymentMethods[$paymentMethodCollectionItem->getId()];
+            $pmId = $paymentMethodConfiguration->getPaymentMethod()->getId();
-            if (!\in_array($paymentMethodConfigurationId, $_SESSION['arrayOfPossibleMethods'])) {
+            $pmConfigId = $paymentMethodConfiguration->getPaymentMethodConfigurationId();
-                $paymentMethodCollection->remove($paymentMethodCollectionItem->getId());
+            $allowedIds = $this->getAllowedPaymentMethodIds($event->getSalesChannelContext());
+
+            if ($paymentMethodConfiguration->getSpaceId() === $spaceId
+                && \in_array($pmConfigId, $allowedIds, true)) {
+                $allowedWLMethods[] = $pmId;
             }
         }
+
+        $allPaymentIds = array_unique(array_merge($paymentIds, $allowedWLMethods));
+        $collection = new PaymentMethodCollection();
+        if (!empty($allPaymentIds)) {
+            $criteria = new Criteria($allPaymentIds);
+            $criteria->addFilter(new EqualsFilter('active', true));
+            $criteria->addFilter(
+                new EqualsFilter('salesChannels.id', $event->getSalesChannelContext()->getSalesChannelId())
+            );
+
+            $result = $this->paymentMethodRepository->search($criteria, $event->getContext());
+            foreach ($result->getEntities() as $method) {
+                if (!$collection->has($method->getId())) {
+                    $collection->add($method);
+                }
+            }
+        }
+
+        $event->getPage()->setPaymentMethods($collection);
     }
 
 	/**
@@ -243,19 +356,43 @@ class CheckoutSubscriber implements EventSubscriberInterface
 	 */
 	private function updateTempTransactionIfNeeded(SalesChannelContext $salesChannelContext, int $createdTransactionId): void
 	{
-        $addressCheck = $_SESSION['addressCheck'] ?? null;
+		$ctx = $salesChannelContext->getContext();
-        $currencyCheck = $_SESSION['currencyCheck'] ?? null;
+
+		/** @var ArrayEntity|null $ext */
+		$ext = $ctx->getExtension('checkoutState');
+
+		$oldAddressHash = $ext instanceof ArrayEntity ? $ext->get('addressHash') : null;
+		$oldCurrency    = $ext instanceof ArrayEntity ? $ext->get('currency') : null;
 
 		$customer    = $salesChannelContext->getCustomer();
 		$addressHash = md5(json_encode((array) $customer));
 		$currency    = $salesChannelContext->getCurrency()->getIsoCode();
-        if (($addressCheck && $currencyCheck) && $addressCheck !== $addressHash || $currencyCheck !== $currency) {
+
+		$needsUpdate = ($oldAddressHash !== $addressHash) || ($oldCurrency !== $currency);
+
+		if ($needsUpdate) {
 			if ($createdTransactionId) {
 				$this->transactionService->updateTempTransaction($salesChannelContext, $createdTransactionId);
 			}
-            $_SESSION['arrayOfPossibleMethods'] = null;
+
-            $_SESSION['addressCheck'] = $addressHash;
+			$ctx->addExtension('possibleMethods', new ArrayEntity(['ids' => []]));
-            $_SESSION['currencyCheck'] = $currency;
+			$ctx->addExtension(
+			  'checkoutState',
+			  new ArrayEntity([
+				'addressHash' => $addressHash,
+				'currency'    => $currency,
+			  ])
+			);
 		}
 	}
+
+	/**
+	 * @param SalesChannelContext $salesChannelContext
+	 * @return array
+	 */
+	private function getAllowedPaymentMethodIds(SalesChannelContext $salesChannelContext): array
+	{
+		$ext = $salesChannelContext->getContext()->getExtension('possibleMethods');
+		return $ext instanceof ArrayEntity ? ($ext->get('ids') ?? []) : [];
+	}
 }

src/Core/Util/Analytics/Analytics.php

@@ -25,7 +25,7 @@ class Analytics {
 			self::SHOP_SYSTEM             => 'shopware',
 			self::SHOP_SYSTEM_VERSION     => '6',
 			self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
-			self::PLUGIN_SYSTEM_VERSION   => '7.1.1',
+			self::PLUGIN_SYSTEM_VERSION   => '7.1.3',
 		];
 	}
 

src/Core/Util/Payload/TransactionPayload.php

@@ -231,9 +231,16 @@ class TransactionPayload extends AbstractPayload
             ->setShippingAddress($shippingAddress)
             ->setShippingMethod($transactionData['shipping_method']);
 
-        $paymentConfiguration = $this->getPaymentConfiguration($this->salesChannelContext->getPaymentMethod()->getId());
+        $paymentConfiguration = $this->getPaymentConfiguration(
+            $this->salesChannelContext->getPaymentMethod()->getId(),
+            $this->settings->getSpaceId()
+        );
 
-        $transactionPayload->setAllowedPaymentMethodConfigurations([$paymentConfiguration->getPaymentMethodConfigurationId()]);
+        if ($paymentConfiguration) {
+            $transactionPayload->setAllowedPaymentMethodConfigurations([
+                $paymentConfiguration->getPaymentMethodConfigurationId()
+            ]);
+        }
 
         $successUrl = $this->transaction->getReturnUrl() . '&status=paid';
         $failedUrl = $this->getFailUrl($this->order->getId()) . '&status=fail';
@@ -900,17 +907,19 @@ class TransactionPayload extends AbstractPayload
     }
 
 	/**
-     * @param string $id
+	 * @param string $paymentMethodId
-     *
+	 * @param int $spaceId
-     * @return \VRPaymentPayment\Core\Api\PaymentMethodConfiguration\Entity\PaymentMethodConfigurationEntity
+	 * @return PaymentMethodConfigurationEntity|null
 	 */
-    protected function getPaymentConfiguration(string $id): PaymentMethodConfigurationEntity
+	protected function getPaymentConfiguration(string $paymentMethodId, int $spaceId): ?PaymentMethodConfigurationEntity
 	{
-        $criteria = (new Criteria([$id]));
+		$criteria = new Criteria();
+		$criteria->addFilter(new EqualsFilter('paymentMethodId', $paymentMethodId));
+		$criteria->addFilter(new EqualsFilter('spaceId', $spaceId));
 
 		return $this->container->get('vrpayment_payment_method_configuration.repository')
 		  ->search($criteria, $this->salesChannelContext->getContext())
-            ->getEntities()->first();
+		  ->first();
 	}
 
     /**

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

@@ -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"
+							:value="props.currentValue"
-							@update:checked="props.updateCurrentValue">
+							@update:value="props.updateCurrentValue">
-					</mt-switch>
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 
@@ -25,16 +25,16 @@
 					: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"
+							:value="props.currentValue"
-							@update:checked="props.updateCurrentValue">
+							@update:value="props.updateCurrentValue">
-					</mt-switch>
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 		</div>

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

@@ -14,8 +14,8 @@
 						{% block vrpayment_settings_content_card_channel_config_credentials_card_container_settings_space_id %}
 							<sw-inherit-wrapper
 									v-model:value="actualConfigData[CONFIG_SPACE_ID]"
-									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_SPACE_ID]"
+									:inheritedValue="getInheritedValue(CONFIG_SPACE_ID)"
-									:customInheritationCheckFunction="checkNumberFieldInheritance">
+									@update:value="onSwitchInput">
 								<template #content="props">
 									<mt-number-field
 											:name="CONFIG_SPACE_ID"
@@ -23,7 +23,7 @@
 											: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')"
+											:disabled="!acl.can('vrpayment.editor')"
 											:model-value="props.currentValue"
 											:error="spaceIdErrorState"
 											@update:model-value="props.updateCurrentValue">
@@ -35,7 +35,7 @@
 						{% block vrpayment_settings_content_card_channel_config_credentials_card_container_settings_user_id %}
 							<sw-inherit-wrapper
 									v-model:value="actualConfigData[CONFIG_USER_ID]"
-									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_USER_ID]"
+									:inheritedValue="getInheritedValue(CONFIG_USER_ID)"
 									:customInheritationCheckFunction="checkNumberFieldInheritance">
 								<template #content="props">
 									<mt-number-field
@@ -44,7 +44,7 @@
 											: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')"
+											:disabled="!acl.can('vrpayment.editor')"
 											:model-value="props.currentValue"
 											:error="userIdErrorState"
 											@update:model-value="props.updateCurrentValue">
@@ -56,7 +56,7 @@
 						{% block vrpayment_settings_content_card_channel_config_credentials_card_container_settings_application_key %}
 							<sw-inherit-wrapper
 									v-model:value="actualConfigData[CONFIG_APPLICATION_KEY]"
-									:inheritedValue="selectedSalesChannelId === null ? null : allConfigs['null'][CONFIG_APPLICATION_KEY]"
+									:inheritedValue="getInheritedValue(CONFIG_APPLICATION_KEY)"
 									:customInheritationCheckFunction="checkTextFieldInheritance">
 								<template #content="props">
 									<mt-password-field
@@ -66,7 +66,7 @@
 											:mapInheritance="props"
 											:label="$tc('vrpayment-settings.settingForm.credentials.applicationKey.label')"
 											:helpText="$tc('vrpayment-settings.settingForm.credentials.applicationKey.tooltipText')"
-											:disabled="props.isInherited || !acl.can('vrpayment.editor')"
+											:disabled="!acl.can('vrpayment.editor')"
 											:model-value="props.currentValue"
 											:error="applicationKeyErrorState"
 											@update:model-value="props.updateCurrentValue">

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

@@ -6,7 +6,7 @@ import constants from '../../page/vrpayment-settings/configuration-constants'
 const {Component, Mixin} = Shopware;
 
 Component.register('sw-vrpayment-credentials', {
-    template: template,
+    template,
 
     name: 'VRPaymentCredentials',
 
@@ -29,7 +29,9 @@ Component.register('sw-vrpayment-credentials', {
         },
 
         selectedSalesChannelId: {
-            required: true
+            type: [String, null],
+            required: false,
+            default: null
         },
         spaceIdFilled: {
             type: Boolean,
@@ -68,22 +70,22 @@ Component.register('sw-vrpayment-credentials', {
         };
     },
 
-    methods: {
+    computed: {
-
+        currentConfig() {
-        checkTextFieldInheritance(value) {
+            if (this.selectedSalesChannelId && this.allConfigs[this.selectedSalesChannelId]) {
-            if (typeof value !== 'string') {
+                return this.allConfigs[this.selectedSalesChannelId];
-                return true;
             }
+            return this.allConfigs['null'] || {};
+        }
+    },
 
-            return value.length <= 0;
+    methods: {
+		checkTextFieldInheritance(value) {
+		    return !value || value.length <= 0;
 		},
 
 		checkNumberFieldInheritance(value) {
-            if (typeof value !== 'number') {
+		    return value == null || value === '';
-                return true;
-            }
-
-            return value.length <= 0;
 		},
 
 		checkBoolFieldInheritance(value) {
@@ -94,12 +96,16 @@ Component.register('sw-vrpayment-credentials', {
         // Used to trigger API connection testing from this component.
         emitCheckApiConnectionEvent() {
             const apiConnectionParams = {
-                spaceId: this.actualConfigData[constants.CONFIG_SPACE_ID],
+                spaceId: this.currentConfig[constants.CONFIG_SPACE_ID],
-                userId: this.actualConfigData[constants.CONFIG_USER_ID],
+                userId: this.currentConfig[constants.CONFIG_USER_ID],
-                applicationKey: this.actualConfigData[constants.CONFIG_APPLICATION_KEY]
+                applicationKey: this.currentConfig[constants.CONFIG_APPLICATION_KEY]
             };
 
             this.$emit('check-api-connection-event', apiConnectionParams);
+        },
+
+        getInheritedValue(key) {
+            return this.allConfigs['null']?.[key] ?? null;
         }
     }
 });

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

@@ -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"
+											:value="props.currentValue"
-											@update:checked="props.updateCurrentValue">
+											@update:value="props.updateCurrentValue">
-									</mt-switch>
+									</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"
+											:value="props.currentValue"
-											@update:checked="props.updateCurrentValue">
+											@update:value="props.updateCurrentValue">
-									</mt-switch>
+									</sw-switch-field>
 								</template>
 							</sw-inherit-wrapper>
 						{% endblock %}

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

@@ -7,16 +7,16 @@
 					: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"
+							:value="props.currentValue"
-							@update:checked="props.updateCurrentValue">
+							@update:value="props.updateCurrentValue">
-					</mt-switch>
+					</sw-switch-field>
 				</template>
 			</sw-inherit-wrapper>
 		</div>

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

@@ -45,15 +45,14 @@
                                             <mt-card title="Sales Channel Switch">
 
                                                 {% block vrpayment_settings_content_card_channel_config_sales_channel_card_title %}
-						<sw-entity-single-select
+                                                    <sw-single-select
-								v-model:value="selectedSalesChannelId"
+                                                            :value="selectedSalesChannelId"
-								labelProperty="translated.name"
+                                                            :options="salesChannel.map(sc => ({ id: sc.id, name: sc.translated.name }))"
+                                                            labelProperty="name"
                                                             valueProperty="id"
-								:mapInheritance="props"
                                                             :isLoading="isLoading"
-								entity="sales_channel"
+                                                            @update:value="onInput"
-								@update:value="onInput">
+                                                    />
-						</sw-entity-single-select>
                                                 {% endblock %}
                                                 {% block vrpayment_settings_content_card_channel_config_sales_channel_card_footer %}
                                                     <template #footer>

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

@@ -68,7 +68,7 @@ Component.register('vrpayment-settings', {
     watch: {
         config: {
             handler(configData) {
-                const defaultConfig = this.$refs.configComponent.allConfigs.null;
+                const defaultConfig = (this.$refs.configComponent.allConfigs || {}).null || {};
                 const salesChannelId = this.$refs.configComponent.selectedSalesChannelId;
                 if (salesChannelId === null) {
 

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

@@ -31,6 +31,7 @@
 			<argument id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService" type="service"/>
 			<argument id="VRPaymentPayment\Core\Settings\Service\SettingsService" type="service"/>
 			<argument id="VRPaymentPayment\Core\Util\PaymentMethodUtil" type="service"/>
+			<argument id="payment_method.repository" type="service"/>
 			<call method="setLogger">
 				<argument type="service" id="monolog.logger.vrpayment_payment"/>
 			</call>

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

@@ -0,0 +1,25 @@
+{
+  "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-VI5R5y0b.js"
+      ],
+      "legacy": false,
+      "preload": []
+    }
+  },
+  "legacy": false,
+  "metadatas": {},
+  "version": [
+    "7.1.0",
+    7,
+    1,
+    0
+  ],
+  "viteServer": null
+}

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

@@ -0,0 +1,11 @@
+{
+  "main.js": {
+    "file": "assets/v-r-payment-payment-VI5R5y0b.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

@@ -0,0 +1 @@
+.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}