Fix VAT Group prices and Expose Connector

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Examples/CustomProductProvider.cs

@@ -27,15 +27,16 @@ public override string GetProductIdentifier(Settings settings, Product product,
         /// <summary>
         /// Gets the price.
         /// </summary>
-        /// <param name="product">The product.</param>
+        /// <param name="productInfo">The product info.</param>
         /// <param name="quantity">The quantity.</param>
+        /// <param name="product">The product.</param>
         /// <returns>PriceInfo.</returns>
-        public override PriceInfo GetPriceInfo(LiveContext context, ProductInfo product, double quantity)
+        public override PriceInfo GetPriceInfo(LiveContext context, ProductInfo productInfo, double quantity, Product product)
         {
             // Example: if we have a price per kilogram - we need to multiply it by quantity
-            if (double.TryParse(product["TotalPrice"].ToString(), out double unitPriceWithoutVat))
+            if (double.TryParse(productInfo["TotalPrice"].ToString(), out double unitPriceWithoutVat))
             {
-                double? unitPriceWithVat = (double?)product["TotalPriceWithVat"];
+                double? unitPriceWithVat = (double?)productInfo["TotalPriceWithVat"];
 
                 var currency = Common.Context.Currency;
                 if (currency is null)
@@ -47,7 +48,7 @@ public override PriceInfo GetPriceInfo(LiveContext context, ProductInfo product,
             }
             else
             {
-                return base.GetPriceInfo(context, product, quantity);
+                return base.GetPriceInfo(context, productInfo, quantity, product);
             }
         }
     }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Connectors/Connector.cs

@@ -9,8 +9,6 @@
 using System.Collections.Concurrent;
 using System.Net;
 using System.Net.Http;
-using System.Net.Mail;
-using System.Runtime.ExceptionServices;
 using System.Xml;
 using static Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Notifications.Communication;
 
@@ -19,7 +17,7 @@ namespace Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Connectors
     /// <summary>
     /// Main class to interact with a remote ERP.
     /// </summary>
-    internal static class Connector
+    public static class Connector
     {
         /// <summary>
         /// The maximum retry count
@@ -40,7 +38,7 @@ public static bool EnableThrowExceptions
             {
                 return Core.Converter.ToBoolean(Context.Current?.Items?["DynamicwebLiveIntegrationAddInThrowExceptions"]);
             }
-            set
+            internal set
             {
                 if (Context.Current?.Items != null)
                 {
@@ -68,7 +66,7 @@ private static ConnectorBase GetConnector(Settings settings, Logger logger, Subm
             {
                 return new EndpointConnector(settings, logger, submitType, order);
             }
-        }        
+        }
 
         /// <summary>
         /// Calculates the order.
@@ -278,7 +276,7 @@ private static XmlDocument Communicate(Settings settings, string request, string
                     logger.Log(ErrorLevel.ConnectionError, $"An error occurred while calling {referenceName} from Web Service: '{ex.Message}'.");
                     Diagnostics.ExecutionTable.Current.Add($"DynamicwebLiveIntegration: An error occurred while calling {referenceName} from Web Service: '{ex.Message}'.");
 
-                    HandleException(connector, settings, endpoint, ex, out httpStatusCode, ref retry);                    
+                    HandleException(connector, settings, endpoint, ex, out httpStatusCode, ref retry);
 
                     NotificationManager.Notify(OnAfterErpException, new OnAfterErpExceptionArgs(request, erpXmlResponse, referenceName, ex, settings, logger));
                 }
@@ -357,8 +355,27 @@ private static void HandleException(ConnectorBase connector, Settings settings,
             }
         }
 
-        internal static string RetrievePDF(Settings settings, string requestString, SubmitType submitType)
+        /// <summary>
+        /// Retrieves a PDF document as a Base64-encoded string based on the specified request and submission type.
+        /// </summary>
+        /// <remarks>The returned string can be decoded to obtain the original PDF file. Ensure that the
+        /// provided settings and request string are valid to avoid exceptions during execution.</remarks>
+        /// <param name="settings">The settings used to configure the connector and logging behavior. Cannot be null.</param>
+        /// <param name="requestString">The request data to be sent to the connector for PDF retrieval. Cannot be null or empty.</param>
+        /// <param name="submitType">The type of submission to use when executing the request.</param>
+        /// <returns>A Base64-encoded string representing the retrieved PDF document.</returns>
+        public static string RetrievePDF(Settings settings, string requestString, SubmitType submitType)
         {
+            if (settings is null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
+            if (string.IsNullOrEmpty(requestString))
+            {
+                throw new ArgumentException("RequestString value cannot be null or empty.", nameof(requestString));
+            }
+
             Diagnostics.ExecutionTable.Current.Add("DynamicwebLiveIntegration.Connector.RetrievePDF START");
             string base64EncodedPDF;
             var logger = new Logger(settings);

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.4.35</Version>		
+		<Version>10.4.36</Version>		
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Live Integration</Title>
 		<Description>Live Integration</Description>

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Products/ProductManager.cs

@@ -50,6 +50,10 @@ internal static ProductProviderBase ProductProvider
                         if (!ReferenceEquals(addIn, typeof(ProductProviderBase)))
                         {
                             provider = (ProductProviderBase)AddInManager.GetInstance(addIn);
+                            // Honor legacy 3-parameter overrides in subclasses so existing customizations are not silently
+                            // bypassed when internal callers use the new overload with 4-parameters.
+                            var method = addIn.GetMethod(nameof(ProductProviderBase.GetPriceInfo), [typeof(LiveContext), typeof(ProductInfo), typeof(double)]);
+                            provider.HasLegacyGetPriceInfoOverride = method is not null;
                             break;
                         }
                     }

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Products/ProductPriceProvider.cs

@@ -132,7 +132,7 @@ public PriceInfo FindPriceInfo(PriceContext context, PriceProductSelection selec
                     ? productInfo
                     : null;
 
-                return productInfo != null ? productProvider.GetPriceInfo(liveContext, productInfo, selection.Quantity) : null;
+                return productInfo != null ? productProvider.GetPriceInfo(liveContext, productInfo, selection.Quantity, selection.Product) : null;
             }
             catch (Exception e)
             {
@@ -161,7 +161,7 @@ IEnumerable<KeyValuePair<PriceQuantityInfo, PriceInfo>> IPriceInfoProvider.FindQ
                         Quantity = unitPrice.Quantity ?? 0,
                         UnitId = unitPrice.UnitId,
                     },
-                    ProductProviderBase.GetPriceInfo(context, unitPrice.Amount, unitPrice.AmountWithVat)
+                    ProductProviderBase.GetPriceInfo(context, unitPrice.Amount, unitPrice.AmountWithVat, product)
                 ));
             }
             return result;

