Prefill customer information and related

src/DibsEasyCheckout.cs

@@ -92,9 +92,12 @@
         [AddInParameter("Support B2B"), AddInParameterEditor(typeof(YesNoParameterEditor), "infoText=Enables a \"Business checkout\" radio button in the DIBS easy payment window.;")]
         public bool SupportB2b { get; set; }
 
-        [AddInParameter("Set B2B as default"), AddInParameterEditor(typeof(YesNoParameterEditor), "infoText=If \"Support B2B\" is enabled and \"Set B2B as default\" then B2B fields are rendered by default in the DIBS easy payment window. The added B2B address fields vary from country to country.;")]
+        [AddInParameter("Set B2B as default"), AddInParameterEditor(typeof(YesNoParameterEditor), "infoText=If \"Support B2B\" is enabled and \"Set B2B as default\" then B2B fields are rendered by default in the DIBS easy payment window. The added B2B address fields vary from country to country.")]
         public bool SetB2bAsDefault { get; set; }
 
+        [AddInParameter("Enable billing address"), AddInParameterEditor(typeof(YesNoParameterEditor), "infoText=If set to true, the Dibs checkout form provides the option to specify separate billing and shipping addresses. If set to false, the billing address is used as the shipping address.")]
+        public bool EnableBillingAddress { get; set; }
+
         [AddInParameter("Test mode"), AddInParameterEditor(typeof(YesNoParameterEditor), "infoText=When enabled, the test credentials are used instead of the live credentials.;")]
         public bool TestMode { get; set; } = true;
 
