From e73245468355bbd29246b314c0c01bd2f2dbdfae Mon Sep 17 00:00:00 2001 From: andrewrowanwallee Date: Thu, 12 Feb 2026 13:13:32 +0100 Subject: [PATCH] Release 6.2.1 --- CHANGELOG.md | 3 +++ CHANGELOG_de-DE.md | 3 +++ README.md | 8 ++++---- composer.json | 2 +- .../Storefront/Checkout/Subscriber/CheckoutSubscriber.php | 1 + src/Core/Util/Analytics/Analytics.php | 2 +- src/Core/Util/Payload/TransactionPayload.php | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b164e4d..552f253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 6.2.1 +- Fixed issue with multiple discount codes + # 6.2.0 - Renamed database table to avoid a naming conflict with legacy plugins - Fixed issue with refunds failing for payments using Invoice diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md index d4079e7..3fa5228 100644 --- a/CHANGELOG_de-DE.md +++ b/CHANGELOG_de-DE.md @@ -1,3 +1,6 @@ +# 6.2.1 +- Problem mit mehreren Rabattcodes behoben + # 6.2.0 - Datenbanktabelle umbenannt, um Namenskonflikte mit älteren Plugins zu vermeiden. - Problem mit fehlgeschlagenen Rückerstattungen bei Zahlungen mit Rechnungen behoben. diff --git a/README.md b/README.md index e0bac0b..7a70955 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ The VR Payment Payment Plugin integrates modern payment processing into Shopware - **VR Payment Account:** Obtain `Space ID`, `User ID`, and `API Key` from the [VR Payment Dashboard](https://gateway.vr-payment.de/). ## Documentation -- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.0/docs/en/documentation.html) -- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.0/docs/de/documentation.html) -- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.0/docs/fr/documentation.html) -- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.0/docs/it/documentation.html) +- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.1/docs/en/documentation.html) +- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.1/docs/de/documentation.html) +- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.1/docs/fr/documentation.html) +- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/6.2.1/docs/it/documentation.html) ## Installation diff --git a/composer.json b/composer.json index 197cbf1..05728b9 100644 --- a/composer.json +++ b/composer.json @@ -59,5 +59,5 @@ "vrpayment/sdk": "^4.0.0" }, "type": "shopware-platform-plugin", - "version": "6.2.0" + "version": "6.2.1" } diff --git a/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php b/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php index 036ed1e..2a0a5ea 100644 --- a/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php +++ b/src/Core/Storefront/Checkout/Subscriber/CheckoutSubscriber.php @@ -337,6 +337,7 @@ class CheckoutSubscriber implements EventSubscriberInterface new EqualsFilter('salesChannels.id', $event->getSalesChannelContext()->getSalesChannelId()) ); $criteria->addSorting(new FieldSorting('position', FieldSorting::ASCENDING)); + $criteria->addAssociation('media'); $result = $this->paymentMethodRepository->search($criteria, $event->getContext()); foreach ($result->getEntities() as $method) { diff --git a/src/Core/Util/Analytics/Analytics.php b/src/Core/Util/Analytics/Analytics.php index 0a74180..72a26c0 100644 --- a/src/Core/Util/Analytics/Analytics.php +++ b/src/Core/Util/Analytics/Analytics.php @@ -28,7 +28,7 @@ class Analytics { self::SHOP_SYSTEM => 'shopware', self::SHOP_SYSTEM_VERSION => $shopwareVersion, self::SHOP_SYSTEM_AND_VERSION => 'shopware-' . $shopwareVersion, - self::PLUGIN_SYSTEM_VERSION => '6.2.0', + self::PLUGIN_SYSTEM_VERSION => '6.2.1', ]; } diff --git a/src/Core/Util/Payload/TransactionPayload.php b/src/Core/Util/Payload/TransactionPayload.php index d2bcb89..bc8abd3 100644 --- a/src/Core/Util/Payload/TransactionPayload.php +++ b/src/Core/Util/Payload/TransactionPayload.php @@ -345,7 +345,7 @@ class TransactionPayload extends AbstractPayload ->setShippingRequired(false) ->setSku('sku-discount-' . $rate . '-' . $discountName, 200) ->setType(LineItemType::DISCOUNT) - ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName); + ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName . '-' . $discount->getId()); $taxRate = new TaxCreate(['title' => 'Discount Tax: ' . $rate, 'rate' => $rate]); $lineItem->setTaxes([$taxRate]);