Control Live Discount Behavior for Users, Groups, and Anonymous Users

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Examples/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Examples.csproj

@@ -23,10 +23,10 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Dynamicweb" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.Core" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.4.0" />
+		<PackageReference Include="Dynamicweb" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.Core" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.21.5" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Dynamicweb.Ecommerce.DynamicwebLiveIntegration\Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj" />

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Configuration/Global.cs

@@ -1,5 +1,6 @@
 using Dynamicweb.Core;
 using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Connectors;
+using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Extensions;
 using Dynamicweb.Frontend;
 
 namespace Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Configuration
@@ -105,7 +106,7 @@ public static bool IsLazyLoadingForProductInfoEnabled(Settings settings)
         {
             return Global.IsIntegrationActive(settings) && settings.EnableLivePrices && Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live)
                        && (settings.LiveProductInfoForAnonymousUsers || Helpers.GetCurrentExtranetUser() != null)
-                       && (Helpers.GetCurrentExtranetUser() == null || !Helpers.GetCurrentExtranetUser().IsLivePricesDisabled)
+                       && (Helpers.GetCurrentExtranetUser() == null || !Helpers.GetCurrentExtranetUser().IsLiveIntegrationPricesDisabled())
                        && settings.LazyLoadProductInfo;
         }
     }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Configuration/ISettings.cs

@@ -333,5 +333,11 @@ public interface ISettings
         /// Gets or sets a value that determines the max number of products on each live request.
         /// </summary>
         int MaxProductsPerRequest { get; set; }
+
+        /// <summary>
+        /// When enabled anonymous users will receive discounts calculated by DynamicWeb instead of retrieving them from the ERP via Live Integration
+        /// </summary>
+        /// <value><c>true</c> if [disable ERP discounts calculation for anonymous users]; otherwise, <c>false</c>.</value>        
+        public bool DisableErpDiscountsForAnonymousUsers { get; set; }
     }
 }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Configuration/Settings.cs

@@ -335,6 +335,12 @@ public string InstanceName
         /// </summary>
         public bool MakeRetryForLiveProductInformation { get; set; }
 
+        /// <summary>
+        /// When enabled anonymous users will receive discounts calculated by DynamicWeb instead of retrieving them from the ERP via Live Integration
+        /// </summary>
+        /// <value><c>true</c> if [disable ERP discounts calculation for anonymous users]; otherwise, <c>false</c>.</value>        
+        public bool DisableErpDiscountsForAnonymousUsers { get; set; }
+
         #endregion Users parameters
 
         #region Notifications parameters
@@ -463,6 +469,7 @@ public static void UpdateFrom(ISettings source, ISettings target)
                 target.OrderStateAfterExportFailed = source.OrderStateAfterExportFailed;
                 target.SkipLedgerOrder = source.SkipLedgerOrder;
                 target.ErpControlsDiscount = source.ErpControlsDiscount;
+                target.DisableErpDiscountsForAnonymousUsers = source.DisableErpDiscountsForAnonymousUsers;
                 target.ErpControlsShipping = source.ErpControlsShipping;
                 target.ErpShippingItemType = source.ErpShippingItemType;
                 target.ErpShippingItemKey = source.ErpShippingItemKey;

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.4.36</Version>		
+		<Version>10.21.5</Version>		
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Live Integration</Title>
 		<Description>Live Integration</Description>
@@ -19,15 +19,15 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>		
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Dynamicweb.Core" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.CoreUI" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.4.0" />
-		<PackageReference Include="Dynamicweb.Ecommerce.UI" Version="10.4.0" />		
+		<PackageReference Include="Dynamicweb.Core" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.CoreUI" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.21.5" />
+		<PackageReference Include="Dynamicweb.Ecommerce.UI" Version="10.21.5" />		
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 </Project>

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Extensions/ProductExtensions.cs