src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Products/ProductProviderBase.cs

@@ -19,6 +19,8 @@ namespace Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Products
     /// </example>
     public class ProductProviderBase
     {
+        internal bool HasLegacyGetPriceInfoOverride { get; set; }
+
         /// <summary>
         /// Creates a unique product identifier by concatenating the product ID or number (depends on the CalculatePriceUsingProductNumber setting), the variant ID and the language ID.
         /// Override to build up your own unique identifier.
@@ -93,22 +95,46 @@ public virtual Product GetProductWithUnit(Product product, string unitId)
         /// <summary>
         /// Gets the price.
         /// </summary>
-        /// <param name="product">The product.</param>
+        /// <param name="productInfo">The product info.</param>
         /// <param name="quantity">The quantity.</param>
         /// <returns>PriceInfo</returns>
-        /// <exception cref="ArgumentNullException">product</exception>
+        /// <exception cref="ArgumentNullException">productInfo</exception>
         /// <example>
         /// <code description="Overriding example" source="..\..\Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Examples\CustomProductProvider.cs" lang="CS"></code>
         /// </example>
-        public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo product, double quantity)
+        [Obsolete("Use GetPriceInfo(LiveContext context, ProductInfo productInfo, double quantity, Product product) instead")]
+        public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo productInfo, double quantity) =>
+            GetPriceInfoCore(context, productInfo, quantity, null);
+
+        /// <summary>
+        /// Gets the price.
+        /// </summary>
+        /// <param name="productInfo">The product info.</param>
+        /// <param name="quantity">The quantity.</param>
+        /// <param name="product">The product.</param>
+        /// <returns>PriceInfo</returns>
+        /// <exception cref="ArgumentNullException">productInfo</exception>
+        /// <example>
+        /// <code description="Overriding example" source="..\..\Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Examples\CustomProductProvider.cs" lang="CS"></code>
+        /// </example>
+        public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo productInfo, double quantity, Product product)
         {
-            if (product == null)
+            if (HasLegacyGetPriceInfoOverride)
             {
-                throw new ArgumentNullException(nameof(product));
+#pragma warning disable CS0618
+                return GetPriceInfo(context, productInfo, quantity);
+#pragma warning restore CS0618
             }
 
-            double? priceWithoutVat = (double?)product["TotalPrice"];
-            double? priceWithVat = (double?)product["TotalPriceWithVat"];
+            return GetPriceInfoCore(context, productInfo, quantity, product);
+        }
+
+        private static PriceInfo GetPriceInfoCore(LiveContext context, ProductInfo productInfo, double quantity, Product product)
+        {
+            ArgumentNullException.ThrowIfNull(productInfo);
+
+            double? priceWithoutVat = (double?)productInfo["TotalPrice"];
+            double? priceWithVat = (double?)productInfo["TotalPriceWithVat"];
 
             if (!priceWithoutVat.HasValue)
             {
@@ -117,7 +143,7 @@ public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo product,
                     quantity = 1;
                 }
 
-                var erpPriceResponse = ((IList<ProductPrice>)product["Prices"] ?? Enumerable.Empty<ProductPrice>())
+                var erpPriceResponse = ((IList<ProductPrice>)productInfo["Prices"] ?? Enumerable.Empty<ProductPrice>())
                        .Where(p => quantity >= p.Quantity.GetValueOrDefault(1))
                        .OrderByDescending(p => p.Quantity.GetValueOrDefault(1))
                        .FirstOrDefault();
@@ -126,8 +152,7 @@ public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo product,
                 priceWithVat = erpPriceResponse?.AmountWithVat;
             }
 
