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.20</Version>
<Version>10.4.21</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 @@ -1302,7 +1302,8 @@ private static void ProcessOrderLineCustomFields(Settings settings, OrderLine or
private static void SetTotalOrderDiscount(Order order)
{
PriceInfo totalDiscount = new PriceInfo(order.Currency); ;
foreach (var line in order.OrderLines.Where(x => x.HasType(new[] { OrderLineType.Discount, OrderLineType.ProductDiscount })))
var orderLines = order.OrderLines.Where(x => x.HasType(new[] { OrderLineType.Discount, OrderLineType.ProductDiscount })).ToList();
foreach (var line in orderLines)
{
totalDiscount = totalDiscount.Add(line.Price);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ private void AppendOrderFields(Settings settings, XmlElement orderNode, Order or
private XmlNode BuildOrderLineFieldsXml(XmlDocument xmlDocument, Order order)
{
var orderLineFields = CreateTableNode(xmlDocument, "EcomOrderLineFields");

foreach (var orderLine in order.OrderLines.Where(x => x.OrderLineFieldValues.Any()))
var orderLines = order.OrderLines.Where(x => x.OrderLineFieldValues.Any()).ToList();
foreach (var orderLine in orderLines)
{
foreach (var field in orderLine.OrderLineFieldValues)
{
Expand All @@ -159,15 +159,17 @@ private XmlNode BuildOrderLinesXml(Settings currentSettings, XmlDocument xmlDocu
var tableNode = CreateTableNode(xmlDocument, "EcomOrderLines");

// Order lines (products, taxes)
foreach (var orderLine in order.OrderLines.Where(ol => !ol.IsDiscount()))
var orderLines = order.OrderLines.Where(ol => !ol.IsDiscount()).ToList();
foreach (var orderLine in orderLines)
{
CreateOrderLineXml(currentSettings, tableNode, orderLine, settings, logger);
}

if (!settings.GenerateXmlForHash || !settings.ErpControlsDiscount)
{
// Order lines (order discounts, and product discounts)
foreach (var orderLine in order.OrderLines.Where(ol => ol.IsDiscount()))
orderLines = order.OrderLines.Where(ol => ol.IsDiscount()).ToList();
foreach (var orderLine in orderLines)
{
if (!string.IsNullOrEmpty(orderLine.GiftCardCode))
{
Expand Down Expand Up @@ -379,7 +381,8 @@ private XmlDocument OrderLineFieldValuesToXml(OrderLineFieldValueCollection ofv)
private double GetOrderPriceWithoutVat(Order order)
{
var orderPriceWithoutVat = 0d;
foreach (var ol in order.OrderLines.Where(ol => !(ol.HasType(OrderLineType.Discount) && !string.IsNullOrEmpty(ol.GiftCardCode))))
var orderLines = order.OrderLines.Where(ol => !(ol.HasType(OrderLineType.Discount) && !string.IsNullOrEmpty(ol.GiftCardCode))).ToList();
foreach (var ol in orderLines)
orderPriceWithoutVat += ol.Price.PriceWithoutVAT;
return orderPriceWithoutVat;
}
Expand Down
Loading