From 692addeecb9574d06a4489a6f3a035436019a834 Mon Sep 17 00:00:00 2001
From: Dmitriy Benyuk <dbe@dynamicweb-cms.com>
Date: Tue, 17 Jun 2025 11:43:43 +0300
Subject: [PATCH] Fix LiveShippingFeeProvider.cs GetShipping()

---
 .../Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj    | 2 +-
 .../LiveShippingFeeProvider.cs                               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
index ab90bce..d2a6726 100644
--- a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
+++ b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.4.24</Version>		
+		<Version>10.4.25</Version>		
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Live Integration</Title>
 		<Description>Live Integration</Description>
diff --git a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveShippingFeeProvider.cs b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveShippingFeeProvider.cs
index ad59d89..c8452ea 100644
--- a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveShippingFeeProvider.cs
+++ b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveShippingFeeProvider.cs
@@ -3,6 +3,7 @@
 using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Logging;
 using Dynamicweb.Ecommerce.Orders;
 using Dynamicweb.Ecommerce.Prices;
+using Dynamicweb.Extensibility;
 using Dynamicweb.Extensibility.AddIns;
 using System;
 using System.Linq;
@@ -69,7 +70,9 @@ private static void AddToCache(Order order, double shippingFee)
         /// <returns>Shipping.</returns>
         private static Shipping GetShipping()
         {            
-            return Services.Shippings.GetShippingsWithoutRegions(false).FirstOrDefault(s => !string.IsNullOrEmpty(s.ServiceSystemName) && string.Compare(s.ServiceSystemName, typeof(LiveShippingFeeProvider).FullName, StringComparison.OrdinalIgnoreCase) == 0);
+            return Services.Shippings.GetShippingsWithoutRegions(false).FirstOrDefault(s => !string.IsNullOrEmpty(s.ServiceSystemName) && 
+                (string.Equals(typeof(LiveShippingFeeProvider).GetTypeNameWithAssembly(), s.ServiceSystemName) ||
+                string.Equals(s.ServiceSystemName, typeof(LiveShippingFeeProvider).FullName, StringComparison.OrdinalIgnoreCase)));
         }
 
         private static void ProcessLiveIntegrationShipping(Settings settings, Order order, XmlNode orderNode, Logger logger)