-            PriceInfo result = GetPriceInfo(context.PriceContext != null ? context.PriceContext : new PriceContext(context.Currency, context.Country), priceWithoutVat, priceWithVat);
-            return result;
+            return GetPriceInfo(context.PriceContext ?? new PriceContext(context.Currency, context.Country), priceWithoutVat, priceWithVat, product);
         }
 
         /// <summary>
@@ -138,7 +163,7 @@ public virtual PriceInfo GetPriceInfo(LiveContext context, ProductInfo product,
         /// <param name="quantity">The quantity.</param>
         public virtual void FillProductValues(ProductInfo productInfo, Product product, Settings settings, double quantity, LiveContext context)
         {
-            var price = GetPriceInfo(context, productInfo, quantity);            
+            var price = GetPriceInfo(context, productInfo, quantity, product);
             PriceInfo productPrice = PriceManager.GetPrice(context.PriceContext ?? new PriceContext(context.Currency, context.Country), product);
             productPrice.PriceWithoutVAT = price.PriceWithoutVAT;
             productPrice.PriceWithVAT = price.PriceWithVAT;
@@ -274,7 +299,7 @@ public virtual void FillProductFieldValues(Product product, ProductInfo productI
             }
         }
 
-        internal static PriceInfo GetPriceInfo(PriceContext priceContext, double? priceWithoutVat, double? priceWithVat)
+        internal static PriceInfo GetPriceInfo(PriceContext priceContext, double? priceWithoutVat, double? priceWithVat, Product product)
         {
             PriceInfo result = new PriceInfo(priceContext.Currency);
             result.PriceWithoutVAT = priceWithoutVat != null ? priceWithoutVat.Value : 0;
@@ -294,7 +319,9 @@ internal static PriceInfo GetPriceInfo(PriceContext priceContext, double? priceW
                     Price = result.PriceWithoutVAT,
                     Currency = priceContext.Currency
                 };
-                var calculated = PriceCalculated.Create(priceContext, price);
+                var calculated = product == null
+                    ? PriceCalculated.Create(priceContext, price)
+                    : PriceCalculated.Create(priceContext, price, product);
                 if (calculated != null)
                 {
                     calculated.Calculate();