From e794b259fc75f268d40e3d5148547f65bd36ccdd Mon Sep 17 00:00:00 2001
From: Fabian Gerke <124085586+FabianGerke@users.noreply.github.com>
Date: Mon, 27 Apr 2026 17:04:41 +0200
Subject: [PATCH 1/2] fix: wrong shipping amount

---
 src/Services/CheckoutService.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Services/CheckoutService.php b/src/Services/CheckoutService.php
index 92b9c367f..bd6f482c4 100644
--- a/src/Services/CheckoutService.php
+++ b/src/Services/CheckoutService.php
@@ -18,6 +18,7 @@
 use Plenty\Modules\Frontend\Session\Storage\Contracts\FrontendSessionStorageFactoryContract;
 use Plenty\Modules\Order\Currency\Contracts\CurrencyRepositoryContract;
 use Plenty\Modules\Order\Payment\Method\Models\PaymentMethod;
+use Plenty\Modules\Order\Shipping\Contracts\EUCountryCodesServiceContract;
 use Plenty\Modules\Order\Shipping\Contracts\ParcelServicePresetRepositoryContract;
 use Plenty\Modules\Payment\Events\Checkout\GetPaymentMethodContent;
 use Plenty\Modules\Payment\Method\Contracts\PaymentMethodRepositoryContract;
@@ -685,7 +686,11 @@ function () {
                     $this->setShippingProfileId($fallbackShippingProfileId, true);
                 }
 
-                if (($isNet && !(bool)$accountSettings->showShippingVat) || (!$isNet && $showNetPrice)) {
+                /** @var EUCountryCodesServiceContract $euCountryService */
+                $euCountryService = pluginApp(EUCountryCodesServiceContract::class);
+
+                $isExportDelivery = $euCountryService->isExportDelivery($basket->shippingCountryId);
+                if (($isNet || $showNetPrice) && !((bool)$accountSettings->showShippingVat && $isExportDelivery)) {
                     $maxVatValue = $this->basketService->getMaxVatValue();
 
                     if (is_array($list)) {

From 44612d5a6066799cc84549631e73d5f0a3a3bccb Mon Sep 17 00:00:00 2001
From: Fabian Gerke <124085586+FabianGerke@users.noreply.github.com>
Date: Wed, 29 Apr 2026 10:20:04 +0200
Subject: [PATCH 2/2] add changelog

---
 meta/documents/changelog_de.md | 4 ++++
 meta/documents/changelog_en.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/meta/documents/changelog_de.md b/meta/documents/changelog_de.md
index a40f8f36a..7cbcca196 100644
--- a/meta/documents/changelog_de.md
+++ b/meta/documents/changelog_de.md
@@ -8,6 +8,10 @@
 - PHP 8.2 Anpassungen wurden durchgeführt.
 - Eine Begrenzung für Gutscheine wurde hinzugefügt.
 
+### Behoben
+
+- Ein Fehler, welcher zu falschen Beträgen in der Versanddienstleister-Liste führte, wurde behoben.
+
 ## v5.0.78 (2025-10-17) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.77...5.0.78" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>
 
 ### Behoben
diff --git a/meta/documents/changelog_en.md b/meta/documents/changelog_en.md
index 99e6e8b0a..362c38740 100644
--- a/meta/documents/changelog_en.md
+++ b/meta/documents/changelog_en.md
@@ -8,6 +8,10 @@
 - PHP 8.2 adjustments have been made.
 - Added rate limit for coupons.
 
+### Fixed
+
+- An issue which leads to wrong amounts for shipping providers in the shipping providers list.
+
 ## v5.0.78 (2025-10-17) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.77...5.0.78" target="_blank" rel="noopener"><b>Overview of all changes</b></a>
 
 ### Fixed