Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>10.4.15</Version>
<Version>10.4.16</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<Title>Live Integration</Title>
<Description>Live Integration</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,9 @@ private static ResponseCacheLevel GetOrderCacheLevel(Settings settings)
}

// default states
if (successOrderStateId == null)
{
successOrderStateId = settings.OrderStateAfterExportSucceeded;
}
successOrderStateId ??= settings.OrderStateAfterExportSucceeded;

if (failedOrderStateId == null)
{
failedOrderStateId = settings.OrderStateAfterExportFailed;
}
failedOrderStateId ??= settings.OrderStateAfterExportFailed;
var xmlGeneratorSettings = new OrderXmlGeneratorSettings
{
AddOrderLineFieldsToRequest = settings.AddOrderLineFieldsToRequest,
Expand Down Expand Up @@ -126,7 +120,8 @@ private static ResponseCacheLevel GetOrderCacheLevel(Settings settings)
// get last hash
string lastHash = GetLastOrderHash(settings);

if (!string.IsNullOrEmpty(lastHash) && lastHash == currentHash)
if (liveIntegrationSubmitType != SubmitType.ScheduledTask && liveIntegrationSubmitType != SubmitType.CaptureTask &&
!string.IsNullOrEmpty(lastHash) && lastHash == currentHash)
{
// no changes to order
Diagnostics.ExecutionTable.Current.Add("DynamicwebLiveIntegration.OrderHandler.UpdateOrder END");
Expand Down
Loading