@@ -635,7 +638,7 @@
             return string.Empty;
         }
 
         private OutputResult RenderPaymentForm(Order order, Template formTemplate, bool headless = false, string? receiptUrl = null)
         {
             try
             {
@@ -645,14 +648,15 @@
                 var service = new DibsService(order, GetSecretKey(), GetApiUrl());
                 var newPayment = service.CreatePayment(new()
                 {
-                    BaseUrl = baseUrl,
+                    WindowMode = windowMode,
+                    SupportB2b = SupportB2b,
+                    SetB2bAsDefault = SetB2bAsDefault,
                     PrefillCustomerAddress = PrefillCustomerAddress,
+                    EnableBillingAddress = EnableBillingAddress,
                     ReceiptUrl = receiptUrl,
                     ApprovetUrl = approvetUrl,
-                    SetB2bAsDefault = SetB2bAsDefault,
-                    SupportB2b = SupportB2b,
-                    TermsPage = TermsPage,
-                    WindowMode = windowMode
+                    BaseUrl = baseUrl,
+                    TermsPage = TermsPage
                 });
 
                 LogEvent(order, "Payment created.");

src/Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<VersionPrefix>10.6.3</VersionPrefix>
+		<VersionPrefix>10.6.4</VersionPrefix>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Nets Easy Checkout</Title>
 		<Description>Nets Easy Checkout</Description>

src/Models/CreatePaymentRequest/Consumer/ShippingAddress.cs → src/Models/CreatePaymentRequest/Consumer/Address.cs

@@ -3,20 +3,20 @@
 namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePaymentRequest;
 
 [DataContract]
-internal sealed class ShippingAddress
+internal sealed class Address
 {
-    [DataMember(Name = "addressLine1")]
+    [DataMember(Name = "addressLine1", EmitDefaultValue = false)]
     public string AddressLine1 { get; set; }
 
-    [DataMember(Name = "addressLine2")]
+    [DataMember(Name = "addressLine2", EmitDefaultValue = false)]
     public string AddressLine2 { get; set; }
 
-    [DataMember(Name = "postalCode")]
+    [DataMember(Name = "postalCode", EmitDefaultValue = false)]
     public string PostalCode { get; set; }
 
-    [DataMember(Name = "city")]
+    [DataMember(Name = "city", EmitDefaultValue = false)]
     public string City { get; set; }
 
-    [DataMember(Name = "country")]
+    [DataMember(Name = "country", EmitDefaultValue = false)]
     public string Country { get; set; }
 }

src/Models/CreatePaymentRequest/Consumer/Company.cs

@@ -5,7 +5,7 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class Company
 {
-    [DataMember(Name = "name")]
+    [DataMember(Name = "name", EmitDefaultValue = false)]
     public string Name { get; set; }
 
     [DataMember(Name = "contact", EmitDefaultValue = false)]

src/Models/CreatePaymentRequest/Consumer/Consumer.cs

@@ -5,15 +5,18 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class Consumer
 {
-    [DataMember(Name = "email")]
+    [DataMember(Name = "email", EmitDefaultValue = false)]
     public string Email { get; set; }
 
-    [DataMember(Name = "shippingAddress")]
-    public ShippingAddress ShippingAddress { get; set; }
+    [DataMember(Name = "shippingAddress", EmitDefaultValue = false)]
+    public Address ShippingAddress { get; set; }
+
+    [DataMember(Name = "billingAddress", EmitDefaultValue = false)]
+    public Address BillingAddress { get; set; }
 
     [DataMember(Name = "privatePerson", EmitDefaultValue = false)]
     public Contact PrivatePerson { get; set; }
 
-    [DataMember(Name = "company")]
+    [DataMember(Name = "company", EmitDefaultValue = false)]
     public Company Company { get; set; }
 }

src/Models/CreatePaymentRequest/ConsumerType.cs

@@ -6,9 +6,9 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class ConsumerType
 {
-    [DataMember(Name = "default")]
+    [DataMember(Name = "default", EmitDefaultValue = false)]
     public string Default { get; set; }
 
-    [DataMember(Name = "supportedTypes")]
+    [DataMember(Name = "supportedTypes", EmitDefaultValue = false)]
     public IEnumerable<string> SupportedTypes { get; set; }
 }

src/Models/CreatePaymentRequest/LineItem.cs

@@ -21,10 +21,10 @@ internal sealed class LineItem
     [DataMember(Name = "unit")]
     public string Unit { get; set; }
 
-    [DataMember(Name = "taxRate")]
+    [DataMember(Name = "taxRate", EmitDefaultValue = false)]
     public long TaxRate { get; set; }
 
-    [DataMember(Name = "taxAmount")]
+    [DataMember(Name = "taxAmount", EmitDefaultValue = false)]
     public long TaxAmount { get; set; }
 
     [DataMember(Name = "grossTotalAmount")]

src/Models/CreatePaymentRequest/Notifications.cs

@@ -6,6 +6,6 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class Notifications
 {
-    [DataMember(Name = "webhooks")]
+    [DataMember(Name = "webhooks", EmitDefaultValue = false)]
     public IEnumerable<Webhook> Webhooks { get; set; }
 }

src/Models/CreatePaymentRequest/PaymentCheckout.cs

@@ -5,24 +5,27 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class PaymentCheckout
 {
-    [DataMember(Name = "url")]
+    [DataMember(Name = "url", EmitDefaultValue = false)]
     public string Url { get; set; }
 
-    [DataMember(Name = "returnUrl")]
+    [DataMember(Name = "returnUrl", EmitDefaultValue = false)]
     public string ReturnUrl { get; set; }
 
     [DataMember(Name = "termsUrl")]
     public string TermsUrl { get; set; }
 
-    [DataMember(Name = "integrationType")]
+    [DataMember(Name = "integrationType", EmitDefaultValue = false)]
     public string IntegrationType { get; set; }
 
-    [DataMember(Name = "merchantHandlesConsumerData")]
+    [DataMember(Name = "merchantHandlesConsumerData", EmitDefaultValue = false)]
     public bool MerchantHandlesConsumerData { get; set; }
 
-    [DataMember(Name = "consumerType")]
+    [DataMember(Name = "consumerType", EmitDefaultValue = false)]
     public ConsumerType ConsumerType { get; set; }
 
-    [DataMember(Name = "consumer")]
+    [DataMember(Name = "consumer", EmitDefaultValue = false)]
     public Consumer Consumer { get; set; }
+
+    [DataMember(Name = "shipping", EmitDefaultValue = false)]
+    public Shipping Shipping { get; set; }
 }

src/Models/CreatePaymentRequest/PaymentOrder.cs

@@ -15,6 +15,6 @@ internal sealed class PaymentOrder
     [DataMember(Name = "currency")]
     public string Currency { get; set; }
 
-    [DataMember(Name = "reference")]
+    [DataMember(Name = "reference", EmitDefaultValue = false)]
     public string Reference { get; set; }
 }

src/Models/CreatePaymentRequest/PaymentRequest.cs

@@ -11,6 +11,6 @@ internal sealed class PaymentRequest
     [DataMember(Name = "checkout")]
     public PaymentCheckout Checkout { get; set; }
 
-    [DataMember(Name = "notifications")]
+    [DataMember(Name = "notifications", EmitDefaultValue = false)]
     public Notifications Notifications { get; set; }
 }

src/Models/CreatePaymentRequest/Shipping.cs

@@ -0,0 +1,10 @@
+using System.Runtime.Serialization;
+
+namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePaymentRequest;
+
+[DataContract]
+internal sealed class Shipping
+{
+    [DataMember(Name = "enableBillingAddress", EmitDefaultValue = false)]
+    public bool EnableBillingAddress { get; set; }
+}

src/Models/CreatePaymentRequest/Webhook.cs

@@ -11,6 +11,6 @@ internal sealed class Webhook
     [DataMember(Name = "url")]
     public string Url { get; set; }
 
-    [DataMember(Name = "authorization")]
+    [DataMember(Name = "authorization", EmitDefaultValue = false)]
     public string Authorization { get; set; }
 }

src/Service/CreatePaymentParameters.cs

@@ -10,6 +10,8 @@ internal sealed class CreatePaymentParameters
 
     public bool PrefillCustomerAddress { get; set; }
 
+    public bool EnableBillingAddress { get; set; }
+
     public string ReceiptUrl { get; set; }
 
     public string ApprovetUrl { get; set; }