Export: Projected customer id was ignored in price calculation

Zeeshan1006 · Jul 13, 2016 · e6ef17b · e6ef17b
1 parent d9455aa
commit e6ef17b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs
@@ -969,9 +969,12 @@ private List<Store> Init(DataExporterContext ctx, int? totalRecords = null)
 				ctx.ContextCurrency = _services.WorkContext.WorkingCurrency;
 
 			if (ctx.Projection.CustomerId.HasValue)
-				ctx.ContextCustomer = _customerService.GetCustomerById(ctx.Projection.CustomerId.Value);
-			else
-				ctx.ContextCustomer = _services.WorkContext.CurrentCustomer;
+			{
+				ctx.OldCurrentCustomer = _services.WorkContext.CurrentCustomer;
+				_services.WorkContext.CurrentCustomer = _customerService.GetCustomerById(ctx.Projection.CustomerId.Value);
+			}
+
+			ctx.ContextCustomer = _services.WorkContext.CurrentCustomer;
 
 			if (ctx.Projection.LanguageId.HasValue)
 				ctx.ContextLanguage = _languageService.Value.GetLanguageById(ctx.Projection.LanguageId.Value);
@@ -1286,6 +1289,11 @@ private void ExportCoreOuter(DataExporterContext ctx)
 
 							_exportProfileService.Value.UpdateExportProfile(ctx.Request.Profile);
 						}
+
+						if (ctx.OldCurrentCustomer != null)
+						{
+							_services.WorkContext.CurrentCustomer = ctx.OldCurrentCustomer;
+						}
 					}
 					catch (Exception exception)
 					{

diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
@@ -89,6 +89,7 @@ public bool Supports(ExportFeatures feature)
 		public ExportFilter Filter { get; private set; }
 		public ExportProjection Projection { get; private set; }
 		public Currency ContextCurrency { get; set; }
+		public Customer OldCurrentCustomer { get; set; }
 		public Customer ContextCustomer { get; set; }
 		public Language ContextLanguage { get; set; }