Skip to content

Fix sending BillingName on the DeliveryName field #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DWDBE merged 1 commit into from
Apr 10, 2025
Merged

Fix sending BillingName on the DeliveryName field #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>10.4.19</Version>
<Version>10.4.20</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<Title>Live Integration</Title>
<Description>Live Integration</Description>
Expand Down
23 changes: 13 additions & 10 deletions src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/XmlGenerators/OrderXmlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,16 @@ private static void AddCustomerInformation(Settings currentSettings, XmlElement
/// <param name="orderNode">The order node.</param>
/// <param name="order">The order.</param>
private void AddOrderDeliveryInformation(OrderXmlGeneratorSettings settings, XmlElement orderNode, Order order, User user)
{
AddChildXmlNode(orderNode, "OrderDeliveryName",
!string.IsNullOrWhiteSpace(order.CustomerName) ? order.CustomerName : !string.IsNullOrWhiteSpace(user?.Name) ? user.Name : order.DeliveryName);
{
UserAddress deliveryAddress = null;
if (settings.CreateOrder && order.DeliveryAddressId > 0)
{
deliveryAddress = UserManagementServices.UserAddresses.GetAddressById(order.DeliveryAddressId);
}
string deliveryName = (deliveryAddress is object && !string.IsNullOrEmpty(order.DeliveryName)) ? order.DeliveryName :
!string.IsNullOrWhiteSpace(order.CustomerName) ? order.CustomerName : user.Name;

AddChildXmlNode(orderNode, "OrderDeliveryName", deliveryName);
AddChildXmlNode(orderNode, "OrderDeliveryAddress", order.DeliveryAddress);
AddChildXmlNode(orderNode, "OrderDeliveryAddress2", order.DeliveryAddress2);
AddChildXmlNode(orderNode, "OrderDeliveryCity", order.DeliveryCity);
Expand All @@ -95,14 +102,10 @@ private void AddOrderDeliveryInformation(OrderXmlGeneratorSettings settings, Xml
AddChildXmlNode(orderNode, "OrderDeliveryPhone", order.DeliveryPhone);
AddChildXmlNode(orderNode, "OrderDeliveryFax", order.DeliveryFax);
AddChildXmlNode(orderNode, "OrderDeliveryCompany", order.DeliveryCompany);
if (settings.CreateOrder && order.DeliveryAddressId > 0)
if (deliveryAddress is object)
{
var address = UserManagementServices.UserAddresses.GetAddressById(order.DeliveryAddressId);
if (address is object)
{
AddChildXmlNode(orderNode, "OrderDeliveryAddressId", !string.IsNullOrEmpty(address.ExternalID) ? address.ExternalID : address.UniqueIdentifier);
}
}
AddChildXmlNode(orderNode, "OrderDeliveryAddressId", !string.IsNullOrEmpty(deliveryAddress.ExternalID) ? deliveryAddress.ExternalID : deliveryAddress.UniqueIdentifier);
}
}

/// <summary>
Expand Down
Loading