diff --git a/CHANGELOG.md b/CHANGELOG.md index fd4d726..acdc31e 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md index 75bbf3e..22a1fd6 100644 --- a/CHANGELOG_de-DE.md +++ b/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. diff --git a/README.md b/README.md index e457220..8a0a619 100644 --- a/README.md +++ b/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/). diff --git a/composer.json b/composer.json index 6c0fd35..14ff6e0 100644 --- a/composer.json +++ b/composer.json @@ -59,5 +59,5 @@ "vrpayment/sdk": "^4.0.0" }, "type": "shopware-platform-plugin", - "version": "7.1.2" + "version": "7.1.3" } diff --git a/docs/de/documentation.html b/docs/de/documentation.html index bfa1354..d8babb7 100644 --- a/docs/de/documentation.html +++ b/docs/de/documentation.html @@ -23,7 +23,7 @@
  • - + Source
    • @@ -183,6 +183,19 @@ php bin/console plugin:install --activate --clearCache VRPayment +
    +
    +

    + 4.4VRPayment erscheint nicht in den Einstellungen

    +
    +
    +
    +

    Folgender Befehl muss ausgeführt werden

    +
    +
    +
    bin/build-administration.sh
    +
    +
    @@ -888,6 +901,11 @@ A: Ja, das Plugin unterstützt Wallets wie Apple Pay.

    4.3 Via Composer (Recommended) +
  • + + 4.4 + VRPayment erscheint nicht in den Einstellungen +
  • diff --git a/docs/en/documentation.html b/docs/en/documentation.html index cf691e6..77b2be8 100644 --- a/docs/en/documentation.html +++ b/docs/en/documentation.html @@ -23,7 +23,7 @@
  • - + Source
    • @@ -179,6 +179,19 @@ php bin/console plugin:install --activate --clearCache VRPayment
    +
    +
    +

    + 4.4VRPayment does not appear in Settings

    +
    +
    +
    +

    You should run the following commmand

    +
    +
    +
    bin/build-administration.sh
    +
    +
    @@ -905,6 +918,11 @@ tokenization, it can be used for subscriptions. The recurring payment is fully m 4.3 Manual Installation +
  • + + 4.4 + VRPayment does not appear in Settings +
  • diff --git a/docs/fr/documentation.html b/docs/fr/documentation.html index 25bcab2..2e74c18 100644 --- a/docs/fr/documentation.html +++ b/docs/fr/documentation.html @@ -23,7 +23,7 @@
  • - + Source
    • @@ -170,6 +170,19 @@ php bin/console plugin:install --activate --clearCache VRPayment php bin/console plugin:install --activate --clearCache VRPayment
    +
    +
    +

    + 4.4Si VRPayment n’apparaît pas dans les paramètres

    +
    +
    +
    +

    Vous devez exécuter la commande suivante

    +
    +
    +
    bin/build-administration.sh
    +
    +
    @@ -876,6 +889,11 @@ A: Oui, le plugin prend en charge les portefeuilles comme Apple Pay.

    4.3 Via Composer (Recommended) +
  • + + 4.4 + Si VRPayment n’apparaît pas dans les paramètres +
  • diff --git a/docs/it/documentation.html b/docs/it/documentation.html index c9b5751..572da16 100644 --- a/docs/it/documentation.html +++ b/docs/it/documentation.html @@ -23,7 +23,7 @@
  • - + Source
    • @@ -177,6 +177,19 @@ php bin/console plugin:install --activate --clearCache VRPayment
    +
    +
    +

    + 4.4VRPayment non appare nelle impostazioni

    +
    +
    +
    +

    Dovrebbe eseguire il seguente comando

    +
    +
    +
    bin/build-administration.sh
    +
    +
    @@ -887,6 +900,11 @@ La tokenizzazione non è disponibile per i checkout degli ospiti. 4.3 Installazione manuale +
  • + + 4.4 + VRPayment non appare nelle impostazioni +
  • diff --git a/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php b/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php index fd8c9bb..1de2c2f 100644 --- a/src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php +++ b/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); diff --git a/src/Core/Util/Analytics/Analytics.php b/src/Core/Util/Analytics/Analytics.php index a71c907..ed12300 100644 --- a/src/Core/Util/Analytics/Analytics.php +++ b/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', ]; } diff --git a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-advanced-options/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-advanced-options/index.html.twig index 68ca180..e6cc3b2 100644 --- a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-advanced-options/index.html.twig +++ b/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"> @@ -25,16 +25,16 @@ :inheritedValue="selectedSalesChannelId == null ? null : allConfigs['null'][CONFIG_STOREFRONT_PAYMENTS_UPDATE_ENABLED]" :customInheritationCheckFunction="checkBoolFieldInheritance">
    • diff --git a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig index fe5986f..8fd28d3 100644 --- a/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig +++ b/src/Resources/app/administration/src/module/vrpayment-settings/component/sw-vrpayment-credentials/index.html.twig @@ -15,7 +15,7 @@ + @update:value="onSwitchInput">