@@ -24,7 +24,7 @@ public static bool HasIdentifier(this Product product, Settings settings)
         public static bool IsUnitUpdateNeeded(this Product product, string unitId)
         {            
             if (string.IsNullOrEmpty(unitId) || product.DefaultUnitId == unitId ||                
-                !new Stocks.UnitOfMeasureService().GetUnitOfMeasures(product.Id).Any(u => u.UnitId.Equals(unitId)))            
+                !Services.UnitOfMeasure.GetUnitOfMeasures(product.Id).Any(u => u.UnitId.Equals(unitId)))            
                 return false;            
             return true;
         }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Extensions/UserExtensions.cs

@@ -0,0 +1,32 @@
+using Dynamicweb.Core;
+using Dynamicweb.Security.UserManagement;
+using System.Linq;
+
+namespace Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Extensions
+{
+    public static class UserExtensions
+    {
+        internal static bool IsLiveIntegrationPricesDisabled(this User user)
+        {
+            if (user.IsLivePricesDisabled)
+                return true;
+
+            var key = $"DynamicwebLiveIntegrationIsLivePricesDisabled{user.ID}";
+            var cacheValue = Context.Current?.Items?[key];
+            if (cacheValue is not null)
+            {
+                return Converter.ToBoolean(cacheValue);
+            }
+            else
+            {
+                var groups = user.GetAncestorGroups();
+                bool result = groups.Any(g => g.IsLivePricesDisabled);
+                if (Context.Current?.Items is not null)
+                {
+                    Context.Current.Items[key] = result;
+                }
+                return result;
+            }
+        }
+    }
+}

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Helpers.cs

@@ -304,7 +304,7 @@ internal static bool CanCheckPrice(Settings settings, Product product, User user
               || !settings.EnableLivePrices
               || Global.IsProductLazyLoad(settings)
               || (user == null && !settings.LiveProductInfoForAnonymousUsers)
-              || (user != null && user.IsLivePricesDisabled)
+              || (user != null && user.IsLiveIntegrationPricesDisabled())
               || !Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live)
               || product == null
               || string.IsNullOrEmpty(product.Id)

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveContext.cs

@@ -55,7 +55,7 @@ private static Country GetCountry(User user)
             }
             if (country is null)
             {
-                country = new Country();
+                country = new Country() { Code2 = "" };
             }
             return country;
         }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/LiveIntegrationAddIn.cs

@@ -482,6 +482,16 @@ public LiveIntegrationAddIn()
         [AddInParameterOrder(210)]
         public bool EnableCartCommunicationForAnonymousUsers { get; set; }
 
+        /// <summary>
+        /// When enabled anonymous users will receive discounts calculated by DynamicWeb instead of retrieving them from the ERP via Live Integration
+        /// </summary>
+        /// <value><c>true</c> if [disable ERP discounts calculation for anonymous users]; otherwise, <c>false</c>.</value>
+        [AddInParameter("Disable ERP discounts for anonymous users")]
+        [AddInParameterEditor(typeof(YesNoParameterEditor), "explanation=When enabled anonymous users will receive discounts calculated by DynamicWeb instead of retrieving them from the ERP via Live Integration;")]
+        [AddInParameterGroup("Users")]
+        [AddInParameterOrder(220)]
+        public bool DisableErpDiscountsForAnonymousUsers { get; set; }
+
         /// <summary>
         /// Gets or sets the customer name used in integration scenarios with anonymous users.
         /// </summary>

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/NotificationSubscribers/VariantListBeforeRender.cs

@@ -1,4 +1,5 @@
 using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Configuration;
+using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Extensions;
 using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Products;
 using Dynamicweb.Ecommerce.Products;
 using Dynamicweb.Extensibility.Notifications;
@@ -50,7 +51,7 @@ private static bool CanCheckPrice(Settings settings)
         {
            return settings.EnableLivePrices && EnabledAndActive(settings, SubmitType.Live) &&
                 (settings.LiveProductInfoForAnonymousUsers || Helpers.GetCurrentExtranetUser() != null) && 
-                (Helpers.GetCurrentExtranetUser() == null || !Helpers.GetCurrentExtranetUser().IsLivePricesDisabled) && 
+                (Helpers.GetCurrentExtranetUser() == null || !Helpers.GetCurrentExtranetUser().IsLiveIntegrationPricesDisabled()) && 
                 !Global.IsProductLazyLoad(settings); 
         }
     }