Fixed problem with "Prefill customer address" setting and related data.

dynamicweb · Oct 7, 2024 · 6b80ab1 · 6b80ab1
1 parent 6835975
commit 6b80ab1
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 36 deletions.
diff --git a/src/Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.csproj b/src/Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<VersionPrefix>10.6.1</VersionPrefix>
+		<VersionPrefix>10.6.2</VersionPrefix>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Nets Easy Checkout</Title>
 		<Description>Nets Easy Checkout</Description>

diff --git a/src/Models/CreatePaymentRequest/Consumer/Company.cs b/src/Models/CreatePaymentRequest/Consumer/Company.cs
@@ -8,6 +8,6 @@ internal sealed class Company
     [DataMember(Name = "name")]
     public string Name { get; set; }
 
-    [DataMember(Name = "contact")]
+    [DataMember(Name = "contact", EmitDefaultValue = false)]
     public Contact Contact { get; set; }
 }
diff --git a/src/Models/CreatePaymentRequest/Consumer/Consumer.cs b/src/Models/CreatePaymentRequest/Consumer/Consumer.cs
@@ -11,7 +11,7 @@ internal sealed class Consumer
     [DataMember(Name = "shippingAddress")]
     public ShippingAddress ShippingAddress { get; set; }
 
-    [DataMember(Name = "privatePerson")]
+    [DataMember(Name = "privatePerson", EmitDefaultValue = false)]
     public Contact PrivatePerson { get; set; }
 
     [DataMember(Name = "company")]

diff --git a/src/Models/CreatePaymentRequest/Consumer/Contact.cs b/src/Models/CreatePaymentRequest/Consumer/Contact.cs
@@ -5,9 +5,9 @@ namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models.CreatePa
 [DataContract]
 internal sealed class Contact
 {
-    [DataMember(Name = "firstName")]
+    [DataMember(Name = "firstName", EmitDefaultValue = false)]
     public string FirstName { get; set; }
 
-    [DataMember(Name = "lastName")]
+    [DataMember(Name = "lastName", EmitDefaultValue = false)]
     public string LastName { get; set; }
 }
diff --git a/src/Models/ErrorResponse.cs b/src/Models/ErrorResponse.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models;
+
+[DataContract]
+internal sealed class ErrorResponse
+{
+    [DataMember(Name = "errors")]
+    public Dictionary<string, IEnumerable<string>> Errors { get; set; }
+}
diff --git a/src/Service/DibsRequest.cs b/src/Service/DibsRequest.cs
@@ -1,5 +1,8 @@
 using Dynamicweb.Core;
+using Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -47,9 +50,19 @@ ApiCommand.CreatePayment or
 
                         if (!response.IsSuccessStatusCode)
                         {
-                            string errorMessage = $"Unhandled exception. Operation failed: {response.ReasonPhrase}";
-                            //probably add some error handling later
-                            throw new Exception(errorMessage);
+                            var errorResponse = Converter.Deserialize<ErrorResponse>(data);
+                            if (errorResponse?.Errors?.Any() is true)
+                            {
+                                var errorMessage = new StringBuilder();
+                                foreach ((string propertyName, IEnumerable<string> errors) in errorResponse.Errors)
+                                {
+                                    string errorsText = string.Join(", ", errors);
+                                    errorMessage.AppendLine($"{propertyName}: {errorsText}");
+                                }
+                                throw new Exception(errorMessage.ToString());
+                            }
+
+                            throw new Exception($"Unhandled exception. Operation failed: {response.ReasonPhrase}");
                         }
 
                         return data;

diff --git a/src/Service/DibsService.cs b/src/Service/DibsService.cs
@@ -196,50 +196,53 @@ private static PaymentRequest ConvertOrder(Order order, CreatePaymentParameters
 
     private static Consumer GetConsumerData(Order order)
     {
-        string firstName = Converter.ToString(order.CustomerFirstName);
-        string lastName = Converter.ToString(order.CustomerSurname);
-        var customerName = Converter.ToString(order.CustomerName).Trim();
-        var isDeliveryAddressFilled = !string.IsNullOrEmpty(order.DeliveryCountryCode);
-        var countryCode3 = Services.Countries.GetCountry(isDeliveryAddressFilled ? order.DeliveryCountryCode : order.CustomerCountryCode)?.Code3;
-
-        var delimeterPosition = customerName.IndexOf(' ');
-        if (string.IsNullOrWhiteSpace(firstName))
-        {
-            firstName = delimeterPosition > -1 ? customerName.Substring(0, delimeterPosition) : customerName;
-        }
-        if (string.IsNullOrWhiteSpace(lastName))
-        {
-            lastName = delimeterPosition > -1 ? customerName.Substring(delimeterPosition + 1) : customerName;
-        }
+        bool isDeliveryAddressFilled = !string.IsNullOrEmpty(order.DeliveryCountryCode);
+        bool isCompanyDataFilled = !string.IsNullOrWhiteSpace(order.CustomerCompany);
+        string countryCode = Services.Countries.GetCountry(isDeliveryAddressFilled ? order.DeliveryCountryCode : order.CustomerCountryCode)?.Code3;
 
         return new()
         {
-            Email = Converter.ToString(order.CustomerEmail),
+            Email = order.CustomerEmail,
             ShippingAddress = new()
             {
                 AddressLine1 = isDeliveryAddressFilled ? order.DeliveryAddress : order.CustomerAddress,
                 AddressLine2 = isDeliveryAddressFilled ? order.DeliveryAddress2 : order.CustomerAddress2,
                 PostalCode = isDeliveryAddressFilled ? order.DeliveryZip : order.CustomerZip,
                 City = isDeliveryAddressFilled ? order.DeliveryCity : order.CustomerCity,
-                Country = countryCode3
+                Country = countryCode
             },
-            PrivatePerson = string.IsNullOrEmpty(order.CustomerCompany) ? new()
-            {
-                FirstName = firstName,
-                LastName = lastName
-            } : null,
-            Company = !string.IsNullOrEmpty(order.CustomerCompany) ? new()
+            PrivatePerson = !isCompanyDataFilled ? GetContact(order) : null,
+            Company = isCompanyDataFilled ? new()
             {
                 Name = order.CustomerCompany,
-                Contact = new()
-                {
-                    FirstName = firstName,
-                    LastName = lastName
-                }
+                Contact = GetContact(order)
             } : null
         };
     }
 
+    private static Contact GetContact(Order order)
+    {
+        string firstName = string.IsNullOrWhiteSpace(order.CustomerFirstName) ? order.CustomerName : order.CustomerFirstName;
+        string lastName = string.IsNullOrWhiteSpace(order.CustomerSurname) ? order.CustomerMiddleName : order.CustomerSurname;
+
+        if (!string.IsNullOrWhiteSpace(firstName) || !string.IsNullOrWhiteSpace(lastName))
+        {
+            //both first name and last name are required if Contact is serialized
+            if (string.IsNullOrWhiteSpace(firstName))
+                firstName = "-";
+            if (string.IsNullOrWhiteSpace(lastName))
+                lastName = "-";
+
+            return new()
+            {
+                FirstName = firstName,
+                LastName = lastName
+            };
+        }
+
+        return null;
+    }
+
     private static LineItem ConvertOrderLine(OrderLine orderline, ref long linesTotalPIP)
     {
         var unitName = "pcs";