Merge pull request #21 from dynamicweb/dbe/Fix-for-unique-cache-key

Fix cache key to take Version (10.4.*) not 1.0.0 which is not unique …
dynamicweb · Jun 19, 2024 · ac5cc3f · ac5cc3f
2 parents 178e4e0 + c9d2e3f
commit ac5cc3f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Configuration/Constants.cs b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Configuration/Constants.cs
@@ -21,7 +21,7 @@ public static class Constants
         internal static readonly int DefaultPingInterval = 60;
         internal static readonly int DefaultConnectionTimeout = 30;
 
-        internal static readonly string AssemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        internal static readonly string AssemblyVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
 
         /// <summary>
         /// Nested class with cache configuration constants.

diff --git a/...Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj b/...Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.4.1</Version>		
+		<Version>10.4.2</Version>		
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Live Integration</Title>
 		<Description>Live Integration</Description>

diff --git a/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/OrderHandler.cs b/src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/OrderHandler.cs
@@ -631,7 +631,7 @@ private static void ProcessOrderLines(Settings settings, XmlDocument response, O
                     }
 
                     string orderLineType = orderLineTypeNode?.InnerText;
-                    if (orderLineType == "0" || string.IsNullOrWhiteSpace(orderLineType))
+                    if (string.IsNullOrWhiteSpace(orderLineType) || orderLineType == "0" || orderLineType == "2")
                     {
                         ProcessProductOrderLine(settings, order, orderLineIds, orderLines, allOrderLineFields, orderLineNode, responseIdOrderLineDictionary, logger);
                     }