Release 7.1.3

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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

CHANGELOG_de-DE.md

@@ -1,3 +1,7 @@
+# 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.

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](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.2/docs/en/documentation.html)
-- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.2/docs/de/documentation.html)
-- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.2/docs/fr/documentation.html)
-- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.2/docs/it/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](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](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](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.2"
+  "version": "7.1.3"
 }

docs/de/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.2/">
+		<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

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.2/">
+		<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

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.2/">
+		<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

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.2/">
+		<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/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/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.2',
+			self::PLUGIN_SYSTEM_VERSION   => '7.1.3',
 		];
 	}
 

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

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

@@ -15,7 +15,7 @@
 							<sw-inherit-wrapper
 									v-model:value="actualConfigData[CONFIG_SPACE_ID]"
 									:inheritedValue="getInheritedValue(CONFIG_SPACE_ID)"
-									:customInheritationCheckFunction="checkNumberFieldInheritance">
+									@update:value="onSwitchInput">
 								<template #content="props">
 									<mt-number-field
 											:name="CONFIG_SPACE_ID"

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"
-											@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 %}

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

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}