Fixes the delivery time in the order notifications may differ from delivery time on the product detail page

mgesing · mgesing · commit b08ed026da5d · 2018-05-22T10:31:25.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -41,6 +41,7 @@
 * #1449 IgnoreCharges of shipping methods is not working if a localized name is specified
 * Fixes "The object does not support the property or method 'startsWith'" on product edit page.
 * Wallet: Fixes "Child actions are not allowed to perform redirect actions" when there are cart warnings
+* Fixes the delivery time in the order notifications may differ from delivery time on the product detail page
 
 
 ## SmartStore.NET 3.1.0
diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs
@@ -566,7 +566,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon
 
 			if (shoppingCartSettings.ShowDeliveryTimes && part.IsShipEnabled)
 			{
-				if (deliveryTimeService.GetDeliveryTimeById(part.DeliveryTimeId ?? 0) is DeliveryTime dt)
+				if (deliveryTimeService.GetDeliveryTime(part) is DeliveryTime dt)
 				{
 					m["DeliveryTime"] = new Dictionary<string, object>
 					{

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ protected virtual object CreateModelPart(Product part, MessageContext messageCon`
`566`	`566`
`567`	`567`	`if (shoppingCartSettings.ShowDeliveryTimes && part.IsShipEnabled)`
`568`	`568`	`{`
`569`		`- if (deliveryTimeService.GetDeliveryTimeById(part.DeliveryTimeId ?? 0) is DeliveryTime dt)`
	`569`	`+ if (deliveryTimeService.GetDeliveryTime(part) is DeliveryTime dt)`
`570`	`570`	`{`
`571`	`571`	`m["DeliveryTime"] = new Dictionary<string, object>`
`572`	`572`	`{`