(
skip => GetNewsLetterSubscriptions(ctx, skip),
null,
@@ -386,11 +384,11 @@ private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx, in
break;
default:
- ctx.ExecuteContext.Segmenter = null;
+ ctx.ExecuteContext.DataSegmenter = null;
break;
}
- return ctx.ExecuteContext.Segmenter as IExportDataSegmenterProvider;
+ return ctx.ExecuteContext.DataSegmenter as IExportDataSegmenterProvider;
}
private bool CallProvider(DataExporterContext ctx, string streamId, string method, string path)
@@ -416,7 +414,9 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
if (ctx.IsFileBasedExport && path.HasValue() && ctx.ExecuteContext.DataStream.Length > 0)
{
if (!ctx.ExecuteContext.DataStream.CanSeek)
+ {
ctx.Log.Warning("Data stream seems to be closed!");
+ }
ctx.ExecuteContext.DataStream.Seek(0, SeekOrigin.Begin);
@@ -424,7 +424,6 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
{
ctx.Log.Information("Creating file {0}.".FormatInvariant(path));
-
ctx.ExecuteContext.DataStream.CopyTo(fileStream);
}
}
@@ -443,61 +442,90 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
ctx.ExecuteContext.DataStream.Dispose();
ctx.ExecuteContext.DataStream = null;
}
+
+ if (ctx.ExecuteContext.Abort == DataExchangeAbortion.Hard && ctx.IsFileBasedExport && path.HasValue())
+ {
+ FileSystemHelper.Delete(path);
+ }
}
return (ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard);
}
- private void Deploy(DataExporterContext ctx, string zipPath)
+ private bool Deploy(DataExporterContext ctx, string zipPath)
{
- var allFiles = System.IO.Directory.GetFiles(ctx.FolderContent, "*.*", SearchOption.AllDirectories);
+ var allSucceeded = true;
+ var deployments = ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled);
+
+ if (deployments.Count() == 0)
+ return false;
var context = new ExportDeploymentContext
{
+ T = T,
Log = ctx.Log,
FolderContent = ctx.FolderContent,
- ZipPath = zipPath
- };
+ ZipPath = zipPath,
+ CreateZipArchive = ctx.Request.Profile.CreateZipArchive
+ };
- foreach (var deployment in ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled))
+ foreach (var deployment in deployments)
{
- if (deployment.CreateZip)
- context.DeploymentFiles = new string[] { zipPath };
- else
- context.DeploymentFiles = allFiles;
+ IFilePublisher publisher = null;
- try
+ context.Result = new DataDeploymentResult
{
- IFilePublisher publisher = null;
+ LastExecutionUtc = DateTime.UtcNow
+ };
- if (deployment.DeploymentType == ExportDeploymentType.Email)
- {
- publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value);
- }
- else if (deployment.DeploymentType == ExportDeploymentType.FileSystem)
- {
- publisher = new FileSystemFilePublisher();
- }
- else if (deployment.DeploymentType == ExportDeploymentType.Ftp)
- {
- publisher = new FtpFilePublisher();
- }
- else if (deployment.DeploymentType == ExportDeploymentType.Http)
+ try
+ {
+ switch (deployment.DeploymentType)
{
- publisher = new HttpFilePublisher();
+ case ExportDeploymentType.Email:
+ publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value);
+ break;
+ case ExportDeploymentType.FileSystem:
+ publisher = new FileSystemFilePublisher();
+ break;
+ case ExportDeploymentType.Ftp:
+ publisher = new FtpFilePublisher();
+ break;
+ case ExportDeploymentType.Http:
+ publisher = new HttpFilePublisher();
+ break;
+ case ExportDeploymentType.PublicFolder:
+ publisher = new PublicFolderPublisher();
+ break;
}
if (publisher != null)
{
publisher.Publish(context, deployment);
+
+ if (!context.Result.Succeeded)
+ allSucceeded = false;
}
}
catch (Exception exception)
{
+ allSucceeded = false;
+
+ if (context.Result != null)
+ {
+ context.Result.LastError = exception.ToAllMessages();
+ }
+
ctx.Log.Error("Deployment \"{0}\" of type {1} failed: {2}".FormatInvariant(
deployment.Name, deployment.DeploymentType.ToString(), exception.Message), exception);
}
+
+ deployment.ResultInfo = XmlHelper.Serialize(context.Result);
+
+ _exportProfileService.Value.UpdateExportDeployment(deployment);
}
+
+ return allSucceeded;
}
private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
@@ -507,7 +535,7 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (emailAccount == null)
emailAccount = _emailAccountService.Value.GetDefaultEmailAccount();
- var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(false), ctx.Request.Profile.Id);
+ var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(ctx.Store.SslEnabled), ctx.Request.Profile.Id);
var languageId = ctx.Projection.LanguageId ?? 0;
var smtpContext = new SmtpContext(emailAccount);
@@ -525,15 +553,15 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (ctx.IsFileBasedExport && File.Exists(zipPath))
{
var fileName = Path.GetFileName(zipPath);
- body.AppendFormat("{1}
", downloadUrl + HttpUtility.UrlDecode(fileName), fileName);
+ body.AppendFormat("{2}
", downloadUrl, HttpUtility.UrlEncode(fileName), fileName);
}
- if (ctx.IsFileBasedExport && ctx.Result.Files.Count > 0)
+ if (ctx.IsFileBasedExport && ctx.Result.Files.Any())
{
body.Append("");
foreach (var file in ctx.Result.Files)
{
- body.AppendFormat("
", downloadUrl + HttpUtility.UrlDecode(file.FileName), file.FileName);
+ body.AppendFormat("", downloadUrl, HttpUtility.UrlEncode(file.FileName), file.FileName);
}
body.Append("");
}
@@ -543,9 +571,6 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (ctx.Request.Profile.CompletedEmailAddresses.HasValue())
message.To.AddRange(ctx.Request.Profile.CompletedEmailAddresses.SplitSafe(",").Where(x => x.IsEmail()).Select(x => new EmailAddress(x)));
- if (message.To.Count == 0 && _contactDataSettings.Value.WebmasterEmailAddress.HasValue())
- message.To.Add(new EmailAddress(_contactDataSettings.Value.WebmasterEmailAddress));
-
if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue())
message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress));
@@ -661,7 +686,7 @@ private List GetProducts(DataExporterContext ctx, int skip)
OrderBy = ProductSortingEnum.Position,
PageSize = int.MaxValue,
StoreId = (ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId),
- VisibleIndividuallyOnly = false,
+ VisibleIndividuallyOnly = true,
ParentGroupedProductId = product.Id
};
@@ -739,7 +764,7 @@ private IQueryable GetManufacturerQuery(DataExporterContext ctx, i
var query = _manufacturerService.Value.GetManufacturers(showHidden, storeId);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query.OrderBy(x => x.DisplayOrder);
@@ -1029,7 +1054,10 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
logHead.Append("Export profile:\t\t" + ctx.Request.Profile.Name);
logHead.AppendLine(ctx.Request.Profile.Id == 0 ? " (volatile)" : " (Id {0})".FormatInvariant(ctx.Request.Profile.Id));
- logHead.AppendLine("Export provider:\t{0} ({1})".FormatInvariant(ctx.Request.Provider.Metadata.FriendlyName, ctx.Request.Profile.ProviderSystemName));
+ if (ctx.Request.Provider.Metadata.FriendlyName.HasValue())
+ logHead.AppendLine("Export provider:\t{0} ({1})".FormatInvariant(ctx.Request.Provider.Metadata.FriendlyName, ctx.Request.Profile.ProviderSystemName));
+ else
+ logHead.AppendLine("Export provider:\t{0}".FormatInvariant(ctx.Request.Profile.ProviderSystemName));
var plugin = ctx.Request.Provider.Metadata.PluginDescriptor;
logHead.Append("Plugin:\t\t\t");
@@ -1037,8 +1065,12 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
logHead.AppendLine("Entity:\t\t\t" + ctx.Request.Provider.Value.EntityType.ToString());
- var storeInfo = (ctx.Request.Profile.PerStore ? "{0} (Id {1})".FormatInvariant(ctx.Store.Name, ctx.Store.Id) : "All stores");
- logHead.AppendLine("Store:\t\t\t" + storeInfo);
+ try
+ {
+ var uri = new Uri(store.Url);
+ logHead.AppendLine("Store:\t\t\t{0} (Id {1})".FormatInvariant(uri.DnsSafeHost.NaIfEmpty(), ctx.Store.Id));
+ }
+ catch { }
var customer = _services.WorkContext.CurrentCustomer;
logHead.Append("Executed by:\t\t" + (customer.Email.HasValue() ? customer.Email : customer.SystemName));
@@ -1047,12 +1079,11 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
}
ctx.ExecuteContext.Store = ToDynamic(ctx, ctx.Store);
-
ctx.ExecuteContext.MaxFileNameLength = dataExchangeSettings.MaxFileNameLength;
- ctx.ExecuteContext.HasPublicDeployment = ctx.Request.Profile.Deployments.Any(x => x.IsPublic && x.DeploymentType == ExportDeploymentType.FileSystem);
-
- ctx.ExecuteContext.PublicFolderPath = (ctx.ExecuteContext.HasPublicDeployment ? Path.Combine(HttpRuntime.AppDomainAppPath, PublicFolder) : null);
+ var publicDeployment = ctx.Request.Profile.Deployments.FirstOrDefault(x => x.DeploymentType == ExportDeploymentType.PublicFolder);
+ ctx.ExecuteContext.HasPublicDeployment = (publicDeployment != null);
+ ctx.ExecuteContext.PublicFolderPath = publicDeployment.GetDeploymentFolder(true);
var fileExtension = (ctx.Request.Provider.Value.FileExtension.HasValue() ? ctx.Request.Provider.Value.FileExtension.ToLower().EnsureStartsWith(".") : "");
@@ -1082,17 +1113,13 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
ctx.ExecuteContext.FileName = resolvedPattern + fileExtension;
path = Path.Combine(ctx.ExecuteContext.Folder, ctx.ExecuteContext.FileName);
-
- if (ctx.ExecuteContext.HasPublicDeployment)
- ctx.ExecuteContext.PublicFileUrl = ctx.Store.Url.EnsureEndsWith("/") + PublicFolder.EnsureEndsWith("/") + ctx.ExecuteContext.FileName;
}
if (CallProvider(ctx, null, "Execute", path))
{
ctx.Log.Information("Provider reports {0} successfully exported record(s).".FormatInvariant(ctx.ExecuteContext.RecordsSucceeded));
- // create info for deployment list in profile edit
- if (ctx.IsFileBasedExport)
+ if (ctx.IsFileBasedExport && File.Exists(path))
{
ctx.Result.Files.Add(new DataExportResult.ExportFileInfo
{
@@ -1116,17 +1143,16 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
if (ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard)
{
// always call OnExecuted
- if (ctx.ExecuteContext.ExtraDataStreams.Count == 0)
- ctx.ExecuteContext.ExtraDataStreams.Add(new ExportExtraStreams());
+ if (ctx.ExecuteContext.ExtraDataUnits.Count == 0)
+ ctx.ExecuteContext.ExtraDataUnits.Add(new ExportDataUnit());
- ctx.ExecuteContext.ExtraDataStreams.ForEach(x =>
+ ctx.ExecuteContext.ExtraDataUnits.ForEach(x =>
{
var path = (x.FileName.HasValue() ? Path.Combine(ctx.ExecuteContext.Folder, x.FileName) : null);
-
CallProvider(ctx, x.Id, "OnExecuted", path);
});
- ctx.ExecuteContext.ExtraDataStreams.Clear();
+ ctx.ExecuteContext.ExtraDataUnits.Clear();
}
}
}
@@ -1177,7 +1203,8 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
ctx.DeliveryTimes = _deliveryTimeService.Value.GetAllDeliveryTimes().ToDictionary(x => x.Id);
ctx.QuantityUnits = _quantityUnitService.Value.GetAllQuantityUnits().ToDictionary(x => x.Id);
- ctx.ProductTemplates = _productTemplateService.Value.GetAllProductTemplates().ToDictionary(x => x.Id);
+ ctx.ProductTemplates = _productTemplateService.Value.GetAllProductTemplates().ToDictionary(x => x.Id, x => x.ViewPath);
+ ctx.CategoryTemplates = _categoryTemplateService.Value.GetAllCategoryTemplates().ToDictionary(x => x.Id, x => x.ViewPath);
if (ctx.Request.Provider.Value.EntityType == ExportEntityType.Product)
{
@@ -1214,16 +1241,23 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
if (ctx.IsFileBasedExport)
{
- if (ctx.Request.Profile.CreateZipArchive || ctx.Request.Profile.Deployments.Any(x => x.Enabled && x.CreateZip))
+ if (ctx.Request.Profile.CreateZipArchive)
{
- ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, true);
+ ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, false);
}
if (ctx.Request.Profile.Deployments.Any(x => x.Enabled))
{
- SetProgress(ctx, T("Common.Deployment"));
+ SetProgress(ctx, T("Common.Publishing"));
- Deploy(ctx, zipPath);
+ var allDeploymentsSucceeded = Deploy(ctx, zipPath);
+
+ if (allDeploymentsSucceeded && ctx.Request.Profile.Cleanup)
+ {
+ logger.Information("Cleaning up export folder");
+
+ FileSystemHelper.ClearDirectory(ctx.FolderContent, false);
+ }
}
}
@@ -1248,7 +1282,7 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
if (!ctx.IsPreview && ctx.Request.Profile.Id != 0)
{
- ctx.Request.Profile.ResultInfo = XmlHelper.Serialize(ctx.Result);
+ ctx.Request.Profile.ResultInfo = XmlHelper.Serialize(ctx.Result);
_exportProfileService.Value.UpdateExportProfile(ctx.Request.Profile);
}
@@ -1258,24 +1292,13 @@ private void ExportCoreOuter(DataExporterContext ctx)
logger.ErrorsAll(exception);
}
- try
- {
- if (ctx.IsFileBasedExport && ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard && ctx.Request.Profile.Cleanup)
- {
- FileSystemHelper.ClearDirectory(ctx.FolderContent, false);
- }
- }
- catch (Exception exception)
- {
- logger.ErrorsAll(exception);
- }
-
DetachAllEntitiesAndClear(ctx);
try
{
ctx.NewsletterSubscriptions.Clear();
ctx.ProductTemplates.Clear();
+ ctx.CategoryTemplates.Clear();
ctx.Countries.Clear();
ctx.Languages.Clear();
ctx.QuantityUnits.Clear();
@@ -1301,7 +1324,7 @@ private void ExportCoreOuter(DataExporterContext ctx)
return;
// post process order entities
- if (ctx.EntityIdsLoaded.Count > 0 && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None)
+ if (ctx.EntityIdsLoaded.Any() && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None)
{
using (var logger = new TraceLogger(logPath))
{
@@ -1356,38 +1379,6 @@ public DataExportResult Export(DataExportRequest request, CancellationToken canc
ExportCoreOuter(ctx);
- if (ctx.Result != null && ctx.Result.Succeeded && ctx.Result.Files.Count > 0)
- {
- string prefix = null;
- string suffix = null;
- var extension = Path.GetExtension(ctx.Result.Files.First().FileName);
- var provider = request.Provider.Value;
-
- if (provider.EntityType == ExportEntityType.Product)
- prefix = T("Admin.Catalog.Products");
- else if (provider.EntityType == ExportEntityType.Order)
- prefix = T("Admin.Orders");
- else if (provider.EntityType == ExportEntityType.Category)
- prefix = T("Admin.Catalog.Categories");
- else if (provider.EntityType == ExportEntityType.Manufacturer)
- prefix = T("Admin.Catalog.Manufacturers");
- else if (provider.EntityType == ExportEntityType.Customer)
- prefix = T("Admin.Customers");
- else if (provider.EntityType == ExportEntityType.NewsLetterSubscription)
- prefix = T("Admin.Promotions.NewsLetterSubscriptions");
- else
- prefix = provider.EntityType.ToString();
-
- var selectedEntityCount = (request.EntitiesToExport == null ? 0 : request.EntitiesToExport.Count);
-
- if (selectedEntityCount == 0)
- suffix = T("Common.All");
- else
- suffix = (selectedEntityCount == 1 ? request.EntitiesToExport.First().ToString() : T("Admin.Common.Selected").Text);
-
- ctx.Result.DownloadFileName = string.Concat(prefix, "-", suffix).ToLower().ToValidFileName() + extension;
- }
-
cancellationToken.ThrowIfCancellationRequested();
return ctx.Result;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs
new file mode 100644
index 0000000000..7fff7a46e5
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ [Serializable]
+ public class DataDeploymentResult
+ {
+ ///
+ /// Whether the deployment succeeded
+ ///
+ public bool Succeeded
+ {
+ get { return LastError.IsEmpty(); }
+ }
+
+ public string LastError { get; set; }
+
+ ///
+ /// Last execution date
+ ///
+ public DateTime LastExecutionUtc { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
similarity index 97%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
index 8a9beeeea0..298d476c41 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
@@ -42,7 +42,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
EmailAccountId = deployment.EmailAccountId
};
- foreach (var path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
var name = Path.GetFileName(path);
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs
new file mode 100644
index 0000000000..6bb56682e1
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs
@@ -0,0 +1,22 @@
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Logging;
+using SmartStore.Utilities;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public class FileSystemFilePublisher : IFilePublisher
+ {
+ public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
+ {
+ var targetFolder = deployment.GetDeploymentFolder(true);
+
+ if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(targetFolder)))
+ {
+ context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed");
+ }
+
+ context.Log.Information("Copied export data files to " + targetFolder);
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
similarity index 82%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
index 2352d7250f..7a0954a1c7 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
@@ -16,7 +16,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
var url = deployment.Url;
var buffLength = 32768;
byte[] buff = new byte[buffLength];
- var deploymentFiles = context.DeploymentFiles.ToList();
+ var deploymentFiles = context.GetDeploymentFiles().ToList();
var lastIndex = (deploymentFiles.Count - 1);
if (!url.StartsWith("ftp://", StringComparison.InvariantCultureIgnoreCase))
@@ -26,7 +26,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
{
var fileUrl = url.EnsureEndsWith("/") + Path.GetFileName(path);
- var request = (FtpWebRequest)System.Net.WebRequest.Create(fileUrl);
+ var request = (FtpWebRequest)WebRequest.Create(fileUrl);
request.Method = WebRequestMethods.Ftp.UploadFile;
request.KeepAlive = (deploymentFiles.IndexOf(path) != lastIndex);
request.UseBinary = true;
@@ -61,10 +61,9 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
}
else
{
- var msg = "The FTP transfer might fail. {0} ({1}), {2}. File {3}".FormatInvariant(
- response.StatusCode.ToString(), statusCode, response.StatusDescription.NaIfEmpty(), path);
+ context.Result.LastError = context.T("Admin.Common.FtpStatus", statusCode, response.StatusCode.ToString());
- context.Log.Error(msg);
+ context.Log.Error("The FTP transfer failed. FTP status {0} ({1}). File {3}".FormatInvariant(statusCode, response.StatusCode.ToString(), path));
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
similarity index 73%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
index 48303bd200..4f0d9df8d8 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
@@ -12,7 +12,7 @@ public class HttpFilePublisher : IFilePublisher
{
public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
{
- var succeeded = 0;
+ var succeededFiles = 0;
var url = deployment.Url;
if (!url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) && !url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase))
@@ -20,7 +20,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
if (deployment.HttpTransmissionType == ExportHttpTransmissionType.MultipartFormDataPost)
{
- var count = 0;
+ var countFiles = 0;
ICredentials credentials = null;
if (deployment.Username.HasValue())
@@ -30,24 +30,26 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
using (var client = new HttpClient(handler))
using (var formData = new MultipartFormDataContent())
{
- foreach (var path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
byte[] fileData = File.ReadAllBytes(path);
- formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++count), Path.GetFileName(path));
+ formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++countFiles), Path.GetFileName(path));
}
var response = client.PostAsync(url, formData).Result;
if (response.IsSuccessStatusCode)
{
- succeeded = count;
+ succeededFiles = countFiles;
}
else if (response.Content != null)
{
+ context.Result.LastError = context.T("Admin.Common.HttpStatus", (int)response.StatusCode, response.StatusCode.ToString());
+
var content = response.Content.ReadAsStringAsync().Result;
- var msg = "Multipart form data upload failed. {0} ({1}). Response: {2}".FormatInvariant(
- response.StatusCode.ToString(), (int)response.StatusCode, content.NaIfEmpty().Truncate(2000, "..."));
+ var msg = "Multipart form data upload failed. HTTP status {0} ({1}). Response: {2}".FormatInvariant(
+ (int)response.StatusCode, response.StatusCode.ToString(), content.NaIfEmpty().Truncate(2000, "..."));
context.Log.Error(msg);
}
@@ -60,16 +62,16 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
if (deployment.Username.HasValue())
webClient.Credentials = new NetworkCredential(deployment.Username, deployment.Password);
- foreach (var path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
webClient.UploadFile(url, path);
- ++succeeded;
+ ++succeededFiles;
}
}
}
- context.Log.Information("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeeded, deployment.HttpTransmissionType.ToString()));
+ context.Log.Information("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeededFiles, deployment.HttpTransmissionType.ToString()));
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs
new file mode 100644
index 0000000000..1ae3301ec4
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Localization;
+using SmartStore.Core.Logging;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public interface IFilePublisher
+ {
+ void Publish(ExportDeploymentContext context, ExportDeployment deployment);
+ }
+
+
+ public class ExportDeploymentContext
+ {
+ public Localizer T { get; set; }
+ public ILogger Log { get; set; }
+
+ public string FolderContent { get; set; }
+
+ public string ZipPath { get; set; }
+ public bool CreateZipArchive { get; set; }
+
+ public DataDeploymentResult Result { get; set; }
+
+ public IEnumerable GetDeploymentFiles()
+ {
+ if (!CreateZipArchive)
+ {
+ return System.IO.Directory.EnumerateFiles(FolderContent, "*", SearchOption.AllDirectories);
+ }
+
+ if (File.Exists(ZipPath))
+ {
+ return new string[] { ZipPath };
+ }
+
+ return new string[0];
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs
new file mode 100644
index 0000000000..d438e808a2
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs
@@ -0,0 +1,44 @@
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Logging;
+using SmartStore.Utilities;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public class PublicFolderPublisher : IFilePublisher
+ {
+ public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
+ {
+ var destinationFolder = deployment.GetDeploymentFolder(true);
+
+ if (destinationFolder.IsEmpty())
+ return;
+
+ if (!System.IO.Directory.Exists(destinationFolder))
+ {
+ System.IO.Directory.CreateDirectory(destinationFolder);
+ }
+
+ if (context.CreateZipArchive)
+ {
+ if (File.Exists(context.ZipPath))
+ {
+ var destinationFile = Path.Combine(destinationFolder, Path.GetFileName(context.ZipPath));
+
+ File.Copy(context.ZipPath, destinationFile, true);
+
+ context.Log.Information("Copied zipped export data to " + destinationFile);
+ }
+ }
+ else
+ {
+ if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(destinationFolder)))
+ {
+ context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed");
+ }
+
+ context.Log.Information("Copied export data files to " + destinationFolder);
+ }
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
index 232e2ee864..1917084af2 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
@@ -136,15 +136,30 @@ private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObjec
return price;
}
- private decimal CalculatePrice(DataExporterContext ctx, Product product, bool forAttributeCombination)
+ private decimal CalculatePrice(
+ DataExporterContext ctx,
+ Product product,
+ ProductVariantAttributeCombination combination,
+ IList attributeValues)
{
- decimal price = product.Price;
+ var price = product.Price;
+ var priceCalculationContext = ctx.ProductExportContext as PriceCalculationContext;
- // price type
- if (ctx.Projection.PriceType.HasValue && !forAttributeCombination)
+ if (combination != null)
{
- var priceCalculationContext = ctx.ProductExportContext as PriceCalculationContext;
+ // price for attribute combination
+ var attributesTotalPriceBase = decimal.Zero;
+ if (attributeValues != null)
+ {
+ attributeValues.Each(x => attributesTotalPriceBase += _priceCalculationService.Value.GetProductVariantAttributeValuePriceAdjustment(x));
+ }
+
+ price = _priceCalculationService.Value.GetFinalPrice(product, null, ctx.ContextCustomer, attributesTotalPriceBase, true, 1, null, priceCalculationContext);
+ }
+ else if (ctx.Projection.PriceType.HasValue)
+ {
+ // price for product
if (ctx.Projection.PriceType.Value == PriceDisplayType.LowestPrice)
{
bool displayFromMessage;
@@ -163,7 +178,6 @@ private decimal CalculatePrice(DataExporterContext ctx, Product product, bool fo
return ConvertPrice(ctx, product, price) ?? price;
}
-
private List GetLocalized(DataExporterContext ctx, T entity, params Expression>[] keySelectors)
where T : BaseEntity, ILocalizedEntity
{
@@ -487,6 +501,11 @@ private dynamic ToDynamic(DataExporterContext ctx, Category category)
result.Picture = null;
+ if (ctx.CategoryTemplates.ContainsKey(category.CategoryTemplateId))
+ result._CategoryTemplateViewPath = ctx.CategoryTemplates[category.CategoryTemplateId];
+ else
+ result._CategoryTemplateViewPath = "";
+
result._Localized = GetLocalized(ctx, category,
x => x.Name,
x => x.FullName,
@@ -547,7 +566,6 @@ private dynamic ToDynamic(
product.MergeWithCombination(combination);
var languageId = (ctx.Projection.LanguageId ?? 0);
- var productTemplate = ctx.ProductTemplates.FirstOrDefault(x => x.Key == product.ProductTemplateId);
var pictureSize = _mediaSettings.Value.ProductDetailsPictureSize;
var numberOfPictures = (ctx.Projection.NumberOfPictures ?? int.MaxValue);
int[] pictureIds = (combination == null ? new int[0] : combination.GetAssignedPictureIds());
@@ -563,10 +581,11 @@ private dynamic ToDynamic(
var productTags = ctx.ProductExportContext.ProductTags.Load(product.Id);
var specificationAttributes = ctx.ProductExportContext.ProductSpecificationAttributes.Load(product.Id);
+ var variantAttributes = (combination != null ? _productAttributeParser.Value.DeserializeProductVariantAttributes(combination.AttributesXml) : null);
+ var variantAttributeValues = (combination != null ? _productAttributeParser.Value.ParseProductVariantAttributeValues(variantAttributes, productAttributes) : null);
+
if (pictureIds.Length > 0)
- {
productPictures = productPictures.Where(x => pictureIds.Contains(x.PictureId));
- }
productPictures = productPictures.Take(numberOfPictures);
@@ -574,35 +593,53 @@ private dynamic ToDynamic(
#region gerneral data
- dynObject.Price = CalculatePrice(ctx, product, combination != null);
-
- if (combination != null && ctx.Projection.AttributeCombinationValueMerging == ExportAttributeValueMerging.AppendAllValuesToName)
- {
- var values = _productAttributeParser.Value.ParseProductVariantAttributeValues(combination.AttributesXml, productAttributes, ctx.Projection.LanguageId ?? 0);
+ dynObject._CategoryName = null;
+ dynObject._CategoryPath = null;
+ dynObject._AttributeCombination = null;
+ dynObject._AttributeCombinationValues = null;
+ dynObject._AttributeCombinationId = (combination == null ? 0 : combination.Id);
+ dynObject._DetailUrl = ctx.Store.Url.EnsureEndsWith("/") + (string)dynObject.SeName;
+
+ if (combination == null)
+ dynObject._UniqueId = product.Id.ToString();
+ else
+ dynObject._UniqueId = string.Concat(product.Id, "-", combination.Id);
- dynObject.Name = ((string)dynObject.Name).Grow(string.Join(", ", values), " ");
- }
+ dynObject.Price = CalculatePrice(ctx, product, combination, variantAttributeValues);
dynObject._BasePriceInfo = product.GetBasePriceInfo(_services.Localization, _priceFormatter.Value, _currencyService.Value, _taxService.Value,
_priceCalculationService.Value, ctx.ContextCurrency, decimal.Zero, true);
- dynObject._ProductTemplateViewPath = (productTemplate.Value == null ? "" : productTemplate.Value.ViewPath);
-
- var detailUrl = ctx.Store.Url.EnsureEndsWith("/") + (string)dynObject.SeName;
+ if (ctx.ProductTemplates.ContainsKey(product.ProductTemplateId))
+ dynObject._ProductTemplateViewPath = ctx.ProductTemplates[product.ProductTemplateId];
+ else
+ dynObject._ProductTemplateViewPath = "";
if (combination != null)
{
+ if (ctx.Supports(ExportFeatures.UsesAttributeCombination))
+ {
+ dynObject._AttributeCombination = variantAttributes;
+ dynObject._AttributeCombinationValues = variantAttributeValues;
+ }
+
+ if (ctx.Projection.AttributeCombinationValueMerging == ExportAttributeValueMerging.AppendAllValuesToName)
+ {
+ var valueNames = variantAttributeValues
+ .Select(x => x.GetLocalized(y => y.Name, languageId, true, false))
+ .ToList();
+
+ dynObject.Name = ((string)dynObject.Name).Grow(string.Join(", ", valueNames), " ");
+ }
+
var attributeQueryString = _productAttributeParser.Value.SerializeQueryData(combination.AttributesXml, product.Id);
if (attributeQueryString.HasValue())
{
- detailUrl = string.Concat(detailUrl, detailUrl.Contains("?") ? "&" : "?", "attributes=", attributeQueryString);
+ var url = (string)dynObject._DetailUrl;
+ dynObject._DetailUrl = string.Concat(url, url.Contains("?") ? "&" : "?", "attributes=", attributeQueryString);
}
}
- dynObject._DetailUrl = detailUrl;
-
- dynObject._CategoryName = null;
-
if (ctx.Categories.Count > 0)
{
dynObject._CategoryPath = _categoryService.Value.GetCategoryPath(
@@ -614,13 +651,8 @@ private dynamic ToDynamic(
productCategories.OrderBy(x => x.DisplayOrder).FirstOrDefault()
);
}
- else
- {
- dynObject._CategoryPath = null;
- }
ToDeliveryTime(ctx, dynObject, product.DeliveryTimeId);
-
ToQuantityUnit(ctx, dynObject, product.QuantityUnitId);
dynObject.ProductPictures = productPictures
@@ -841,20 +873,32 @@ private dynamic ToDynamic(
if (ctx.Supports(ExportFeatures.UsesSpecialPrice))
{
- dynObject._SpecialPrice = null;
- dynObject._RegularPrice = null; // price if a special price would not exist
+ dynObject._SpecialPrice = null; // special price which is valid now
+ dynObject._FutureSpecialPrice = null; // special price which is valid now and in future
+ dynObject._RegularPrice = null; // price as if a special price would not exist
if (!(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing))
{
+ if (product.SpecialPrice.HasValue && product.SpecialPriceEndDateTimeUtc.HasValue)
+ {
+ var endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc);
+ if (endDate > DateTime.UtcNow)
+ {
+ dynObject._FutureSpecialPrice = ConvertPrice(ctx, product, product.SpecialPrice.Value);
+ }
+ }
+
var specialPrice = _priceCalculationService.Value.GetSpecialPrice(product);
dynObject._SpecialPrice = ConvertPrice(ctx, product, specialPrice);
- if (specialPrice.HasValue)
+ if (specialPrice.HasValue || dynObject._FutureSpecialPrice != null)
{
decimal tmpSpecialPrice = product.SpecialPrice.Value;
product.SpecialPrice = null;
- dynObject._RegularPrice = CalculatePrice(ctx, product, combination != null);
+
+ dynObject._RegularPrice = CalculatePrice(ctx, product, combination, variantAttributeValues);
+
product.SpecialPrice = tmpSpecialPrice;
}
}
@@ -895,6 +939,8 @@ private dynamic ToDynamic(DataExporterContext ctx, OrderItem orderItem)
dynamic result = new DynamicEntity(orderItem);
+ orderItem.Product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser.Value);
+
result.Product = ToDynamic(ctx, orderItem.Product);
return result;
@@ -988,19 +1034,17 @@ private List Convert(DataExporterContext ctx, Product product)
//var productValues = new Dictionary();
var dbContext = _dbContext as DbContext;
- product = _dbContext.Attach(product);
-
- var entry = dbContext.Entry(product);
-
- // the returned object is not the entity and is not being tracked by the context.
- // it also does not have any relationships set to other objects.
- // CurrentValues only includes database (thus primitive) values.
- var productClone = entry.CurrentValues.ToObject() as Product;
-
- _dbContext.DetachEntity(product);
-
foreach (var combination in combinations.Where(x => x.IsActive))
{
+ product = _dbContext.Attach(product);
+ var entry = dbContext.Entry(product);
+
+ // the returned object is not the entity and is not being tracked by the context.
+ // it also does not have any relationships set to other objects.
+ // CurrentValues only includes database (thus primitive) values.
+ var productClone = entry.CurrentValues.ToObject() as Product;
+ _dbContext.DetachEntity(product);
+
var dynObject = ToDynamic(ctx, productClone, combinations, combination);
result.Add(dynObject);
}
@@ -1029,10 +1073,13 @@ private List Convert(DataExporterContext ctx, Order order)
{
var result = new List();
- ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId ?? 0);
+ if (!ctx.IsPreview)
+ {
+ ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId.HasValue ? order.ShippingAddressId.Value : 0);
+ ctx.OrderExportContext.Addresses.Load(order.BillingAddressId);
+ }
var perfLoadId = (ctx.IsPreview ? 0 : order.Id);
- var addresses = ctx.OrderExportContext.Addresses.Load(ctx.IsPreview ? 0 : order.BillingAddressId);
var customers = ctx.OrderExportContext.Customers.Load(order.CustomerId);
var rewardPointsHistories = ctx.OrderExportContext.RewardPointsHistories.Load(ctx.IsPreview ? 0 : order.CustomerId);
var orderItems = ctx.OrderExportContext.OrderItems.Load(perfLoadId);
@@ -1060,20 +1107,25 @@ private List Convert(DataExporterContext ctx, Order order)
.PointsBalance;
}
- dynObject.BillingAddress = ToDynamic(ctx, addresses.FirstOrDefault(x => x.Id == order.BillingAddressId));
+ if (ctx.OrderExportContext.Addresses.ContainsKey(order.BillingAddressId))
+ {
+ dynObject.BillingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.BillingAddressId].FirstOrDefault());
+ }
- if (order.ShippingAddressId.HasValue)
+ if (order.ShippingAddressId.HasValue && ctx.OrderExportContext.Addresses.ContainsKey(order.ShippingAddressId.Value))
{
- dynObject.ShippingAddress = ToDynamic(ctx, addresses.FirstOrDefault(x => x.Id == order.ShippingAddressId.Value));
+ dynObject.ShippingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.ShippingAddressId.Value].FirstOrDefault());
}
dynObject.OrderItems = orderItems
.Select(e =>
{
dynamic dyn = ToDynamic(ctx, e);
- var productTemplate = ctx.ProductTemplates.FirstOrDefault(x => x.Key == e.Product.ProductTemplateId);
- dyn.Product._ProductTemplateViewPath = (productTemplate.Value == null ? "" : productTemplate.Value.ViewPath);
+ if (ctx.ProductTemplates.ContainsKey(e.Product.ProductTemplateId))
+ dyn.Product._ProductTemplateViewPath = ctx.ProductTemplates[e.Product.ProductTemplateId];
+ else
+ dyn.Product._ProductTemplateViewPath = "";
dyn.Product._BasePriceInfo = e.Product.GetBasePriceInfo(_services.Localization, _priceFormatter.Value, _currencyService.Value, _taxService.Value,
_priceCalculationService.Value, ctx.ContextCurrency, decimal.Zero, true);
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
similarity index 50%
rename from src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
index 7459b9ee3f..0b96526e00 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
@@ -4,13 +4,32 @@ namespace SmartStore.Services.DataExchange.Export.Events
{
// TODO: Another event message must be implemented, say 'ColumnsBuildingEvent'
// The consumer of this event (most likely a plugin) could push a list of specific column headers
- // into global the export definition.
+ // into the global export definition.
public class RowExportingEvent
{
- public dynamic Row { get; internal set; }
- public ExportEntityType EntityType { get; internal set; }
- public DataExportRequest ExportRequest { get; internal set; }
- public IExportExecuteContext ExecuteContext { get; internal set; }
+ public dynamic Row
+ {
+ get;
+ internal set;
+ }
+
+ public ExportEntityType EntityType
+ {
+ get;
+ internal set;
+ }
+
+ public DataExportRequest ExportRequest
+ {
+ get;
+ internal set;
+ }
+
+ public ExportExecuteContext ExecuteContext
+ {
+ get;
+ internal set;
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
index 514c223624..d5f2860ff8 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
@@ -7,132 +7,173 @@
namespace SmartStore.Services.DataExchange.Export
{
- public interface IExportExecuteContext
+ public class ExportExecuteContext
{
+ private DataExportResult _result;
+ private CancellationToken _cancellation;
+ private DataExchangeAbortion _providerAbort;
+
+ internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder)
+ {
+ _result = result;
+ _cancellation = cancellation;
+ Folder = folder;
+ ExtraDataUnits = new List();
+ CustomProperties = new Dictionary();
+ }
+
///
/// Provides the data to be exported
///
- IExportDataSegmenterConsumer Segmenter { get; }
+ public IExportDataSegmenterConsumer DataSegmenter { get; set; }
///
/// The store context to be used for the export
///
- dynamic Store { get; }
+ public dynamic Store { get; internal set; }
///
/// The customer context to be used for the export
///
- dynamic Customer { get; }
+ public dynamic Customer { get; internal set; }
///
/// The currency context to be used for the export
///
- dynamic Currency { get; }
+ public dynamic Currency { get; internal set; }
///
/// The language context to be used for the export
///
- dynamic Language { get; }
+ public dynamic Language { get; internal set; }
///
/// Projection data
///
- ExportProjection Projection { get; }
+ public ExportProjection Projection { get; internal set; }
///
/// To log information into the export log file
///
- ILogger Log { get; }
+ public ILogger Log { get; internal set; }
///
/// Indicates whether and how to abort the export
///
- DataExchangeAbortion Abort { get; set; }
+ public DataExchangeAbortion Abort
+ {
+ get
+ {
+ if (_cancellation.IsCancellationRequested || IsMaxFailures)
+ return DataExchangeAbortion.Hard;
+ return _providerAbort;
+ }
+ set
+ {
+ _providerAbort = value;
+ }
+ }
+
+ public bool IsMaxFailures
+ {
+ get { return RecordsFailed > 11; }
+ }
///
/// Identifier of current data stream. Can be null.
///
- string DataStreamId { get; set; }
+ public string DataStreamId { get; set; }
///
/// Stream used to write data to
///
- Stream DataStream { get; }
+ public Stream DataStream { get; internal set; }
///
- /// List with extra data streams required by provider
+ /// List with extra data units/streams required by provider
///
- List ExtraDataStreams { get; set; }
-
+ public List ExtraDataUnits { get; private set; }
///
/// The maximum allowed file name length
///
- int MaxFileNameLength { get; }
+ public int MaxFileNameLength { get; internal set; }
///
/// The name of the current export file
///
- string FileName { get; }
+ public string FileName { get; internal set; }
///
/// The path of the export content folder
///
- string Folder { get; }
-
+ public string Folder { get; private set; }
///
/// Whether the profile has a public deployment into "Exchange" folder
///
- bool HasPublicDeployment { get; }
+ public bool HasPublicDeployment { get; internal set; }
///
/// The local path to the public export folder "Exchange". null if the profile has no public deployment.
///
- string PublicFolderPath { get; }
-
- ///
- /// The public URL of the export file (accessible through the internet). null if the profile has no public deployment.
- ///
- string PublicFileUrl { get; }
-
+ public string PublicFolderPath { get; internal set; }
///
/// Provider specific configuration data
///
- object ConfigurationData { get; }
+ public object ConfigurationData { get; internal set; }
///
/// Use this dictionary for any custom data required along the export
///
- Dictionary CustomProperties { get; set; }
+ public Dictionary CustomProperties { get; set; }
///
/// Number of successful processed records
///
- int RecordsSucceeded { get; set; }
+ public int RecordsSucceeded { get; set; }
///
/// Number of failed records
///
- int RecordsFailed { get; set; }
+ public int RecordsFailed { get; set; }
///
/// Processes an exception that occurred while exporting a record
///
- /// Exception
- void RecordException(Exception exc, int entityId);
+ /// Exception
+ public void RecordException(Exception exception, int entityId)
+ {
+ ++RecordsFailed;
+
+ Log.Error("Error while processing record with id {0}: {1}".FormatInvariant(entityId, exception.ToAllMessages()), exception);
+
+ if (IsMaxFailures)
+ _result.LastError = exception.ToString();
+ }
+
+ public ProgressValueSetter ProgressValueSetter { get; internal set; }
///
/// Allows to set a progress message
///
/// Output message
- void SetProgress(string message);
+ public void SetProgress(string message)
+ {
+ if (ProgressValueSetter != null && message.HasValue())
+ {
+ try
+ {
+ ProgressValueSetter.Invoke(0, 0, message);
+ }
+ catch { }
+ }
+ }
}
-
- public class ExportExtraStreams
+ public class ExportDataUnit
{
///
/// Your Id to identify this stream within a list of streams
@@ -149,93 +190,4 @@ public class ExportExtraStreams
///
public string FileName { get; set; }
}
-
-
- public class ExportExecuteContext : IExportExecuteContext
- {
- private DataExportResult _result;
- private CancellationToken _cancellation;
- private DataExchangeAbortion _providerAbort;
-
- internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder)
- {
- _result = result;
- _cancellation = cancellation;
- Folder = folder;
- ExtraDataStreams = new List();
- CustomProperties = new Dictionary();
- }
-
- public IExportDataSegmenterConsumer Segmenter { get; set; }
-
- public dynamic Store { get; internal set; }
- public dynamic Customer { get; internal set; }
- public dynamic Currency { get; internal set; }
- public dynamic Language { get; internal set; }
- public ExportProjection Projection { get; internal set; }
-
- public ILogger Log { get; internal set; }
- public ProgressValueSetter ProgressValueSetter { get; internal set; }
-
- public DataExchangeAbortion Abort
- {
- get
- {
- if (_cancellation.IsCancellationRequested || IsMaxFailures)
- return DataExchangeAbortion.Hard;
-
- return _providerAbort;
- }
- set
- {
- _providerAbort = value;
- }
- }
-
- public bool IsMaxFailures
- {
- get { return RecordsFailed > 11; }
- }
-
- public string DataStreamId { get; set; }
- public Stream DataStream { get; internal set; }
- public List ExtraDataStreams { get; set; }
-
- public int MaxFileNameLength { get; internal set; }
- public string FileName { get; internal set; }
- public string Folder { get; private set; }
-
- public bool HasPublicDeployment { get; internal set; }
- public string PublicFolderPath { get; internal set; }
- public string PublicFileUrl { get; internal set; }
-
- public object ConfigurationData { get; internal set; }
-
- public Dictionary CustomProperties { get; set; }
-
- public int RecordsSucceeded { get; set; }
- public int RecordsFailed { get; set; }
-
- public void RecordException(Exception exc, int entityId)
- {
- ++RecordsFailed;
-
- Log.Error("Error while processing record with id {0}: {1}".FormatInvariant(entityId, exc.ToAllMessages()), exc);
-
- if (IsMaxFailures)
- _result.LastError = exc.ToString();
- }
-
- public void SetProgress(string message)
- {
- if (ProgressValueSetter != null && message.HasValue())
- {
- try
- {
- ProgressValueSetter.Invoke(0, 0, message);
- }
- catch { }
- }
- }
- }
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
index 3d65d673c8..0371702eec 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
@@ -4,7 +4,10 @@
using System.IO;
using System.Linq;
using System.Text;
+using System.Web;
+using SmartStore.Core;
using SmartStore.Core.Domain;
+using SmartStore.Core.Domain.DataExchange;
using SmartStore.Core.Domain.Stores;
using SmartStore.Core.Plugins;
using SmartStore.Services.Localization;
@@ -21,7 +24,7 @@ public static class ExportExtensions
/// true provider is valid, false provider is invalid.
public static bool IsValid(this Provider provider)
{
- return provider != null;
+ return provider != null && provider.Value != null;
}
///
@@ -46,7 +49,7 @@ public static string GetName(this Provider provider, ILocalizat
/// Folder path
public static string GetExportFolder(this ExportProfile profile, bool content = false, bool create = false)
{
- var path = CommonHelper.MapPath(string.Concat("~/App_Data/ExportProfiles/", profile.FolderName, content ? "/Content" : ""));
+ var path = CommonHelper.MapPath(string.Concat(profile.FolderName, content ? "/Content" : ""));
if (create && !System.IO.Directory.Exists(path))
System.IO.Directory.CreateDirectory(path);
@@ -71,27 +74,48 @@ public static string GetExportLogPath(this ExportProfile profile)
/// ZIP file path
public static string GetExportZipPath(this ExportProfile profile)
{
- return Path.Combine(profile.GetExportFolder(), profile.FolderName + ".zip");
+ var name = (new DirectoryInfo(profile.FolderName)).Name;
+ if (name.IsEmpty())
+ name = "ExportData";
+
+ return Path.Combine(profile.GetExportFolder(), name.ToValidFileName() + ".zip");
}
///
/// Gets existing export files for an export profile
///
/// Export profile
+ /// Export provider
/// List of file names
- public static List GetExportFiles(this ExportProfile profile)
+ public static IEnumerable GetExportFiles(this ExportProfile profile, Provider provider)
{
var exportFolder = profile.GetExportFolder(true);
- if (System.IO.Directory.Exists(exportFolder))
+ if (System.IO.Directory.Exists(exportFolder) && provider.Value.FileExtension.HasValue())
{
- return System.IO.Directory.EnumerateFiles(exportFolder, "*", SearchOption.TopDirectoryOnly)
- .OrderBy(x => x)
- .ToList();
+ var filter = "*.{0}".FormatInvariant(provider.Value.FileExtension.ToLower());
+
+ return System.IO.Directory.EnumerateFiles(exportFolder, filter, SearchOption.AllDirectories).OrderBy(x => x);
}
- return new List();
- }
+ return Enumerable.Empty();
+ }
+
+ ///
+ /// Get number of existing export files
+ ///
+ /// Export profile
+ /// Export provider
+ /// Number of export files
+ public static int GetExportFileCount(this ExportProfile profile, Provider provider)
+ {
+ var result = profile.GetExportFiles(provider).Count();
+
+ if (File.Exists(profile.GetExportZipPath()))
+ ++result;
+
+ return result;
+ }
///
/// Resolves the file name pattern for an export profile
@@ -128,5 +152,107 @@ public static string ResolveFileNamePattern(this ExportProfile profile, Store st
return result;
}
+
+ ///
+ /// Get path of the deployment folder
+ ///
+ /// Export deployment
+ /// Deployment folder path
+ public static string GetDeploymentFolder(this ExportDeployment deployment, bool create = false)
+ {
+ if (deployment == null)
+ return null;
+
+ string path = null;
+
+ if (deployment.DeploymentType == ExportDeploymentType.PublicFolder)
+ {
+ if (deployment.SubFolder.HasValue())
+ path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder, deployment.SubFolder);
+ else
+ path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder);
+ }
+ else if (deployment.DeploymentType == ExportDeploymentType.FileSystem)
+ {
+ if (deployment.FileSystemPath.IsEmpty())
+ return null;
+
+ if (Path.IsPathRooted(deployment.FileSystemPath))
+ {
+ path = deployment.FileSystemPath;
+ }
+ else
+ {
+ path = FileSystemHelper.ValidateRootPath(deployment.FileSystemPath);
+ path = CommonHelper.MapPath(path);
+ }
+ }
+
+ if (create && !System.IO.Directory.Exists(path))
+ System.IO.Directory.CreateDirectory(path);
+
+ return path;
+ }
+
+ ///
+ /// Get url of the public folder and take filtering and projection into consideration
+ ///
+ /// Export deployment
+ /// Common services
+ /// Store entity
+ /// Absolute URL of the public folder (always ends with /) or null
+ public static string GetPublicFolderUrl(this ExportDeployment deployment, ICommonServices services, Store store = null)
+ {
+ if (deployment != null && deployment.DeploymentType == ExportDeploymentType.PublicFolder)
+ {
+ if (store == null)
+ {
+ var filter = XmlHelper.Deserialize(deployment.Profile.Filtering);
+ var storeId = filter.StoreId;
+
+ if (storeId == 0)
+ {
+ var projection = XmlHelper.Deserialize(deployment.Profile.Projection);
+ storeId = (projection.StoreId ?? 0);
+ }
+
+ store = (storeId == 0 ? services.StoreContext.CurrentStore : services.StoreService.GetStoreById(storeId));
+ }
+
+ var url = string.Concat(
+ store.Url.EnsureEndsWith("/"),
+ DataExporter.PublicFolder.EnsureEndsWith("/"),
+ deployment.SubFolder.HasValue() ? deployment.SubFolder.EnsureEndsWith("/") : ""
+ );
+
+ return url;
+ }
+
+ return null;
+ }
+
+ ///
+ /// Get icon class for a deployment type
+ ///
+ /// Deployment type
+ /// Icon class
+ public static string GetIconClass(this ExportDeploymentType type)
+ {
+ switch (type)
+ {
+ case ExportDeploymentType.FileSystem:
+ return "fa-folder-open-o";
+ case ExportDeploymentType.Email:
+ return "fa-envelope-o";
+ case ExportDeploymentType.Http:
+ return "fa-globe";
+ case ExportDeploymentType.Ftp:
+ return "fa-files-o";
+ case ExportDeploymentType.PublicFolder:
+ return "fa-unlock";
+ default:
+ return "fa-question";
+ }
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
index eb187c1657..1814ae56ae 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
@@ -144,11 +144,11 @@ public virtual ExportProfile InsertExportProfile(
.Replace("/", "")
.Replace("-", "");
- profile.FolderName = SeoHelper.GetSeName(cleanedSystemName, true, false)
+ var folderName = SeoHelper.GetSeName(cleanedSystemName, true, false)
.ToValidPath()
.Truncate(_dataExchangeSettings.MaxFileNameLength);
- profile.FolderName = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/App_Data/ExportProfiles"), profile.FolderName);
+ profile.FolderName = "~/App_Data/ExportProfiles/" + FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/App_Data/ExportProfiles"), folderName);
if (profileSystemName.IsEmpty() && isSystemProfile)
profile.SystemName = cleanedSystemName;
@@ -167,13 +167,15 @@ public virtual ExportProfile InsertExportProfile(
{
if (features.HasFlag(ExportFeatures.CreatesInitialPublicDeployment))
{
+ var subFolder = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/" + DataExporter.PublicFolder), folderName);
+
profile.Deployments.Add(new ExportDeployment
{
ProfileId = profile.Id,
Enabled = true,
- IsPublic = true,
- DeploymentType = ExportDeploymentType.FileSystem,
- Name = profile.Name
+ DeploymentType = ExportDeploymentType.PublicFolder,
+ Name = profile.Name,
+ SubFolder = subFolder
});
UpdateExportProfile(profile);
@@ -220,9 +222,7 @@ public virtual void UpdateExportProfile(ExportProfile profile)
if (profile == null)
throw new ArgumentNullException("profile");
- profile.FolderName = profile.FolderName
- .ToValidPath()
- .Truncate(_dataExchangeSettings.MaxFileNameLength);
+ profile.FolderName = FileSystemHelper.ValidateRootPath(profile.FolderName);
_exportProfileRepository.Update(profile);
@@ -342,6 +342,16 @@ public virtual ExportDeployment GetExportDeploymentById(int id)
return deployment;
}
+ public virtual void UpdateExportDeployment(ExportDeployment deployment)
+ {
+ if (deployment == null)
+ throw new ArgumentNullException("deployment");
+
+ _exportDeploymentRepository.Update(deployment);
+
+ _eventPublisher.EntityUpdated(deployment);
+ }
+
public virtual void DeleteExportDeployment(ExportDeployment deployment)
{
if (deployment == null)
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
index 2a2d9618f1..c77638f60b 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
@@ -28,22 +28,22 @@ public virtual ExportConfigurationInfo ConfigurationInfo
get { return null; }
}
+ public void Execute(ExportExecuteContext context)
+ {
+ Export(context);
+ }
+
///
/// Export data to a file
///
/// Export execution context
- protected abstract void Export(IExportExecuteContext context);
-
- public void Execute(IExportExecuteContext context)
- {
- Export(context);
- }
+ protected abstract void Export(ExportExecuteContext context);
///
/// Called once per store when export execution ended
///
/// Export execution context
- public virtual void OnExecuted(IExportExecuteContext context)
+ public virtual void OnExecuted(ExportExecuteContext context)
{
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
index 6f84b5f064..68c8b78d55 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
@@ -49,6 +49,8 @@ public static XmlWriterSettings DefaultSettings
}
}
+ public ExportXmlExclude Exclude { get; set; }
+
public XmlWriter Writer
{
get { return _writer; }
@@ -330,36 +332,41 @@ public void WriteCategory(dynamic category, string node)
}
_writer.Write("Id", entity.Id.ToString());
- _writer.Write("Name", (string)category.Name);
- _writer.Write("FullName", (string)category.FullName);
- _writer.Write("Description", (string)category.Description);
- _writer.Write("BottomDescription", (string)category.BottomDescription);
- _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString());
- _writer.Write("MetaKeywords", (string)category.MetaKeywords);
- _writer.Write("MetaDescription", (string)category.MetaDescription);
- _writer.Write("MetaTitle", (string)category.MetaTitle);
- _writer.Write("SeName", (string)category.SeName);
- _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString());
- _writer.Write("PictureId", entity.PictureId.HasValue ? entity.PictureId.Value.ToString() : "");
- _writer.Write("PageSize", entity.PageSize.ToString());
- _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString());
- _writer.Write("PageSizeOptions", entity.PageSizeOptions);
- _writer.Write("PriceRanges", entity.PriceRanges);
- _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString());
- _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString());
- _writer.Write("Published", entity.Published.ToString());
- _writer.Write("Deleted", entity.Deleted.ToString());
- _writer.Write("DisplayOrder", entity.DisplayOrder.ToString());
- _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture));
- _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture));
- _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString());
- _writer.Write("LimitedToStores", entity.LimitedToStores.ToString());
- _writer.Write("Alias", (string)category.Alias);
- _writer.Write("DefaultViewMode", entity.DefaultViewMode);
- WritePicture(category.Picture, "Picture");
+ if (!Exclude.HasFlag(ExportXmlExclude.Category))
+ {
+ _writer.Write("Name", (string)category.Name);
+ _writer.Write("FullName", (string)category.FullName);
+ _writer.Write("Description", (string)category.Description);
+ _writer.Write("BottomDescription", (string)category.BottomDescription);
+ _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString());
+ _writer.Write("CategoryTemplateViewPath", (string)category._CategoryTemplateViewPath);
+ _writer.Write("MetaKeywords", (string)category.MetaKeywords);
+ _writer.Write("MetaDescription", (string)category.MetaDescription);
+ _writer.Write("MetaTitle", (string)category.MetaTitle);
+ _writer.Write("SeName", (string)category.SeName);
+ _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString());
+ _writer.Write("PictureId", entity.PictureId.HasValue ? entity.PictureId.Value.ToString() : "");
+ _writer.Write("PageSize", entity.PageSize.ToString());
+ _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString());
+ _writer.Write("PageSizeOptions", entity.PageSizeOptions);
+ _writer.Write("PriceRanges", entity.PriceRanges);
+ _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString());
+ _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString());
+ _writer.Write("Published", entity.Published.ToString());
+ _writer.Write("Deleted", entity.Deleted.ToString());
+ _writer.Write("DisplayOrder", entity.DisplayOrder.ToString());
+ _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture));
+ _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture));
+ _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString());
+ _writer.Write("LimitedToStores", entity.LimitedToStores.ToString());
+ _writer.Write("Alias", (string)category.Alias);
+ _writer.Write("DefaultViewMode", entity.DefaultViewMode);
- WriteLocalized(category);
+ WritePicture(category.Picture, "Picture");
+
+ WriteLocalized(category);
+ }
if (node.HasValue())
{
@@ -897,4 +904,15 @@ public void WriteCustomer(dynamic customer, string node)
}
}
}
+
+
+ ///
+ /// Allows to exclude XML nodes from export
+ ///
+ [Flags]
+ public enum ExportXmlExclude
+ {
+ None = 0,
+ Category = 1
+ }
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
index 7a61a36def..b0b0c8a6bd 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
@@ -108,7 +108,13 @@ ExportProfile InsertExportProfile(
ExportDeployment GetExportDeploymentById(int id);
///
- /// Deleted a export deployment
+ /// Update an export deployment
+ ///
+ /// Export deployment
+ void UpdateExportDeployment(ExportDeployment deployment);
+
+ ///
+ /// Deleted an export deployment
///
/// Export deployment
void DeleteExportDeployment(ExportDeployment deployment);
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
index e5248b20ba..60be2e11a9 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
@@ -24,12 +24,12 @@ public partial interface IExportProvider : IProvider, IUserEditable
/// Export data to a file
///
/// Export execution context
- void Execute(IExportExecuteContext context);
+ void Execute(ExportExecuteContext context);
///
/// Called once per store when export execution ended
///
/// Export execution context
- void OnExecuted(IExportExecuteContext context);
+ void OnExecuted(ExportExecuteContext context);
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/CategoryExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/CategoryExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/CustomerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/CustomerExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
similarity index 94%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
index f909b93678..5c6c1315dd 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
@@ -34,7 +34,8 @@ public DataExporterContext(
Stores = new Dictionary();
Languages = new Dictionary();
Countries = new Dictionary();
- ProductTemplates = new Dictionary();
+ ProductTemplates = new Dictionary();
+ CategoryTemplates = new Dictionary();
NewsletterSubscriptions = new HashSet();
RecordsPerStore = new Dictionary();
@@ -109,7 +110,8 @@ public bool IsFileBasedExport
public Dictionary Stores { get; set; }
public Dictionary Languages { get; set; }
public Dictionary Countries { get; set; }
- public Dictionary ProductTemplates { get; set; }
+ public Dictionary ProductTemplates { get; set; }
+ public Dictionary CategoryTemplates { get; set; }
public HashSet NewsletterSubscriptions { get; set; }
// data loaded once per page
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/DynamicEntity.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/DynamicEntity.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/ManufacturerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/ManufacturerExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/OrderExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/OrderExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/ProductExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ProductExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/ProductExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ProductExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
index 1950b34749..14a0ac77e9 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using Newtonsoft.Json;
namespace SmartStore.Services.DataExchange.Import
@@ -8,7 +7,7 @@ namespace SmartStore.Services.DataExchange.Import
public class ColumnMap
{
// maps source column to property
- private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase);
private static bool IsIndexed(string name)
{
@@ -25,27 +24,27 @@ private static string CreateSourceName(string name, string index)
return name;
}
- public IReadOnlyDictionary Mappings
+ public IReadOnlyDictionary Mappings
{
get { return _map; }
}
- public static bool ParseSourceColumn(string sourceColumn, out string columnWithoutIndex, out string index)
+ public static bool ParseSourceName(string sourceName, out string nameWithoutIndex, out string index)
{
- columnWithoutIndex = sourceColumn;
+ nameWithoutIndex = sourceName;
index = null;
var result = true;
- if (sourceColumn.HasValue() && IsIndexed(sourceColumn))
+ if (sourceName.HasValue() && IsIndexed(sourceName))
{
- var x1 = sourceColumn.IndexOf('[');
- var x2 = sourceColumn.IndexOf(']', x1);
+ var x1 = sourceName.IndexOf('[');
+ var x2 = sourceName.IndexOf(']', x1);
if (x1 != -1 && x2 != -1 && x2 > x1)
{
- columnWithoutIndex = sourceColumn.Substring(0, x1);
- index = sourceColumn.Substring(x1 + 1, x2 - x1 - 1);
+ nameWithoutIndex = sourceName.Substring(0, x1);
+ index = sourceName.Substring(x1 + 1, x2 - x1 - 1);
}
else
{
@@ -56,78 +55,72 @@ public static bool ParseSourceColumn(string sourceColumn, out string columnWitho
return result;
}
- //public IEnumerable> GetInvalidMappings()
- //{
- // var mappings = Mappings.Where(x =>
- // x.Value.Property.HasValue() &&
- // Mappings.Count(y => y.Value.Property.IsCaseInsensitiveEqual(x.Value.Property)) > 1
- // );
-
- // return mappings;
- //}
-
- public bool AddMapping(string sourceColumn, string entityProperty, string defaultValue = null)
+ public void AddMapping(string sourceName, string mappedName, string defaultValue = null)
{
- return AddMapping(sourceColumn, null, entityProperty, defaultValue);
+ AddMapping(sourceName, null, mappedName, defaultValue);
}
- public bool AddMapping(string sourceColumn, string index, string entityProperty, string defaultValue = null)
+ public void AddMapping(string sourceName, string index, string mappedName, string defaultValue = null)
{
- Guard.ArgumentNotEmpty(() => sourceColumn);
- Guard.ArgumentNotEmpty(() => entityProperty);
-
- var isAlreadyMapped = (entityProperty.HasValue() && _map.Any(x => x.Value.Property.IsCaseInsensitiveEqual(entityProperty)));
+ Guard.ArgumentNotEmpty(() => sourceName);
+ Guard.ArgumentNotEmpty(() => mappedName);
- if (isAlreadyMapped)
- return false;
+ var key = CreateSourceName(sourceName, index);
- _map[CreateSourceName(sourceColumn, index)] = new ColumnMappingValue
+ _map[key] = new ColumnMappingItem
{
- Property = entityProperty,
+ SoureName = key,
+ MappedName = mappedName,
Default = defaultValue
};
-
- return true;
}
///
/// Gets a mapped column value
///
- /// The name of the column to get a mapped value for.
+ /// The name of the column to get a mapped value for.
/// The column index, e.g. a language code (de, en etc.)
- /// The mapped column value OR - if the name is unmapped - a value with the passed []
- public ColumnMappingValue GetMapping(string sourceColumn, string index)
+ /// The mapped column value OR - if the name is unmapped - a value with the passed []
+ public ColumnMappingItem GetMapping(string sourceName, string index)
{
- return GetMapping(CreateSourceName(sourceColumn, index));
+ return GetMapping(CreateSourceName(sourceName, index));
}
///
/// Gets a mapped column value
///
- /// The name of the column to get a mapped value for.
- /// The mapped column value OR - if the name is unmapped - the value of the passed
- public ColumnMappingValue GetMapping(string sourceColumn)
+ /// The name of the column to get a mapped value for.
+ /// The mapped column value OR - if the name is unmapped - the value of the passed
+ public ColumnMappingItem GetMapping(string sourceName)
{
- ColumnMappingValue result;
+ ColumnMappingItem result;
- if (_map.TryGetValue(sourceColumn, out result))
+ if (_map.TryGetValue(sourceName, out result))
{
return result;
}
- return new ColumnMappingValue { Property = sourceColumn };
+ return new ColumnMappingItem { SoureName = sourceName, MappedName = sourceName };
}
}
[JsonObject(MemberSerialization.OptIn)]
- public class ColumnMappingValue
+ public class ColumnMappingItem
{
+ private bool? _ignored;
+
+ ///
+ /// The source name
+ ///
+ [JsonIgnore]
+ public string SoureName { get; set; }
+
///
- /// The property name of the target entity
+ /// The mapped name
///
[JsonProperty]
- public string Property { get; set; }
+ public string MappedName { get; set; }
///
/// An optional default value
@@ -140,7 +133,15 @@ public class ColumnMappingValue
///
public bool IgnoreProperty
{
- get { return Default != null && Default == "[IGNOREPROPERTY]"; }
+ get
+ {
+ if (_ignored == null)
+ {
+ _ignored = Default != null && Default == "[IGNOREPROPERTY]";
+ }
+
+ return _ignored.Value;
+ }
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
index 78cbd7fa13..c46b90b82a 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
@@ -27,12 +27,12 @@ public override object ConvertFrom(CultureInfo culture, object value)
{
if (value is string)
{
- var dict = JsonConvert.DeserializeObject>((string)value);
+ var dict = JsonConvert.DeserializeObject>((string)value);
var map = new ColumnMap();
foreach (var kvp in dict)
{
- map.AddMapping(kvp.Key, null, kvp.Value.Property, kvp.Value.Default);
+ map.AddMapping(kvp.Key, null, kvp.Value.MappedName, kvp.Value.Default);
}
return map;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
index 2f5e3c3800..aeb4b81897 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
@@ -1,8 +1,9 @@
-using SmartStore.Core;
-using System;
+using System;
using System.IO;
using System.Text;
using System.Threading;
+using System.Linq;
+using SmartStore.Core;
using SmartStore.Core.Domain.Common;
using SmartStore.Core.Domain.Customers;
using SmartStore.Core.Domain.DataExchange;
@@ -27,6 +28,7 @@ public partial class DataImporter : IDataImporter
private readonly Lazy _emailAccountService;
private readonly Lazy _emailSender;
private readonly Lazy _contactDataSettings;
+ private readonly Lazy _dataExchangeSettings;
public DataImporter(
ICommonServices services,
@@ -35,8 +37,8 @@ public DataImporter(
Func importerFactory,
Lazy emailAccountService,
Lazy emailSender,
- Lazy dataExchangeSettings,
- Lazy contactDataSettings)
+ Lazy contactDataSettings,
+ Lazy dataExchangeSettings)
{
_services = services;
_importProfileService = importProfileService;
@@ -45,6 +47,7 @@ public DataImporter(
_emailAccountService = emailAccountService;
_emailSender = emailSender;
_contactDataSettings = contactDataSettings;
+ _dataExchangeSettings = dataExchangeSettings;
T = NullLocalizer.Instance;
}
@@ -198,7 +201,7 @@ private void ImportCoreInner(DataImporterContext ctx, string filePath)
CsvConfiguration csvConfiguration = null;
var extension = Path.GetExtension(filePath);
- if (extension.IsCaseInsensitiveEqual(".csv"))
+ if ((new string[] { ".csv", ".txt", ".tab" }).Contains(extension, StringComparer.OrdinalIgnoreCase))
{
var converter = new CsvConfigurationConverter();
csvConfiguration = converter.ConvertFrom(ctx.Request.Profile.FileTypeConfiguration);
@@ -253,11 +256,14 @@ private void ImportCoreOuter(DataImporterContext ctx)
{
ctx.Log = logger;
+ ctx.ExecuteContext.DataExchangeSettings = _dataExchangeSettings.Value;
+ ctx.ExecuteContext.Services = _services;
ctx.ExecuteContext.Log = logger;
ctx.ExecuteContext.Languages = _languageService.GetAllLanguages(true);
ctx.ExecuteContext.UpdateOnly = ctx.Request.Profile.UpdateOnly;
ctx.ExecuteContext.KeyFieldNames = ctx.Request.Profile.KeyFieldNames.SplitSafe(",");
ctx.ExecuteContext.ImportFolder = ctx.Request.Profile.GetImportFolder();
+ ctx.ExecuteContext.ExtraData = XmlHelper.Deserialize(ctx.Request.Profile.ExtraData);
{
var mapConverter = new ColumnMapConverter();
@@ -267,7 +273,7 @@ private void ImportCoreOuter(DataImporterContext ctx)
var files = ctx.Request.Profile.GetImportFiles();
if (files.Count == 0)
- throw new SmartException("No files to import found.");
+ throw new SmartException("No files to import.");
if (!HasPermission(ctx))
throw new SmartException("You do not have permission to perform the selected import.");
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs
index d35778278c..eff63d8431 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs
@@ -2,9 +2,20 @@
using System.Collections.Generic;
using System.IO;
using System.Net.Mime;
+using System.Linq;
using SmartStore.Core.Domain.DataExchange;
using SmartStore.Core.IO;
using SmartStore.Utilities;
+using System.Linq.Expressions;
+using SmartStore.Core;
+using Autofac;
+using SmartStore.Services.Localization;
+using SmartStore.Core.Domain.Localization;
+using SmartStore.Core.Domain.Seo;
+using SmartStore.Services.Seo;
+using SmartStore.Core.Data;
+using SmartStore.Services.Stores;
+using SmartStore.Core.Domain.Stores;
namespace SmartStore.Services.DataExchange.Import
{
@@ -42,21 +53,23 @@ public FileDownloadManagerContext DownloaderContext
private set;
}
- public void Execute(IImportExecuteContext context)
+ public void Execute(ImportExecuteContext context)
{
Import(context);
}
- protected abstract void Import(IImportExecuteContext context);
+ protected abstract void Import(ImportExecuteContext context);
- public void Init(IImportExecuteContext context, DataExchangeSettings dataExchangeSettings)
+ protected void Initialize(ImportExecuteContext context)
{
UtcNow = DateTime.UtcNow;
DownloadedItems = new Dictionary();
ImageDownloadFolder = Path.Combine(context.ImportFolder, _imageDownloadFolder);
- if (dataExchangeSettings.ImageImportFolder.HasValue())
- ImageFolder = Path.Combine(context.ImportFolder, dataExchangeSettings.ImageImportFolder);
+ var settings = context.DataExchangeSettings;
+
+ if (settings.ImageImportFolder.HasValue())
+ ImageFolder = Path.Combine(context.ImportFolder, settings.ImageImportFolder);
else
ImageFolder = context.ImportFolder;
@@ -65,10 +78,12 @@ public void Init(IImportExecuteContext context, DataExchangeSettings dataExchang
DownloaderContext = new FileDownloadManagerContext
{
- Timeout = TimeSpan.FromMinutes(dataExchangeSettings.ImageDownloadTimeout),
+ Timeout = TimeSpan.FromMinutes(settings.ImageDownloadTimeout),
Logger = context.Log,
CancellationToken = context.CancellationToken
};
+
+ context.Result.TotalRecords = context.DataSegmenter.TotalRows;
}
public FileDownloadManagerItem CreateDownloadImage(string urlOrPath, string seoName, int displayOrder)
@@ -128,5 +143,160 @@ public void Succeeded(FileDownloadManagerItem item)
DownloadedItems.Add(item.Url, Path.GetFileName(item.Path));
}
}
+
+ protected virtual int ProcessLocalizations(
+ ImportExecuteContext context,
+ IEnumerable> batch,
+ IDictionary>> localizableProperties) where TEntity : BaseEntity, ILocalizedEntity
+ {
+ Guard.ArgumentNotNull(() => context);
+ Guard.ArgumentNotNull(() => batch);
+ Guard.ArgumentNotNull(() => localizableProperties);
+
+ // Perf: determine whether our localizable properties actually have
+ // counterparts in the source BEFORE import batch begins. This way we spare ourself
+ // to query over and over for values.
+ var localizedProps = (from kvp in localizableProperties
+ where context.DataSegmenter.GetColumnIndexes(kvp.Key).Length > 0
+ select kvp.Key).ToArray();
+
+ if (localizedProps.Length == 0)
+ {
+ return 0;
+ }
+
+ var localizedEntityService = context.Services.Resolve();
+
+ bool shouldSave = false;
+
+ foreach (var row in batch)
+ {
+ foreach (var prop in localizedProps)
+ {
+ var lambda = localizableProperties[prop];
+ foreach (var lang in context.Languages)
+ {
+ var code = lang.UniqueSeoCode;
+ string value;
+
+ if (row.TryGetDataValue(prop /* ColumnName */, code, out value))
+ {
+ localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id);
+ shouldSave = true;
+ }
+ }
+ }
+ }
+
+ if (shouldSave)
+ {
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
+
+ return 0;
+ }
+
+ protected virtual int ProcessStoreMappings(
+ ImportExecuteContext context,
+ IEnumerable> batch) where TEntity : BaseEntity, IStoreMappingSupported
+ {
+ var storeMappingService = context.Services.Resolve();
+ var storeMappingRepository = context.Services.Resolve>();
+
+ storeMappingRepository.AutoCommitEnabled = false;
+
+ foreach (var row in batch)
+ {
+ var storeIds = row.GetDataValue>("StoreIds");
+ if (!storeIds.IsNullOrEmpty())
+ {
+ storeMappingService.SaveStoreMappings(row.Entity, storeIds.ToArray());
+ }
+ }
+
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
+
+ protected virtual int ProcessSlugs(
+ ImportExecuteContext context,
+ IEnumerable> batch,
+ string entityName) where TEntity : BaseEntity, ISlugSupported
+ {
+ var slugMap = new Dictionary();
+ UrlRecord urlRecord = null;
+
+ var urlRecordService = context.Services.Resolve();
+ var urlRecordRepository = context.Services.Resolve>();
+ var seoSettings = context.Services.Resolve();
+
+ Func slugLookup = ((s) =>
+ {
+ return (slugMap.ContainsKey(s) ? slugMap[s] : null);
+ });
+
+ foreach (var row in batch)
+ {
+ try
+ {
+ string seName = null;
+ string localizedName = null;
+
+ if (row.TryGetDataValue("SeName", out seName) || row.IsNew || row.NameChanged)
+ {
+ seName = row.Entity.ValidateSeName(seName, row.EntityDisplayName, true, urlRecordService, seoSettings, extraSlugLookup: slugLookup);
+
+ if (row.IsNew)
+ {
+ // dont't bother validating SeName for new entities.
+ urlRecord = new UrlRecord
+ {
+ EntityId = row.Entity.Id,
+ EntityName = entityName,
+ Slug = seName,
+ LanguageId = 0,
+ IsActive = true,
+ };
+ urlRecordRepository.Insert(urlRecord);
+ }
+ else
+ {
+ urlRecord = urlRecordService.SaveSlug(row.Entity, seName, 0);
+ }
+
+ if (urlRecord != null)
+ {
+ // a new record was inserted to the store: keep track of it for this batch.
+ slugMap[seName] = urlRecord;
+ }
+ }
+
+ // process localized SeNames
+ foreach (var lang in context.Languages)
+ {
+ var hasSeName = row.TryGetDataValue("SeName", lang.UniqueSeoCode, out seName);
+ var hasLocalizedName = row.TryGetDataValue("Name", lang.UniqueSeoCode, out localizedName);
+
+ if (hasSeName || hasLocalizedName)
+ {
+ seName = row.Entity.ValidateSeName(seName, localizedName, false, urlRecordService, seoSettings, lang.Id, slugLookup);
+ urlRecord = urlRecordService.SaveSlug(row.Entity, seName, lang.Id);
+ if (urlRecord != null)
+ {
+ slugMap[seName] = urlRecord;
+ }
+ }
+ }
+ }
+ catch (Exception exception)
+ {
+ context.Result.AddWarning(exception.Message, row.GetRowInfo(), "SeName");
+ }
+ }
+
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
index a33f2a3ccd..bc64b63531 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
@@ -2,6 +2,6 @@
{
public partial interface IEntityImporter
{
- void Execute(IImportExecuteContext context);
+ void Execute(ImportExecuteContext context);
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs
index be9cdee26c..41129e24f8 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportDataSegmenter.cs
@@ -2,18 +2,17 @@
using System.Collections.Generic;
using System.Data;
using System.Globalization;
-using System.IO;
using System.Linq;
using SmartStore.Core;
namespace SmartStore.Services.DataExchange.Import
{
- public class ImportDataSegmenter where T : BaseEntity
+ public class ImportDataSegmenter
{
private const int BATCHSIZE = 100;
private readonly IDataTable _table;
- private ImportRow[] _currentBatch;
+ private object[] _currentBatch;
private readonly IPageable _pageable;
private bool _bof;
private CultureInfo _culture;
@@ -88,14 +87,67 @@ public int BatchSize
get { return BATCHSIZE; }
}
- public bool HasColumn(string name)
+ ///
+ /// Determines whether a specific column exists in the underlying data table.
+ ///
+ /// The name of the column to find
+ ///
+ /// If true and a column with the passed does not exist,
+ /// this method tests for the existence of any indexed column with the same name.
+ ///
+ /// true if the column exists, false otherwise
+ ///
+ /// This method takes mapped column names into account.
+ ///
+ public bool HasColumn(string name, bool withAnyIndex = false)
{
- return _table.HasColumn(_columnMap.GetMapping(name).Property);
+ var result = HasColumn(name, null);
+
+ if (!result && withAnyIndex)
+ {
+ // Column does not exist, but withAnyIndex is true:
+ // Test for existence of any indexed column.
+ result = GetColumnIndexes(name).Length > 0;
+ }
+
+ return result;
}
+ ///
+ /// Determines whether the column name[index] exists in the underlying data table.
+ ///
+ /// The name of the column to find
+ /// The index of the column
+ /// true if the column exists, false otherwise
+ ///
+ /// This method takes mapped column names into account.
+ ///
public bool HasColumn(string name, string index)
{
- return _table.HasColumn(_columnMap.GetMapping(name, index).Property);
+ return _table.HasColumn(_columnMap.GetMapping(name, index).MappedName);
+ }
+
+ ///
+ /// Indicates whether to ignore the property that is mapped to columnName
+ ///
+ /// The name of the column
+ /// true ignore, false do not ignore
+ public bool IsIgnored(string columnName)
+ {
+ return IsIgnored(columnName, null);
+ }
+
+ ///
+ /// Indicates whether to ignore the property that is mapped to columnName
+ ///
+ /// The name of the column
+ /// The index of the column
+ /// true ignore, false do not ignore
+ public bool IsIgnored(string columnName, string index)
+ {
+ var mapping = _columnMap.GetMapping(columnName, index);
+
+ return mapping.IgnoreProperty;
}
///
@@ -167,28 +219,25 @@ public bool ReadNextBatch()
return false;
}
- public ImportRow[] CurrentBatch
+ public IEnumerable> GetCurrentBatch() where T : BaseEntity
{
- get
+ if (_currentBatch == null)
{
- if (_currentBatch == null)
+ int start = _pageable.FirstItemIndex - 1;
+ int end = _pageable.LastItemIndex - 1;
+
+ _currentBatch = new ImportRow[(end - start) + 1];
+
+ // Determine values per row
+ int i = 0;
+ for (int r = start; r <= end; r++)
{
- int start = _pageable.FirstItemIndex - 1;
- int end = _pageable.LastItemIndex - 1;
-
- _currentBatch = new ImportRow[(end - start) + 1];
-
- // Determine values per row
- int i = 0;
- for (int r = start; r <= end; r++)
- {
- _currentBatch[i] = new ImportRow(this, _table.Rows[r], r);
- i++;
- }
+ _currentBatch[i] = new ImportRow(this, _table.Rows[r], r);
+ i++;
}
-
- return _currentBatch;
}
+
+ return _currentBatch.Cast>();
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs
index a37b9b0013..70170c0fd3 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExecuteContext.cs
@@ -1,117 +1,160 @@
using System.Collections.Generic;
using System.Threading;
-using SmartStore.Core;
using SmartStore.Core.Domain.DataExchange;
using SmartStore.Core.Domain.Localization;
using SmartStore.Core.Logging;
namespace SmartStore.Services.DataExchange.Import
{
- public interface IImportExecuteContext
+ public class ImportExecuteContext
{
+ private DataExchangeAbortion _abortion;
+ private ProgressValueSetter _progressValueSetter;
+ private string _progressInfo;
+
+ private IDataTable _dataTable;
+ private ImportDataSegmenter _segmenter;
+
+ public ImportExecuteContext(
+ CancellationToken cancellation,
+ ProgressValueSetter progressValueSetter,
+ string progressInfo)
+ {
+ _progressValueSetter = progressValueSetter;
+ _progressInfo = progressInfo;
+
+ CancellationToken = cancellation;
+ CustomProperties = new Dictionary();
+ Result = new ImportResult();
+ }
+
///
- /// Whether to only update existing records
+ /// Import settings
///
- bool UpdateOnly { get; }
+ public DataExchangeSettings DataExchangeSettings
+ {
+ get;
+ internal set;
+ }
///
- /// Name of key fields to identify existing records for updating
+ /// The data source (CSV, Excel etc.)
///
- string[] KeyFieldNames { get; }
+ public IDataTable DataTable
+ {
+ get
+ {
+ return _dataTable;
+ }
+ internal set
+ {
+ _dataTable = value;
+ _segmenter = null;
+ }
+ }
///
- /// The import folder
+ /// Mapping information between database and data source
///
- string ImportFolder { get; }
+ public ColumnMap ColumnMap
+ {
+ get;
+ internal set;
+ }
///
- /// Use this dictionary for any custom data required along the export
+ /// Whether to only update existing records
///
- Dictionary CustomProperties { get; set; }
+ public bool UpdateOnly
+ {
+ get;
+ internal set;
+ }
///
- /// All languages
+ /// Name of key fields to identify existing records for updating
///
- IList Languages { get; }
+ public string[] KeyFieldNames
+ {
+ get;
+ internal set;
+ }
///
- /// To log information into the import log file
+ /// All active languages
///
- ILogger Log { get; }
+ public IList Languages
+ {
+ get;
+ internal set;
+ }
///
- /// Cancellation token
+ /// To log information into the import log file
///
- CancellationToken CancellationToken { get; }
+ public ILogger Log
+ {
+ get;
+ internal set;
+ }
///
- /// Result of the import
+ /// Common Services
///
- ImportResult Result { get; set; }
+ public ICommonServices Services
+ {
+ get;
+ internal set;
+ }
///
- /// Indicates whether and how to abort the import
+ /// Cancellation token
///
- DataExchangeAbortion Abort { get; set; }
+ public CancellationToken CancellationToken
+ {
+ get;
+ private set;
+ }
///
- /// Creates a segmenter instance
+ /// The import folder
///
- ///
- ///
- ImportDataSegmenter GetSegmenter() where TEntity : BaseEntity;
+ public string ImportFolder
+ {
+ get;
+ internal set;
+ }
///
- /// Allows to set a progress message
+ /// Use this dictionary for any custom data required along the import
///
- /// Progress value
- /// /// Progress maximum
- void SetProgress(int value, int maximum);
- }
-
-
- public class ImportExecuteContext : IImportExecuteContext
- {
- private DataExchangeAbortion _abortion;
- private ProgressValueSetter _progressValueSetter;
- private string _progressInfo;
-
- public ImportExecuteContext(
- CancellationToken cancellation,
- ProgressValueSetter progressValueSetter,
- string progressInfo)
+ public Dictionary CustomProperties
{
- _progressValueSetter = progressValueSetter;
- _progressInfo = progressInfo;
-
- CancellationToken = cancellation;
- CustomProperties = new Dictionary();
- Result = new ImportResult();
+ get;
+ set;
}
- public IDataTable DataTable { get; internal set; }
-
- public ColumnMap ColumnMap { get; internal set; }
-
- public bool UpdateOnly { get; internal set; }
-
- public string[] KeyFieldNames { get; internal set; }
-
- public IList Languages { get; internal set; }
-
- public ILogger Log { get; internal set; }
-
- public CancellationToken CancellationToken { get; private set; }
-
- public string ImportFolder { get; internal set; }
-
///
- /// Use this dictionary for any custom data required along the import
+ /// Result of the import
///
- public Dictionary CustomProperties { get; set; }
+ public ImportResult Result
+ {
+ get;
+ set;
+ }
- public ImportResult Result { get; set; }
+ ///
+ /// Extra import configuration data
+ ///
+ public ImportExtraData ExtraData
+ {
+ get;
+ internal set;
+ }
+ ///
+ /// Indicates whether and how to abort the import
+ ///
public DataExchangeAbortion Abort
{
get
@@ -135,11 +178,28 @@ public bool IsMaxFailures
}
}
- public ImportDataSegmenter GetSegmenter() where TEntity : BaseEntity
+ public ImportDataSegmenter DataSegmenter
{
- return new ImportDataSegmenter(DataTable, ColumnMap);
+ get
+ {
+ if (_segmenter == null)
+ {
+ if (this.DataTable == null || this.ColumnMap == null)
+ {
+ throw new SmartException("A DataTable and a ColumnMap must be specified before accessing the DataSegmenter property.");
+ }
+ _segmenter = new ImportDataSegmenter(DataTable, ColumnMap);
+ }
+
+ return _segmenter;
+ }
}
+ ///
+ /// Allows to set a progress message
+ ///
+ /// Progress value
+ /// /// Progress maximum
public void SetProgress(int value, int maximum)
{
try
@@ -149,5 +209,19 @@ public void SetProgress(int value, int maximum)
}
catch { }
}
+
+ ///
+ /// Allows to set a message
+ ///
+ /// Message to display
+ public void SetProgress(string message)
+ {
+ try
+ {
+ if (_progressValueSetter != null && message.HasValue())
+ _progressValueSetter.Invoke(0, 0, message);
+ }
+ catch { }
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs
new file mode 100644
index 0000000000..ecbe710677
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportExtraData.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace SmartStore.Services.DataExchange.Import
+{
+ [Serializable]
+ public class ImportExtraData
+ {
+ ///
+ /// Number of images per object to be imported
+ ///
+ public int? NumberOfPictures { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
index 2443bddfb6..c1e54633dc 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
@@ -48,61 +48,107 @@ public ImportProfileService(
_dataExchangeSettings = dataExchangeSettings;
}
- private string GetLocalizedPropertyName(ImportEntityType type, string propertyName)
+ private string GetLocalizedPropertyName(ImportEntityType type, string property)
{
- if (propertyName.IsEmpty())
- return null;
+ if (property.IsEmpty())
+ return "";
- var defaultKey = "";
- var keys = new Dictionary
- {
- { "Id", "Admin.Common.Entity.Fields.Id" },
- { "LimitedToStores", "Admin.Common.Store.LimitedTo" },
- { "DisplayOrder", "Common.DisplayOrder" },
- { "Deleted", "Admin.Common.Deleted" },
- { "CreatedOnUtc", "Common.CreatedOn" },
- { "UpdatedOnUtc", "Common.UpdatedOn" },
- { "HasDiscountsApplied", "Admin.Catalog.Products.Fields.HasDiscountsApplied" },
- { "DefaultViewMode", "Admin.Configuration.Settings.Catalog.DefaultViewMode" },
- { "StoreId", "Admin.Common.Store" }
- };
+ string key = null;
+ string prefixKey = null;
- if (type == ImportEntityType.Product)
- {
- defaultKey = "Admin.Catalog.Products.Fields." + propertyName;
+ if (property.StartsWith("BillingAddress."))
+ prefixKey = "Admin.Orders.Fields.BillingAddress";
+ else if (property.StartsWith("ShippingAddress."))
+ prefixKey = "Admin.Orders.Fields.ShippingAddress";
- keys.Add("ParentGroupedProductId", "Admin.Catalog.Products.Fields.AssociatedToProductName");
- }
- else if (type == ImportEntityType.Category)
- {
- defaultKey = "Admin.Catalog.Categories.Fields." + propertyName;
- }
- else if (type == ImportEntityType.Customer)
- {
- defaultKey = "Admin.Customers.Customers.Fields." + propertyName;
+ #region Get resource key
- keys.Add("PasswordFormatId", "Admin.Configuration.Settings.CustomerUser.DefaultPasswordFormat");
- keys.Add("LastIpAddress", "Admin.Customers.Customers.Fields.IPAddress");
- }
- else if (type == ImportEntityType.NewsLetterSubscription)
+ switch (property)
{
- defaultKey = "Admin.Promotions.NewsLetterSubscriptions.Fields." + propertyName;
+ case "Id":
+ key = "Admin.Common.Entity.Fields.Id";
+ break;
+ case "LimitedToStores":
+ key = "Admin.Common.Store.LimitedTo";
+ break;
+ case "DisplayOrder":
+ key = "Common.DisplayOrder";
+ break;
+ case "Deleted":
+ key = "Admin.Common.Deleted";
+ break;
+ case "CreatedOnUtc":
+ case "BillingAddress.CreatedOnUtc":
+ case "ShippingAddress.CreatedOnUtc":
+ key = "Common.CreatedOn";
+ break;
+ case "UpdatedOnUtc":
+ key = "Common.UpdatedOn";
+ break;
+ case "HasDiscountsApplied":
+ key = "Admin.Catalog.Products.Fields.HasDiscountsApplied";
+ break;
+ case "DefaultViewMode":
+ key = "Admin.Configuration.Settings.Catalog.DefaultViewMode";
+ break;
+ case "StoreId":
+ key = "Admin.Common.Store";
+ break;
+ case "ParentGroupedProductId":
+ key = "Admin.Catalog.Products.Fields.AssociatedToProductName";
+ break;
+ case "PasswordFormatId":
+ key = "Admin.Configuration.Settings.CustomerUser.DefaultPasswordFormat";
+ break;
+ case "LastIpAddress":
+ key = "Admin.Customers.Customers.Fields.IPAddress";
+ break;
+ default:
+ switch (type)
+ {
+ case ImportEntityType.Product:
+ key = "Admin.Catalog.Products.Fields." + property;
+ break;
+ case ImportEntityType.Category:
+ key = "Admin.Catalog.Categories.Fields." + property;
+ break;
+ case ImportEntityType.Customer:
+ if (property.StartsWith("BillingAddress.") || property.StartsWith("ShippingAddress."))
+ key = "Admin.Address.Fields." + property.Substring(property.IndexOf('.') + 1);
+ else
+ key = "Admin.Customers.Customers.Fields." + property;
+ break;
+ case ImportEntityType.NewsLetterSubscription:
+ key = "Admin.Promotions.NewsLetterSubscriptions.Fields." + property;
+ break;
+ }
+ break;
}
- var result = _localizationService.GetResource(keys.ContainsKey(propertyName) ? keys[propertyName] : defaultKey, 0, false, "", true);
+ #endregion
+
+ if (key.IsEmpty())
+ return "";
+
+ var result = _localizationService.GetResource(key, 0, false, "", true);
if (result.IsEmpty())
{
- if (defaultKey.EndsWith("Id"))
- result = _localizationService.GetResource(defaultKey.Substring(0, defaultKey.Length - 2), 0, false, "", true);
- else if (defaultKey.EndsWith("Utc"))
- result = _localizationService.GetResource(defaultKey.Substring(0, defaultKey.Length - 3), 0, false, "", true);
+ if (key.EndsWith("Id"))
+ result = _localizationService.GetResource(key.Substring(0, key.Length - 2), 0, false, "", true);
+ else if (key.EndsWith("Utc"))
+ result = _localizationService.GetResource(key.Substring(0, key.Length - 3), 0, false, "", true);
}
if (result.IsEmpty())
{
- Debug.WriteLine("Missing string resource mapping for {0}.{1}".FormatInvariant(type.ToString(), propertyName));
- return propertyName.SplitPascalCase();
+ Debug.WriteLine("Missing string resource mapping for {0} - {1}".FormatInvariant(type.ToString(), property));
+ result = property.SplitPascalCase();
+ }
+
+ if (prefixKey.HasValue())
+ {
+ result = string.Concat(_localizationService.GetResource(prefixKey, 0, false, "", true), " - ", result);
}
return result;
@@ -289,6 +335,14 @@ public virtual Dictionary GetImportableEntityProperties(ImportEn
{ ImportEntityType.NewsLetterSubscription, new string[] { } }
};
+ var addressSet = container.GetEntitySetByName("Addresses", true);
+
+ var addressProperties = addressSet.ElementType.Members
+ .Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty))
+ .Select(x => x.Name)
+ .ToList();
+
+
foreach (ImportEntityType type in Enum.GetValues(typeof(ImportEntityType)))
{
EntitySet entitySet = null;
@@ -307,7 +361,8 @@ public virtual Dictionary GetImportableEntityProperties(ImportEn
var dic = entitySet.ElementType.Members
.Where(x => !x.Name.IsCaseInsensitiveEqual("Id") && x.BuiltInTypeKind.HasFlag(BuiltInTypeKind.EdmProperty))
- .ToDictionary(x => x.Name, x => "", StringComparer.OrdinalIgnoreCase);
+ .Select(x => x.Name)
+ .ToDictionary(x => x, x => "", StringComparer.OrdinalIgnoreCase);
// lack of abstractness?
if ((type == ImportEntityType.Product || type == ImportEntityType.Category) && !dic.ContainsKey("SeName"))
@@ -315,6 +370,17 @@ public virtual Dictionary GetImportableEntityProperties(ImportEn
dic.Add("SeName", "");
}
+ // shipping and billing address
+ if (type == ImportEntityType.Customer)
+ {
+ foreach (var property in addressProperties)
+ {
+ dic.Add("BillingAddress." + property, "");
+ dic.Add("ShippingAddress." + property, "");
+ }
+ }
+
+ // add localized property names
foreach (var key in dic.Keys.ToList())
{
var localizedValue = GetLocalizedPropertyName(type, key);
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs
index 128236af05..1f213ee9e4 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportRow.cs
@@ -8,17 +8,20 @@ namespace SmartStore.Services.DataExchange.Import
{
public class ImportRow where T : BaseEntity
{
+ private const string ExplicitNull = "[NULL]";
+
private bool _initialized = false;
private T _entity;
private string _entityDisplayName;
private readonly int _position;
private bool _isNew;
+ private bool _isDirty;
private ImportRowInfo _rowInfo;
- private readonly ImportDataSegmenter _segmenter;
+ private readonly ImportDataSegmenter _segmenter;
private readonly IDataRow _row;
- public ImportRow(ImportDataSegmenter parent, IDataRow row, int position)
+ public ImportRow(ImportDataSegmenter parent, IDataRow row, int position)
{
_segmenter = parent;
_row = row;
@@ -42,7 +45,7 @@ private void CheckInitialized()
}
}
- private TProp GetDefaultValue(ColumnMappingValue mapping, string columnName, TProp defaultValue, ImportResult result = null)
+ private TProp GetDefaultValue(ColumnMappingItem mapping, TProp defaultValue, ImportResult result = null)
{
if (mapping != null && mapping.Default.HasValue())
{
@@ -55,7 +58,7 @@ private TProp GetDefaultValue(ColumnMappingValue mapping, string columnNa
if (result != null)
{
var msg = "Failed to convert default value '{0}'. Please specify a convertable default value. Column: {1}";
- result.AddWarning(msg.FormatInvariant(mapping.Default, exception.Message), this.GetRowInfo(), columnName);
+ result.AddWarning(msg.FormatInvariant(mapping.Default, exception.Message), this.GetRowInfo(), mapping.SoureName);
}
}
}
@@ -73,7 +76,12 @@ public bool IsNew
get { return _isNew; }
}
- public ImportDataSegmenter Segmenter
+ public bool IsDirty
+ {
+ get { return _isDirty; }
+ }
+
+ public ImportDataSegmenter Segmenter
{
get { return _segmenter; }
}
@@ -83,6 +91,11 @@ public T Entity
get { return _entity; }
}
+ public IDataRow DataRow
+ {
+ get { return _row; }
+ }
+
public string EntityDisplayName
{
get { return _entityDisplayName; }
@@ -99,67 +112,147 @@ public int Position
get { return _position; }
}
- public bool HasDataValue(string columnName)
+ ///
+ /// Determines whether a specific column exists in the underlying data table
+ /// and contains a non-null, convertible value.
+ ///
+ /// The name of the column
+ ///
+ /// If true and a column with the passed does not exist,
+ /// this method seeks for any indexed column with the same name.
+ ///
+ /// true if the column exists and contains a value, false otherwise
+ ///
+ /// This method takes mapped column names into account.
+ ///
+ public bool HasDataValue(string columnName, bool withAnyIndex = false)
{
- return HasDataValue(columnName, null);
+ var result = HasDataValue(columnName, null);
+
+ if (!result && withAnyIndex)
+ {
+ // Column does not have a value, but withAnyIndex is true:
+ // Test for values in any indexed column.
+ var indexes = _segmenter.GetColumnIndexes(columnName);
+ foreach (var idx in indexes)
+ {
+ result = HasDataValue(columnName, idx);
+ if (result)
+ break;
+ }
+ }
+
+ return result;
}
+ ///
+ /// Determines whether the column name[index] exists in the underlying data table
+ /// and contains a non-null, convertible value.
+ ///
+ /// The name of the column
+ /// The index of the column
+ /// true if the column exists and contains a value, false otherwise
+ ///
+ /// This method takes mapped column names into account.
+ ///
public bool HasDataValue(string columnName, string index)
{
- object value;
var mapping = _segmenter.ColumnMap.GetMapping(columnName, index);
-
- return (_row.TryGetValue(mapping.Property, out value) && value != null && value != DBNull.Value);
+
+ object value;
+ return (_row.TryGetValue(mapping.MappedName, out value) && value != null && value != DBNull.Value);
}
- public TProp GetDataValue(string columnName)
+ public TProp GetDataValue(string columnName, bool force = false)
{
- return GetDataValue(columnName, null);
+ TProp value;
+ TryGetDataValue(columnName, null, out value, force);
+ return value;
}
- public TProp GetDataValue(string columnName, string index)
+ public TProp GetDataValue(string columnName, string index, bool force = false)
+ {
+ TProp value;
+ TryGetDataValue(columnName, index, out value, force);
+ return value;
+ }
+
+ public bool TryGetDataValue(string columnName, out TProp value, bool force = false)
+ {
+ return TryGetDataValue(columnName, null, out value, force);
+ }
+
+ public bool TryGetDataValue(string columnName, string index, out TProp value, bool force = false)
{
- object value;
var mapping = _segmenter.ColumnMap.GetMapping(columnName, index);
- if (_row.TryGetValue(mapping.Property, out value) && value != null && value != DBNull.Value)
+ if (!force && mapping.IgnoreProperty)
+ {
+ value = default(TProp);
+ return false;
+ }
+
+ object rawValue;
+ if (_row.TryGetValue(mapping.MappedName, out rawValue) && rawValue != null && rawValue != DBNull.Value)
{
- return value.Convert(_segmenter.Culture);
+ value = rawValue.ToString().IsCaseInsensitiveEqual(ExplicitNull)
+ ? default(TProp)
+ : rawValue.Convert(_segmenter.Culture);
+ return true;
}
if (IsNew)
{
// only transient/new entities should fallback to possible defaults.
- return GetDefaultValue(mapping, columnName, default(TProp));
+ value = GetDefaultValue(mapping, default(TProp));
+ return true;
}
- return default(TProp);
+ value = default(TProp);
+ return false;
}
public bool SetProperty(
ImportResult result,
- T target,
Expression> prop,
TProp defaultValue = default(TProp),
Func converter = null)
{
- // TBD: (MC) do not check for perf reason?
+ return SetProperty(
+ result,
+ null, // columnName
+ prop,
+ defaultValue,
+ converter);
+ }
+
+ public bool SetProperty(
+ ImportResult result,
+ string columnName,
+ Expression> prop,
+ TProp defaultValue = default(TProp),
+ Func converter = null)
+ {
+ // TBD: (MC) do not check or validate for perf reason?
//CheckInitialized();
var isPropertySet = false;
var pi = prop.ExtractPropertyInfo();
var propName = pi.Name;
+ var target = _entity;
+
+ columnName = columnName ?? propName;
try
{
object value;
- var mapping = _segmenter.ColumnMap.GetMapping(propName);
+ var mapping = _segmenter.ColumnMap.GetMapping(columnName);
if (mapping.IgnoreProperty)
{
// explicitly ignore this property
}
- else if (_row.TryGetValue(mapping.Property, out value) && (value != null && value != DBNull.Value))
+ else if (_row.TryGetValue(mapping.MappedName, out value) && (value != null && value != DBNull.Value))
{
// source contains field value. Set it.
TProp converted;
@@ -167,7 +260,7 @@ public bool SetProperty(
{
converted = converter(value, _segmenter.Culture);
}
- else if (value.ToString().IsCaseInsensitiveEqual("[NULL]"))
+ else if (value.ToString().IsCaseInsensitiveEqual(ExplicitNull))
{
// prop is "explicitly" set to null. Don't fallback to any default!
converted = default(TProp);
@@ -189,7 +282,7 @@ public bool SetProperty(
// if entity is new and source field value is null, determine default value in this particular order:
// 2.) Default value in field mapping table
// 3.) passed default value argument
- defaultValue = GetDefaultValue(mapping, propName, defaultValue, result);
+ defaultValue = GetDefaultValue(mapping, defaultValue, result);
// source does not contain field data or is empty...
if (defaultValue != null)
@@ -207,6 +300,11 @@ public bool SetProperty(
result.AddWarning("Conversion failed: " + exception.Message, this.GetRowInfo(), propName);
}
+ if (isPropertySet && !_isDirty)
+ {
+ _isDirty = true;
+ }
+
return isPropertySet;
}
diff --git a/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs b/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs
index 9b75b86e8b..ffa0fa2615 100644
--- a/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs
+++ b/src/Libraries/SmartStore.Services/Discounts/DiscountService.cs
@@ -12,6 +12,7 @@
using SmartStore.Services.Customers;
using SmartStore.Services.Common;
using SmartStore.Services.Configuration;
+using SmartStore.Services.Orders;
namespace SmartStore.Services.Discounts
{
@@ -317,18 +318,18 @@ public virtual bool IsDiscountValid(Discount discount, Customer customer, string
}
//check date range
- DateTime now = DateTime.UtcNow;
- int storeId = _storeContext.CurrentStore.Id;
+ var now = DateTime.UtcNow;
+ var store = _storeContext.CurrentStore;
if (discount.StartDateUtc.HasValue)
{
- DateTime startDate = DateTime.SpecifyKind(discount.StartDateUtc.Value, DateTimeKind.Utc);
+ var startDate = DateTime.SpecifyKind(discount.StartDateUtc.Value, DateTimeKind.Utc);
if (startDate.CompareTo(now) > 0)
return false;
}
if (discount.EndDateUtc.HasValue)
{
- DateTime endDate = DateTime.SpecifyKind(discount.EndDateUtc.Value, DateTimeKind.Utc);
+ var endDate = DateTime.SpecifyKind(discount.EndDateUtc.Value, DateTimeKind.Utc);
if (endDate.CompareTo(now) < 0)
return false;
}
@@ -336,33 +337,37 @@ public virtual bool IsDiscountValid(Discount discount, Customer customer, string
if (!CheckDiscountLimitations(discount, customer))
return false;
- // discount requirements
- var requirements = discount.DiscountRequirements;
+ // better not to apply discounts if there are gift cards in the cart cause the customer could "earn" money through that.
+ if (discount.DiscountType == DiscountType.AssignedToOrderTotal || discount.DiscountType == DiscountType.AssignedToOrderSubTotal)
+ {
+ var cart = customer.ShoppingCartItems
+ .Filter(ShoppingCartType.ShoppingCart, store.Id)
+ .ToList();
+
+ if (cart.Any(x => x.Product.IsGiftCard))
+ return false;
+ }
+
+ // discount requirements
+ var requirements = discount.DiscountRequirements;
foreach (var req in requirements)
{
- var requirementRule = LoadDiscountRequirementRuleBySystemName(req.DiscountRequirementRuleSystemName, storeId);
+ var requirementRule = LoadDiscountRequirementRuleBySystemName(req.DiscountRequirementRuleSystemName, store.Id);
if (requirementRule == null)
continue;
- var request = new CheckDiscountRequirementRequest()
+ var request = new CheckDiscountRequirementRequest
{
DiscountRequirement = req,
Customer = customer,
- Store = _storeContext.CurrentStore
+ Store = store
};
- if (!requirementRule.Value.CheckRequirement(request))
+
+ // TODO: cache result... CheckRequirement is very often called
+ if (!requirementRule.Value.CheckRequirement(request))
return false;
}
- // better not to apply discounts if there are gift cards in the cart cause the customer could "earn" money through that.
- if (discount.DiscountType == DiscountType.AssignedToOrderTotal || discount.DiscountType == DiscountType.AssignedToOrderSubTotal)
- {
- var cart = customer.GetCartItems(ShoppingCartType.ShoppingCart, storeId);
-
- if (cart.Any(x => x.Item.Product.IsGiftCard))
- return false;
- }
-
return true;
}
diff --git a/src/Libraries/SmartStore.Services/Extensions/NameValueCollectionExtensions.cs b/src/Libraries/SmartStore.Services/Extensions/NameValueCollectionExtensions.cs
index a14c25e424..216894b2d2 100644
--- a/src/Libraries/SmartStore.Services/Extensions/NameValueCollectionExtensions.cs
+++ b/src/Libraries/SmartStore.Services/Extensions/NameValueCollectionExtensions.cs
@@ -13,6 +13,7 @@ namespace SmartStore
{
public static class NameValueCollectionExtensions
{
+ // TODO: find place to make it public static
private static string AttributeFormatedName(int productAttributeId, int attributeId, int productId = 0, int bundleItemId = 0)
{
if (productId == 0)
@@ -25,34 +26,57 @@ public static void AddProductAttribute(this NameValueCollection collection, int
{
if (productAttributeId != 0 && attributeId != 0 && valueId != 0)
{
- string name = AttributeFormatedName(productAttributeId, attributeId, productId, bundleItemId);
+ var name = AttributeFormatedName(productAttributeId, attributeId, productId, bundleItemId);
collection.Add(name, valueId.ToString());
}
}
///
- /// Converts attribute query data
+ /// Get selected attributes from query string
///
- /// Name value collection
+ /// Name value collection with selected attributes
+ /// Query string parameters
/// Attribute query data items with following structure:
/// Product.Id, ProductAttribute.Id, Product_ProductAttribute_Mapping.Id, ProductVariantAttributeValue.Id, [BundleItem.Id]
/// Product identifier to filter
- public static void ConvertAttributeQueryData(this NameValueCollection collection, List> queryData, int productId = 0)
+ public static void GetSelectedAttributes(this NameValueCollection collection, NameValueCollection queryString, List> attributes, int productId = 0)
{
- if (collection == null || queryData == null || queryData.Count <= 0)
- return;
+ Guard.NotNull(() => collection);
- var items = queryData.Where(i => i.Count > 3);
+ // ambiguous parameters: let other query string parameters win over the json formatted attributes parameter
+ if (queryString != null && queryString.Count > 0)
+ {
+ var items = queryString.AllKeys
+ .Where(x => x.EmptyNull().StartsWith("product_attribute_"))
+ .SelectMany(queryString.GetValues, (k, v) => new { key = k.EmptyNull(), value = v.TrimSafe() });
- if (productId != 0)
- items = items.Where(i => i[0] == productId);
+ foreach (var item in items)
+ {
+ var ids = item.key.Replace("product_attribute_", "").SplitSafe("_");
+ if (ids.Count() > 3)
+ {
+ if (productId == 0 || (productId != 0 && productId == ids[0].ToInt()))
+ {
+ collection.Add(item.key, item.value);
+ }
+ }
+ }
+ }
- foreach (var item in items)
+ if (attributes != null && attributes.Count > 0)
{
- var name = AttributeFormatedName(item[1], item[2], item[0], item.Count > 4 ? item[4] : 0);
+ var items = attributes.Where(i => i.Count > 3);
+
+ if (productId != 0)
+ items = items.Where(i => i[0] == productId);
- collection.Add(name, item[3].ToString());
+ foreach (var item in items)
+ {
+ var name = AttributeFormatedName(item[1], item[2], item[0], item.Count > 4 ? item[4] : 0);
+
+ collection.Add(name, item[3].ToString());
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/Filter/FilterService.cs b/src/Libraries/SmartStore.Services/Filter/FilterService.cs
index d3e1ceeaac..507b1f2fed 100644
--- a/src/Libraries/SmartStore.Services/Filter/FilterService.cs
+++ b/src/Libraries/SmartStore.Services/Filter/FilterService.cs
@@ -350,6 +350,20 @@ from a in attributes
return criterias;
}
+ private void AddChildCategoryIds(List result, int categoryId)
+ {
+ var ids = _categoryService.GetAllCategoriesByParentCategoryId(categoryId).Select(x => x.Id);
+
+ foreach (var id in ids)
+ {
+ if (!result.Contains(id))
+ {
+ result.Add(id);
+ AddChildCategoryIds(result, id);
+ }
+ }
+ }
+
public virtual List Deserialize(string jsonData)
{
if (jsonData.HasValue())
@@ -389,9 +403,7 @@ public virtual FilterProductContext CreateFilterProductContext(string filter, in
if (_catalogSettings.ShowProductsFromSubcategories)
{
- context.CategoryIds.AddRange(
- _categoryService.GetAllCategoriesByParentCategoryId(categoryID).Select(x => x.Id)
- );
+ AddChildCategoryIds(context.CategoryIds, categoryID);
}
int languageId = _services.WorkContext.WorkingLanguage.Id;
diff --git a/src/Libraries/SmartStore.Services/ICommonServices.cs b/src/Libraries/SmartStore.Services/ICommonServices.cs
index ee16a33432..f9b3043bf0 100644
--- a/src/Libraries/SmartStore.Services/ICommonServices.cs
+++ b/src/Libraries/SmartStore.Services/ICommonServices.cs
@@ -86,4 +86,37 @@ IDateTimeHelper DateTimeHelper
get;
}
}
+
+ public static class ICommonServicesExtensions
+ {
+ public static TService Resolve(this ICommonServices services)
+ {
+ return services.Container.Resolve();
+ }
+
+ public static TService Resolve(this ICommonServices services, object serviceKey)
+ {
+ return services.Container.ResolveKeyed(serviceKey);
+ }
+
+ public static TService ResolveNamed(this ICommonServices services, string serviceName)
+ {
+ return services.Container.ResolveNamed(serviceName);
+ }
+
+ public static object Resolve(this ICommonServices services, Type serviceType)
+ {
+ return services.Resolve(null, serviceType);
+ }
+
+ public static object Resolve(this ICommonServices services, object serviceKey, Type serviceType)
+ {
+ return services.Container.ResolveKeyed(serviceKey, serviceType);
+ }
+
+ public static object ResolveNamed(this ICommonServices services, string serviceName, Type serviceType)
+ {
+ return services.Container.ResolveNamed(serviceName, serviceType);
+ }
+ }
}
diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs
index 918ad1be88..6195301c03 100644
--- a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs
+++ b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs
@@ -117,9 +117,10 @@ LocaleStringResource GetLocaleStringResourceByName(string resourceName, int lang
/// Language
/// XML document
/// Prefix for resource key name
- /// Specifies whether resource should be inserted or updated (or both)
- /// Specifies whether user touched resources should also be updated
- void ImportResourcesFromXml(Language language,
+ /// Specifies whether resource should be inserted or updated (or both)
+ /// Specifies whether user touched resources should also be updated
+ /// The number of processed (added or updated) resource entries
+ int ImportResourcesFromXml(Language language,
XmlDocument xmlDocument,
string rootKey = null,
bool sourceIsPlugin = false,
@@ -131,11 +132,14 @@ void ImportResourcesFromXml(Language language,
///
/// codehint: sm-add
/// Descriptor of the plugin
- /// Load them into list rather than into database
+ /// Load them into the passed list rather than into database
/// Specifies whether user touched resources should also be updated
/// Import only files for particular languages
- void ImportPluginResourcesFromXml(PluginDescriptor pluginDescriptor,
- List forceToList = null, bool updateTouchedResources = true, IList filterLanguages = null);
+ void ImportPluginResourcesFromXml(
+ PluginDescriptor pluginDescriptor,
+ IList targetList = null,
+ bool updateTouchedResources = true,
+ IList filterLanguages = null);
///
/// Flattens all nested LocaleResource child nodes into a new document
diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs
index 871afe9887..070d1fbfe5 100644
--- a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs
+++ b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs
@@ -62,12 +62,14 @@ public partial interface ILocalizedEntityService
/// Key selector
/// Locale value
/// Language ID
- void SaveLocalizedValue(T entity,
+ void SaveLocalizedValue(
+ T entity,
Expression> keySelector,
string localeValue,
int languageId) where T : BaseEntity, ILocalizedEntity;
- void SaveLocalizedValue(T entity,
+ void SaveLocalizedValue(
+ T entity,
Expression> keySelector,
TPropType localeValue,
int languageId) where T : BaseEntity, ILocalizedEntity;
diff --git a/src/Libraries/SmartStore.Services/Localization/LanguageService.cs b/src/Libraries/SmartStore.Services/Localization/LanguageService.cs
index bc8e7d0999..db75218b54 100644
--- a/src/Libraries/SmartStore.Services/Localization/LanguageService.cs
+++ b/src/Libraries/SmartStore.Services/Localization/LanguageService.cs
@@ -110,18 +110,19 @@ public virtual IList GetAllLanguages(bool showHidden = false, int stor
{
var query = _languageRepository.Table;
if (!showHidden)
- query = query.Where(l => l.Published);
- query = query.OrderBy(l => l.DisplayOrder);
+ query = query.Where(x => x.Published);
+ query = query.OrderBy(x => x.DisplayOrder);
return query.ToList();
});
- //store mapping
+ // store mapping
if (storeId > 0)
{
languages = languages
.Where(l => _storeMappingService.Authorize(l, storeId))
.ToList();
}
+
return languages;
}
diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs b/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs
index 8610072e92..c6ac869c27 100644
--- a/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs
+++ b/src/Libraries/SmartStore.Services/Localization/LocalizationService.cs
@@ -16,6 +16,8 @@
using SmartStore.Core.Events;
using SmartStore.Core.Logging;
using SmartStore.Core.Plugins;
+using SmartStore.Core.Localization;
+using System.Globalization;
namespace SmartStore.Services.Localization
{
@@ -172,6 +174,7 @@ orderby lsr.ResourceName
if (localeStringResource == null && logIfNotFound)
_logger.Warning(string.Format("Resource string ({0}) not found. Language ID = {1}", resourceName, languageId));
+
return localeStringResource;
}
@@ -270,6 +273,7 @@ orderby l.ResourceName
string cacheKey = string.Format(LOCALESTRINGRESOURCES_ALL_KEY, languageId);
var dict = _cacheManager.Get(cacheKey, () => {
+ // TODO: make result cacheable in distributed cache (IDictionary)
var result = new ConcurrentDictionary>(8, 2000, StringComparer.CurrentCultureIgnoreCase);
if (forceAll || _localizationSettings.LoadAllLocaleRecordsOnStartup)
{
@@ -415,13 +419,183 @@ public virtual string ExportResourcesToXml(Language language)
return stringWriter.ToString();
}
+ public virtual void ImportPluginResourcesFromXml(
+ PluginDescriptor pluginDescriptor,
+ IList targetList = null,
+ bool updateTouchedResources = true,
+ IList filterLanguages = null)
+ {
+ var directory = new DirectoryInfo(Path.Combine(pluginDescriptor.OriginalAssemblyFile.Directory.FullName, "Localization"));
+
+ if (!directory.Exists)
+ return;
+
+ if (targetList == null && updateTouchedResources)
+ {
+ DeleteLocaleStringResources(pluginDescriptor.ResourceRootKey);
+ }
+
+ var unprocessedLanguages = new List();
+
+ var defaultLanguageId = _languageService.GetDefaultLanguageId();
+ var languages = filterLanguages ?? _languageService.GetAllLanguages(true);
+
+ string code = null;
+ foreach (var language in languages)
+ {
+ code = ImportPluginResourcesForLanguage(
+ language,
+ null,
+ directory,
+ pluginDescriptor.ResourceRootKey,
+ targetList,
+ updateTouchedResources,
+ false);
+
+ if (code == null)
+ {
+ unprocessedLanguages.Add(language);
+ }
+ }
+
+ if (filterLanguages == null && unprocessedLanguages.Count > 0)
+ {
+ // There were unprocessed languages (no corresponding resource file could be found).
+ // In order for GetResource() to be able to gracefully fallback to the default language's resources,
+ // we need to import resources for the current default language....
+ var processedLanguages = languages.Except(unprocessedLanguages).ToList();
+ if (!processedLanguages.Any(x => x.Id == defaultLanguageId))
+ {
+ // ...but only if no resource file could be mapped to the default language before,
+ // namely because in this case the following operation would be redundant.
+ var defaultLanguage = _languageService.GetLanguageById(_languageService.GetDefaultLanguageId());
+ if (defaultLanguage != null)
+ {
+ ImportPluginResourcesForLanguage(
+ defaultLanguage,
+ "en-us",
+ directory,
+ pluginDescriptor.ResourceRootKey,
+ targetList,
+ updateTouchedResources,
+ true);
+ }
+ }
+ }
+ }
+
///
- /// Import language resources from XML file
+ /// Resolves a resource file for the specified language and processes the import
///
/// Language
- /// XML document
- /// Prefix for resource key name
- public virtual void ImportResourcesFromXml(
+ /// The culture code of the processed resource file
+ private string ImportPluginResourcesForLanguage(
+ Language language,
+ string fileCode,
+ DirectoryInfo directory,
+ string resourceRootKey,
+ IList targetList,
+ bool updateTouchedResources,
+ bool canFallBackToAnyResourceFile)
+ {
+ var fileNamePattern = "resources.{0}.xml";
+
+ var codeCandidates = GetResourceFileCodeCandidates(
+ fileCode ?? language.LanguageCulture,
+ directory,
+ canFallBackToAnyResourceFile);
+
+ string path = null;
+ string code = null;
+
+ foreach (var candidate in codeCandidates)
+ {
+ var pathCandidate = Path.Combine(directory.FullName, fileNamePattern.FormatInvariant(candidate));
+ if (File.Exists(pathCandidate))
+ {
+ code = candidate;
+ path = pathCandidate;
+ break;
+ }
+ }
+
+ if (code != null)
+ {
+ var doc = new XmlDocument();
+
+ doc.Load(path);
+ doc = FlattenResourceFile(doc);
+
+ if (targetList == null)
+ {
+ ImportResourcesFromXml(language, doc, resourceRootKey, true, updateTouchedResources: updateTouchedResources);
+ }
+ else
+ {
+ var nodes = doc.SelectNodes(@"//Language/LocaleResource");
+ foreach (XmlNode node in nodes)
+ {
+ var valueNode = node.SelectSingleNode("Value");
+ var res = new LocaleStringResource()
+ {
+ ResourceName = node.Attributes["Name"].InnerText.Trim(),
+ ResourceValue = (valueNode == null ? "" : valueNode.InnerText),
+ LanguageId = language.Id,
+ IsFromPlugin = true
+ };
+
+ if (res.ResourceName.HasValue())
+ {
+ targetList.Add(res);
+ }
+ }
+ }
+ }
+
+ return code;
+ }
+
+ private IEnumerable GetResourceFileCodeCandidates(string code, DirectoryInfo directory, bool canFallBackToAnyResourceFile)
+ {
+ // exact match (de-DE)
+ yield return code;
+
+ // neutral culture (de)
+ var ci = CultureInfo.GetCultureInfo(code);
+ if (ci.Parent != null && !ci.IsNeutralCulture)
+ {
+ code = ci.Parent.Name;
+ yield return code;
+ }
+
+ var rgFileName = new Regex("^resources.(.+?).xml$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+ // any other region with same language (de-*)
+ foreach (var fi in directory.EnumerateFiles("resources.{0}-*.xml".FormatInvariant(code), SearchOption.TopDirectoryOnly))
+ {
+ code = rgFileName.Match(fi.Name).Groups[1].Value;
+ if (LocalizationHelper.IsValidCultureCode(code))
+ {
+ yield return code;
+ yield break;
+ }
+ }
+
+ if (canFallBackToAnyResourceFile)
+ {
+ foreach (var fi in directory.EnumerateFiles("resources.*.xml", SearchOption.TopDirectoryOnly))
+ {
+ code = rgFileName.Match(fi.Name).Groups[1].Value;
+ if (LocalizationHelper.IsValidCultureCode(code))
+ {
+ yield return code;
+ yield break;
+ }
+ }
+ }
+ }
+
+ public virtual int ImportResourcesFromXml(
Language language,
XmlDocument xmlDocument,
string rootKey = null,
@@ -429,12 +603,16 @@ public virtual void ImportResourcesFromXml(
ImportModeFlags mode = ImportModeFlags.Insert | ImportModeFlags.Update,
bool updateTouchedResources = false)
{
- using (var scope = new DbContextScope(autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false))
+ using (var scope = new DbContextScope(autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false, forceNoTracking: true, hooksEnabled: false))
{
var toAdd = new List();
var toUpdate = new List();
var nodes = xmlDocument.SelectNodes(@"//Language/LocaleResource");
+ var resources = language.LocaleStringResources.ToDictionarySafe(x => x.ResourceName, StringComparer.OrdinalIgnoreCase);
+
+ LocaleStringResource resource;
+
foreach (var xel in nodes.Cast())
{
string name = xel.GetAttribute("Name").TrimSafe();
@@ -452,18 +630,23 @@ public virtual void ImportResourcesFromXml(
name = "{0}.{1}".FormatWith(rootKey, name);
}
+ resource = null;
+
// do not use "Insert"/"Update" methods because they clear cache
// let's bulk insert
- var resource = language.LocaleStringResources.Where(x => x.ResourceName.Equals(name, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault();
- if (resource != null)
+ //var resource = language.LocaleStringResources.Where(x => x.ResourceName.Equals(name, StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault();
+ if (resources.TryGetValue(name, out resource))
{
if (mode.HasFlag(ImportModeFlags.Update))
{
if (updateTouchedResources || !resource.IsTouched.GetValueOrDefault())
{
- resource.ResourceValue = value;
- resource.IsTouched = null;
- toUpdate.Add(resource);
+ if (value != resource.ResourceValue)
+ {
+ resource.ResourceValue = value;
+ resource.IsTouched = null;
+ toUpdate.Add(resource);
+ }
}
}
}
@@ -472,7 +655,7 @@ public virtual void ImportResourcesFromXml(
if (mode.HasFlag(ImportModeFlags.Insert))
{
toAdd.Add(
- new LocaleStringResource()
+ new LocaleStringResource
{
LanguageId = language.Id,
ResourceName = name,
@@ -483,84 +666,25 @@ public virtual void ImportResourcesFromXml(
}
}
- _lsrRepository.AutoCommitEnabled = true;
- _lsrRepository.InsertRange(toAdd, 500);
- toAdd.Clear();
-
- _lsrRepository.UpdateRange(toUpdate);
- toUpdate.Clear();
-
- //clear cache
- _cacheManager.RemoveByPattern(LOCALESTRINGRESOURCES_PATTERN_KEY);
- }
- }
-
- ///
- /// Import plugin resources from xml files in plugin's localization directory.
- ///
- /// Descriptor of the plugin
- /// Load them into list rather than into database
- /// Specifies whether user touched resources should also be updated
- /// Import only files for particular languages
- public virtual void ImportPluginResourcesFromXml(PluginDescriptor pluginDescriptor,
- List forceToList = null, bool updateTouchedResources = true, IList filterLanguages = null)
- {
- string pluginDir = pluginDescriptor.OriginalAssemblyFile.Directory.FullName;
- string localizationDir = Path.Combine(pluginDir, "Localization");
+ //_lsrRepository.AutoCommitEnabled = true;
- if (!System.IO.Directory.Exists(localizationDir))
- return;
+ if (toAdd.Any() || toUpdate.Any())
+ {
+ _lsrRepository.InsertRange(toAdd);
+ toAdd.Clear();
- if (forceToList == null && updateTouchedResources)
- DeleteLocaleStringResources(pluginDescriptor.ResourceRootKey);
+ _lsrRepository.UpdateRange(toUpdate);
+ toUpdate.Clear();
- var languages = _languageService.GetAllLanguages(true);
- var doc = new XmlDocument();
+ int num = _lsrRepository.Context.SaveChanges();
- foreach (var filePath in System.IO.Directory.EnumerateFiles(localizationDir, "*.xml"))
- {
- Match match = Regex.Match(Path.GetFileName(filePath), Regex.Escape("resources.") + "(.*?)" + Regex.Escape(".xml"));
- string languageCode = match.Groups[1].Value;
+ // clear cache
+ _cacheManager.RemoveByPattern(LOCALESTRINGRESOURCES_PATTERN_KEY);
- Language language = languages.Where(l => l.LanguageCulture.IsCaseInsensitiveEqual(languageCode)).FirstOrDefault();
- if (language != null)
- {
- language = _languageService.GetLanguageById(language.Id);
+ return num;
}
- if (languageCode.HasValue() && language != null)
- {
- if (filterLanguages != null && !filterLanguages.Any(x => x.Id == language.Id))
- {
- continue;
- }
-
- doc.Load(filePath);
- doc = FlattenResourceFile(doc);
-
- if (forceToList == null)
- {
- ImportResourcesFromXml(language, doc, pluginDescriptor.ResourceRootKey, true, updateTouchedResources: updateTouchedResources);
- }
- else
- {
- var nodes = doc.SelectNodes(@"//Language/LocaleResource");
- foreach (XmlNode node in nodes)
- {
- var valueNode = node.SelectSingleNode("Value");
- var res = new LocaleStringResource()
- {
- ResourceName = node.Attributes["Name"].InnerText.Trim(),
- ResourceValue = (valueNode == null ? "" : valueNode.InnerText),
- LanguageId = language.Id,
- IsFromPlugin = true
- };
-
- if (res.ResourceName.HasValue())
- forceToList.Add(res);
- }
- }
- }
+ return 0;
}
}
diff --git a/src/Libraries/SmartStore.Services/Logging/DefaultLogger.cs b/src/Libraries/SmartStore.Services/Logging/DefaultLogger.cs
index fb152d8a1f..8387de3969 100644
--- a/src/Libraries/SmartStore.Services/Logging/DefaultLogger.cs
+++ b/src/Libraries/SmartStore.Services/Logging/DefaultLogger.cs
@@ -119,9 +119,9 @@ public virtual IPagedList GetAllLogs(DateTime? fromUtc, DateTime? toUtc, st
var query = _logRepository.Table;
if (fromUtc.HasValue)
- query = query.Where(l => fromUtc.Value <= l.CreatedOnUtc);
+ query = query.Where(l => fromUtc.Value <= l.CreatedOnUtc || fromUtc.Value <= l.UpdatedOnUtc);
if (toUtc.HasValue)
- query = query.Where(l => toUtc.Value >= l.CreatedOnUtc);
+ query = query.Where(l => toUtc.Value >= l.CreatedOnUtc || toUtc.Value >= l.UpdatedOnUtc);
if (logLevel.HasValue)
{
int logLevelId = (int)logLevel.Value;
@@ -129,7 +129,8 @@ public virtual IPagedList GetAllLogs(DateTime? fromUtc, DateTime? toUtc, st
}
if (!String.IsNullOrEmpty(message))
query = query.Where(l => l.ShortMessage.Contains(message) || l.FullMessage.Contains(message));
- query = query.OrderByDescending(l => l.CreatedOnUtc);
+
+ query = query.OrderByDescending(l => l.UpdatedOnUtc).ThenByDescending(l => l.CreatedOnUtc);
if (minFrequency > 0)
query = query.Where(l => l.Frequency >= minFrequency);
diff --git a/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs b/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs
index 70ee52c637..979051d1d6 100644
--- a/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs
+++ b/src/Libraries/SmartStore.Services/Messages/Importer/NewsLetterSubscriptionImporter.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Linq;
using SmartStore.Core.Data;
using SmartStore.Core.Domain.DataExchange;
@@ -37,25 +36,23 @@ public static string[] DefaultKeyFields
}
}
- public void Execute(IImportExecuteContext context)
+ public void Execute(ImportExecuteContext context)
{
var utcNow = DateTime.UtcNow;
var currentStoreId = _services.StoreContext.CurrentStore.Id;
- var toAdd = new List();
- var toUpdate = new List();
-
using (var scope = new DbContextScope(ctx: _services.DbContext, autoDetectChanges: false, proxyCreation: false, validateOnSave: false, autoCommit: false))
{
- var segmenter = context.GetSegmenter();
+ var segmenter = context.DataSegmenter;
context.Result.TotalRecords = segmenter.TotalRows;
while (context.Abort == DataExchangeAbortion.None && segmenter.ReadNextBatch())
{
- var batch = segmenter.CurrentBatch;
+ var batch = segmenter.GetCurrentBatch();
- _subscriptionRepository.Context.DetachAll(false);
+ // Perf: detach all entities
+ _subscriptionRepository.Context.DetachEntities(false);
context.SetProgress(segmenter.CurrentSegmentFirstRowIndex - 1, segmenter.TotalRows);
@@ -63,12 +60,22 @@ public void Execute(IImportExecuteContext context)
{
try
{
+ var active = true;
var email = row.GetDataValue("Email");
- var active = row.GetDataValue("Active");
var storeId = row.GetDataValue("StoreId");
if (storeId == 0)
+ {
storeId = currentStoreId;
+ }
+
+ if (row.HasDataValue("Active") && row.TryGetDataValue("Active", out active))
+ {
+ }
+ else
+ {
+ active = true; // default
+ }
if (email.IsEmpty())
{
@@ -122,32 +129,25 @@ public void Execute(IImportExecuteContext context)
StoreId = storeId
};
- toAdd.Add(subscription);
- ++context.Result.NewRecords;
+ _subscriptionRepository.Insert(subscription);
+ context.Result.NewRecords++;
}
else
{
subscription.Active = active;
- toUpdate.Add(subscription);
- ++context.Result.ModifiedRecords;
+ _subscriptionRepository.Update(subscription);
+ context.Result.ModifiedRecords++;
}
-
- // insert new subscribers
- _subscriptionRepository.AutoCommitEnabled = true;
- _subscriptionRepository.InsertRange(toAdd, 500);
- toAdd.Clear();
-
- // update modified subscribers
- _subscriptionRepository.UpdateRange(toUpdate);
- toUpdate.Clear();
}
catch (Exception exception)
{
context.Result.AddError(exception.ToAllMessages(), row.GetRowInfo());
}
- }
- }
+ } // for
+
+ _subscriptionRepository.Context.SaveChanges();
+ } // while
}
}
}
diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs
index d9a340c451..7e266a98b1 100644
--- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs
+++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeService.cs
@@ -4,18 +4,19 @@
using SmartStore.Core.Caching;
using SmartStore.Core.Data;
using SmartStore.Core.Domain.Orders;
+using SmartStore.Core.Domain.Stores;
using SmartStore.Core.Events;
namespace SmartStore.Services.Orders
{
- ///
- /// Checkout attribute service
- ///
- public partial class CheckoutAttributeService : ICheckoutAttributeService
+ ///
+ /// Checkout attribute service
+ ///
+ public partial class CheckoutAttributeService : ICheckoutAttributeService
{
#region Constants
- private const string CHECKOUTATTRIBUTES_ALL_KEY = "SmartStore.checkoutattribute.all-{0}";
+ private const string CHECKOUTATTRIBUTES_ALL_KEY = "SmartStore.checkoutattribute.all-{0}-{1}";
private const string CHECKOUTATTRIBUTEVALUES_ALL_KEY = "SmartStore.checkoutattributevalue.all-{0}";
private const string CHECKOUTATTRIBUTES_PATTERN_KEY = "SmartStore.checkoutattribute.";
private const string CHECKOUTATTRIBUTEVALUES_PATTERN_KEY = "SmartStore.checkoutattributevalue.";
@@ -28,7 +29,8 @@ public partial class CheckoutAttributeService : ICheckoutAttributeService
private readonly IRepository _checkoutAttributeRepository;
private readonly IRepository _checkoutAttributeValueRepository;
- private readonly IEventPublisher _eventPublisher;
+ private readonly IRepository _storeMappingRepository;
+ private readonly IEventPublisher _eventPublisher;
private readonly ICacheManager _cacheManager;
#endregion
@@ -45,25 +47,31 @@ public partial class CheckoutAttributeService : ICheckoutAttributeService
public CheckoutAttributeService(ICacheManager cacheManager,
IRepository checkoutAttributeRepository,
IRepository checkoutAttributeValueRepository,
- IEventPublisher eventPublisher)
+ IRepository storeMappingRepository,
+ IEventPublisher eventPublisher)
{
_cacheManager = cacheManager;
_checkoutAttributeRepository = checkoutAttributeRepository;
_checkoutAttributeValueRepository = checkoutAttributeValueRepository;
+ _storeMappingRepository = storeMappingRepository;
_eventPublisher = eventPublisher;
- }
- #endregion
+ this.QuerySettings = DbQuerySettings.Default;
+ }
- #region Methods
+ #endregion
- #region Checkout attributes
+ public DbQuerySettings QuerySettings { get; set; }
- ///
- /// Deletes a checkout attribute
- ///
- /// Checkout attribute
- public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute)
+ #region Methods
+
+ #region Checkout attributes
+
+ ///
+ /// Deletes a checkout attribute
+ ///
+ /// Checkout attribute
+ public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute)
{
if (checkoutAttribute == null)
throw new ArgumentNullException("checkoutAttribute");
@@ -77,26 +85,56 @@ public virtual void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute)
_eventPublisher.EntityDeleted(checkoutAttribute);
}
- ///
- /// Gets all checkout attributes
- ///
- /// Checkout attribute collection
- public virtual IList GetAllCheckoutAttributes(bool showHidden = false)
+ ///
+ /// Gets checkout attributes
+ ///
+ /// Whether to filter result by store identifier
+ /// A value indicating whether to show hidden records
+ /// Checkout attributes query
+ public virtual IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false)
+ {
+ var query = _checkoutAttributeRepository.Table;
+
+ if (!showHidden)
+ query = query.Where(x => x.IsActive);
+
+ if (storeId > 0 && !QuerySettings.IgnoreMultiStore)
+ {
+ query =
+ from x in query
+ join sm in _storeMappingRepository.Table on new { c1 = x.Id, c2 = "CheckoutAttribute" } equals new { c1 = sm.EntityId, c2 = sm.EntityName } into x_sm
+ from sm in x_sm.DefaultIfEmpty()
+ where !x.LimitedToStores || storeId == sm.StoreId
+ select x;
+
+ query =
+ from x in query
+ group x by x.Id into grp
+ orderby grp.Key
+ select grp.FirstOrDefault();
+ }
+
+ query = query.OrderBy(x => x.DisplayOrder);
+
+ return query;
+ }
+
+ ///
+ /// Gets all checkout attributes
+ ///
+ /// Whether to filter result by store identifier
+ /// A value indicating whether to show hidden records
+ /// Checkout attribute collection
+ public virtual IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false)
{
- string key = CHECKOUTATTRIBUTES_ALL_KEY.FormatInvariant(showHidden);
+ string key = CHECKOUTATTRIBUTES_ALL_KEY.FormatInvariant(storeId, showHidden);
return _cacheManager.Get(key, () =>
{
- var query = _checkoutAttributeRepository.Table;
+ var query = GetCheckoutAttributes(storeId, showHidden);
- if (!showHidden)
- query = query.Where(x => x.IsActive);
-
- query = query.OrderBy(x => x.DisplayOrder);
-
- var checkoutAttributes = query.ToList();
- return checkoutAttributes;
- });
+ return query.ToList();
+ });
}
///
diff --git a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs
index 2ceb9c3396..9a520ca28b 100644
--- a/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs
+++ b/src/Libraries/SmartStore.Services/Orders/ICheckoutAttributeService.cs
@@ -1,12 +1,13 @@
using System.Collections.Generic;
+using System.Linq;
using SmartStore.Core.Domain.Orders;
namespace SmartStore.Services.Orders
{
- ///
- /// Checkout attribute service
- ///
- public partial interface ICheckoutAttributeService
+ ///
+ /// Checkout attribute service
+ ///
+ public partial interface ICheckoutAttributeService
{
#region Checkout attributes
@@ -16,11 +17,21 @@ public partial interface ICheckoutAttributeService
/// Checkout attribute
void DeleteCheckoutAttribute(CheckoutAttribute checkoutAttribute);
- ///
- /// Gets all checkout attributes
- ///
- /// Checkout attribute collection
- IList GetAllCheckoutAttributes(bool showHidden = false);
+ ///
+ /// Gets checkout attributes
+ ///
+ /// Whether to filter result by store identifier
+ /// A value indicating whether to show hidden records
+ /// Checkout attributes query
+ IQueryable GetCheckoutAttributes(int storeId = 0, bool showHidden = false);
+
+ ///
+ /// Gets all checkout attributes
+ ///
+ /// Whether to filter result by store identifier
+ /// A value indicating whether to show hidden records
+ /// Checkout attribute collection
+ IList GetAllCheckoutAttributes(int storeId = 0, bool showHidden = false);
///
/// Gets a checkout attribute
diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs
index 7c633a920f..0993597da4 100644
--- a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs
+++ b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs
@@ -242,12 +242,8 @@ protected void AwardRewardPoints(Order order, decimal? amount = null)
if (order.RewardPointsWereAdded)
return;
- // Truncate increases the risk of inaccuracy of rounding
- //int points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points);
-
- // why are points awarded for OrderTotal? wouldn't be OrderSubtotalInclTax better?
-
- int points = (int)Math.Round((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points);
+ // Trucate same as Floor for positive amounts
+ int points = (int)Math.Truncate((amount ?? order.OrderTotal) / _rewardPointsSettings.PointsForPurchases_Amount * _rewardPointsSettings.PointsForPurchases_Points);
if (points == 0)
return;
@@ -1139,7 +1135,7 @@ public virtual PlaceOrderResult PlaceOrder(
var bundleItemSubTotal = _taxService.GetProductPrice(childItem.Item.Product, _priceCalculationService.GetSubTotal(childItem, true), out taxRate);
var attributesInfo = _productAttributeFormatter.FormatAttributes(childItem.Item.Product, childItem.Item.AttributesXml, order.Customer,
- renderPrices: false, allowHyperlinks: false);
+ renderPrices: false, allowHyperlinks: true);
childItem.BundleItemData.ToOrderData(listBundleData, bundleItemSubTotal, childItem.Item.AttributesXml, attributesInfo);
}
diff --git a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs
index 259b323910..27f0331be4 100644
--- a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs
+++ b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs
@@ -879,7 +879,7 @@ public virtual IList GetShoppingCartWarnings(IList(this T entity,
}
}
- // validate and alter sename if it could be interpreted as SEO code
+ // validate and alter SeName if it could be interpreted as SEO code
if (LocalizationHelper.IsValidCultureCode(seName))
{
if (seName.Length == 2)
diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
index 056e552845..1edfe58738 100644
--- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
+++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
@@ -174,23 +174,26 @@
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
@@ -204,19 +207,19 @@
-
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs b/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs
index 25243b0ad5..c35b4b7128 100644
--- a/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/CronExpression.cs
@@ -59,14 +59,16 @@ public static string GetFriendlyDescription(string expression)
Use24HourTimeFormat = Thread.CurrentThread.CurrentUICulture.DateTimeFormat.AMDesignator.IsEmpty()
};
- try
- {
- return ExpressionDescriptor.GetDescription(expression, options);
- }
- catch
+ if (expression.HasValue())
{
- return null;
+ try
+ {
+ return ExpressionDescriptor.GetDescription(expression, options);
+ }
+ catch { }
}
+
+ return "?";
}
}
diff --git a/src/Libraries/SmartStore.Services/Tasks/InitializeSchedulerFilter.cs b/src/Libraries/SmartStore.Services/Tasks/InitializeSchedulerFilter.cs
index e5b6db97de..3329fbf3a7 100644
--- a/src/Libraries/SmartStore.Services/Tasks/InitializeSchedulerFilter.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/InitializeSchedulerFilter.cs
@@ -17,24 +17,35 @@ namespace SmartStore.Services.Tasks
public class InitializeSchedulerFilter : IAuthorizationFilter
{
private readonly static object s_lock = new object();
+ private static int s_errCount;
private static bool s_initializing = false;
public void OnAuthorization(AuthorizationContext filterContext)
{
- lock (s_lock)
+ if (filterContext == null || filterContext.HttpContext == null)
+ return;
+
+ var request = filterContext.HttpContext.Request;
+ if (request == null)
+ return;
+
+ if (filterContext.IsChildAction)
+ return;
+
+ lock (s_lock)
{
if (!s_initializing)
{
s_initializing = true;
- var logger = EngineContext.Current.Resolve();
+ ILogger logger = EngineContext.Current.Resolve();
+ ITaskScheduler taskScheduler = EngineContext.Current.Resolve();
try
{
var taskService = EngineContext.Current.Resolve();
var storeService = EngineContext.Current.Resolve();
var eventPublisher = EngineContext.Current.Resolve();
- var taskScheduler = EngineContext.Current.Resolve();
var tasks = taskService.GetAllTasks(true);
taskService.CalculateFutureSchedules(tasks, true /* isAppStart */);
@@ -59,11 +70,23 @@ public void OnAuthorization(AuthorizationContext filterContext)
}
catch (Exception ex)
{
+ s_errCount++;
+ s_initializing = false;
logger.Error("Error while initializing Task Scheduler", ex);
}
finally
{
- GlobalFilters.Filters.Remove(this);
+ var tooManyFailures = s_errCount >= 10;
+
+ if (tooManyFailures || (taskScheduler != null && taskScheduler.IsActive))
+ {
+ GlobalFilters.Filters.Remove(this);
+ }
+
+ if (tooManyFailures && logger != null)
+ {
+ logger.Warning("Stopped trying to initialize the Task Scheduler: too many failed attempts in succession (10+). Maybe uncommenting the setting 'sm:TaskSchedulerBaseUrl' in web.config solves the problem?");
+ }
}
}
}
diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs b/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs
index fc7ce73e42..8fd93c2956 100644
--- a/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/TaskExecutor.cs
@@ -1,21 +1,22 @@
using System;
+using System.Collections.Generic;
+using System.Diagnostics;
using System.Threading;
using Autofac;
+using SmartStore.Core;
using SmartStore.Core.Async;
using SmartStore.Core.Data;
+using SmartStore.Core.Domain.Customers;
using SmartStore.Core.Domain.Tasks;
+using SmartStore.Core.Localization;
using SmartStore.Core.Logging;
using SmartStore.Core.Plugins;
using SmartStore.Services.Customers;
-using SmartStore.Core;
-using SmartStore.Core.Domain.Customers;
-using System.Diagnostics;
-using System.Collections.Generic;
namespace SmartStore.Services.Tasks
{
- public class TaskExecutor : ITaskExecutor
+ public class TaskExecutor : ITaskExecutor
{
private readonly IScheduleTaskService _scheduledTaskService;
private readonly IDbContext _dbContext;
@@ -42,11 +43,13 @@ public TaskExecutor(
this._taskResolver = taskResolver;
Logger = NullLogger.Instance;
- }
+ T = NullLocalizer.Instance;
+ }
public ILogger Logger { get; set; }
+ public Localizer T { get; set; }
- public void Execute(
+ public void Execute(
ScheduleTask task,
IDictionary taskParameters = null,
bool throwOnError = false)
@@ -126,12 +129,17 @@ public void Execute(
instance.Execute(ctx);
}
- catch (Exception ex)
+ catch (Exception exception)
{
faulted = true;
- canceled = ex is OperationCanceledException;
- Logger.Error(string.Format("Error while running scheduled task '{0}'. {1}", task.Name, ex.Message), ex);
- lastError = ex.Message.Truncate(995, "...");
+ canceled = exception is OperationCanceledException;
+ lastError = exception.Message.Truncate(995, "...");
+
+ if (canceled)
+ Logger.Warning(T("Admin.System.ScheduleTasks.Cancellation", task.Name), exception);
+ else
+ Logger.Error(string.Concat(T("Admin.System.ScheduleTasks.RunningError", task.Name), ": ", exception.Message), exception);
+
if (throwOnError)
{
throw;
diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
index 2ba9eb56e6..0e055029a3 100644
--- a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
@@ -13,6 +13,7 @@
using SmartStore.Collections;
using SmartStore.Core.Infrastructure;
using SmartStore.Core.Caching;
+using SmartStore.Core;
namespace SmartStore.Services.Tasks
{
@@ -48,7 +49,7 @@ public string BaseUrl
{
CheckUrl(value);
_baseUrl = value.TrimEnd('/', '\\');
- }
+ }
}
public void Start()
@@ -135,7 +136,7 @@ public void RunSingleTask(int scheduleTaskId, IDictionary taskPa
query = qs.ToString();
}
- CallEndpoint("{0}/Execute/{1}{2}".FormatInvariant(_baseUrl, scheduleTaskId, query));
+ CallEndpoint(new Uri("{0}/Execute/{1}{2}".FormatInvariant(_baseUrl, scheduleTaskId, query)));
}
private void Elapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -153,7 +154,7 @@ private void Elapsed(object sender, System.Timers.ElapsedEventArgs e)
_intervalFixed = true;
}
- CallEndpoint(_baseUrl + "/Sweep");
+ CallEndpoint(new Uri(_baseUrl + "/Sweep"));
}
}
finally
@@ -162,26 +163,25 @@ private void Elapsed(object sender, System.Timers.ElapsedEventArgs e)
}
}
- protected internal virtual void CallEndpoint(string url)
+ protected internal virtual void CallEndpoint(Uri uri)
{
if (_shuttingDown)
return;
-
- var req = (HttpWebRequest)WebRequest.Create(url);
- req.ServerCertificateValidationCallback += (sender, cert, chain, errors) => true;
- req.UserAgent = "SmartStore.NET";
- req.Method = "POST";
+
+ var req = WebHelper.CreateHttpRequestForSafeLocalCall(uri);
+ req.Method = "POST";
req.ContentType = "text/plain";
req.ContentLength = 0;
+ req.Timeout = 10000; // 10 sec.
string authToken = CreateAuthToken();
req.Headers.Add("X-AUTH-TOKEN", authToken);
- req.GetResponseAsync().ContinueWith(t =>
- {
+ req.GetResponseAsync().ContinueWith(t =>
+ {
if (t.IsFaulted)
{
- HandleException(t.Exception, url);
+ HandleException(t.Exception, uri);
_errCount++;
if (_errCount >= 10)
{
@@ -205,19 +205,23 @@ protected internal virtual void CallEndpoint(string url)
response.Dispose();
}
- });
- }
+ });
+ }
- private void HandleException(AggregateException exception, string url)
+ private void HandleException(AggregateException exception, Uri uri)
{
using (var logger = new TraceLogger())
{
- string msg = "Error while calling TaskScheduler endpoint '{0}'.".FormatInvariant(url);
+ string msg = "Error while calling TaskScheduler endpoint '{0}'.".FormatInvariant(uri.OriginalString);
var wex = exception.InnerExceptions.OfType().FirstOrDefault();
if (wex == null)
{
- logger.Error(msg, exception);
+ logger.Error(msg, exception.InnerException);
+ }
+ else if (wex.Response == null)
+ {
+ logger.Error(msg, wex);
}
else
{
@@ -233,7 +237,7 @@ private void HandleException(AggregateException exception, string url)
}
}
- private void CheckUrl(string url)
+ private void CheckUrl(string url)
{
if (!url.IsWebUrl())
{
diff --git a/src/Plugins/SmartStore.AmazonPay/Description.txt b/src/Plugins/SmartStore.AmazonPay/Description.txt
index 3e203915e6..8237c4a7ad 100644
--- a/src/Plugins/SmartStore.AmazonPay/Description.txt
+++ b/src/Plugins/SmartStore.AmazonPay/Description.txt
@@ -1,6 +1,6 @@
FriendlyName: Pay with Amazon
SystemName: SmartStore.AmazonPay
-Version: 2.5.0
+Version: 2.6.0
Group: Payment
MinAppVersion: 2.5.0
Author: SmartStore AG
diff --git a/src/Plugins/SmartStore.Clickatell/Description.txt b/src/Plugins/SmartStore.Clickatell/Description.txt
index d5e561a2fc..177b509843 100644
--- a/src/Plugins/SmartStore.Clickatell/Description.txt
+++ b/src/Plugins/SmartStore.Clickatell/Description.txt
@@ -1,7 +1,7 @@
FriendlyName: Clickatell SMS Provider
SystemName: SmartStore.Clickatell
Group: Mobile
-Version: 2.5.0
+Version: 2.6.0
MinAppVersion: 2.5.0
DisplayOrder: 1
FileName: SmartStore.Clickatell.dll
diff --git a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
index 91f0a57419..4e4cb6d96d 100644
--- a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
+++ b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Web.Mvc;
-using System.Reflection;
using Autofac;
-using Autofac.Core;
using Autofac.Integration.Mvc;
-using SmartStore.Core.Plugins;
using SmartStore.Core.Data;
using SmartStore.Core.Infrastructure;
using SmartStore.Core.Infrastructure.DependencyManagement;
@@ -16,13 +9,13 @@
namespace SmartStore.DevTools
{
- public class DependencyRegistrar : IDependencyRegistrar
+ public class DependencyRegistrar : IDependencyRegistrar
{
public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, bool isActiveModule)
{
builder.RegisterType().As().InstancePerRequest();
- if (isActiveModule)
+ if (isActiveModule && DataSettings.DatabaseIsInstalled())
{
// intercept ALL public store controller actions
builder.RegisterType().AsActionFilterFor();
diff --git a/src/Plugins/SmartStore.DevTools/Description.txt b/src/Plugins/SmartStore.DevTools/Description.txt
index fff9df57de..b169d8b16a 100644
--- a/src/Plugins/SmartStore.DevTools/Description.txt
+++ b/src/Plugins/SmartStore.DevTools/Description.txt
@@ -1,7 +1,7 @@
FriendlyName: SmartStore.NET Developer Tools (MiniProfiler and other goodies)
SystemName: SmartStore.DevTools
Group: Developer
-Version: 2.5.0
+Version: 2.6.0
MinAppVersion: 2.5.0
DisplayOrder: 1
FileName: SmartStore.DevTools.dll
diff --git a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
index e1c5693558..c2e585d0eb 100644
--- a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
+++ b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
@@ -1,5 +1,6 @@
using System;
using System.Web;
+using SmartStore.Core.Data;
using SmartStore.Core.Infrastructure;
using StackExchange.Profiling;
@@ -43,6 +44,11 @@ private static bool ShouldProfile(HttpApplication app)
if (app.Context == null || app.Context.Request == null)
return false;
+ if (!DataSettings.DatabaseIsInstalled())
+ {
+ return false;
+ }
+
var url = app.Context.Request.AppRelativeCurrentExecutionFilePath;
if (url.StartsWith("~/admin", StringComparison.InvariantCultureIgnoreCase) || url.StartsWith("~/mini-profiler", StringComparison.InvariantCultureIgnoreCase) || url.StartsWith("~/bundles", StringComparison.InvariantCultureIgnoreCase))
{
diff --git a/src/Plugins/SmartStore.DiscountRules/Description.txt b/src/Plugins/SmartStore.DiscountRules/Description.txt
index 2a17b4fcd9..f4bb29d728 100644
--- a/src/Plugins/SmartStore.DiscountRules/Description.txt
+++ b/src/Plugins/SmartStore.DiscountRules/Description.txt
@@ -2,7 +2,7 @@
Description: Contains common discount requirement rule providers like "Billing country is", "Customer role is", "Had spent amount" etc.
Group: Marketing
SystemName: SmartStore.DiscountRules
-Version: 2.5.0
+Version: 2.6.0
MinAppVersion: 2.5.0
DisplayOrder: 0
FileName: SmartStore.DiscountRules.dll
diff --git a/src/Plugins/SmartStore.DiscountRules/Providers/HadSpentAmountRule.cs b/src/Plugins/SmartStore.DiscountRules/Providers/HadSpentAmountRule.cs
index b67d2a7efd..69d7f2614b 100644
--- a/src/Plugins/SmartStore.DiscountRules/Providers/HadSpentAmountRule.cs
+++ b/src/Plugins/SmartStore.DiscountRules/Providers/HadSpentAmountRule.cs
@@ -1,15 +1,16 @@
using System;
+using System.Collections.Generic;
using System.Linq;
+using Newtonsoft.Json;
using SmartStore.Core.Domain.Orders;
+using SmartStore.Core.Logging;
using SmartStore.Core.Plugins;
-using SmartStore.Services.Discounts;
+using SmartStore.DiscountRules.Settings;
+using SmartStore.Services.Catalog;
using SmartStore.Services.Customers;
+using SmartStore.Services.Discounts;
using SmartStore.Services.Orders;
-using SmartStore.Services.Catalog;
using SmartStore.Services.Tax;
-using SmartStore.Core.Localization;
-using SmartStore.DiscountRules.Settings;
-using Newtonsoft.Json;
namespace SmartStore.DiscountRules
{
@@ -21,15 +22,18 @@ public partial class HadSpentAmountRule : DiscountRequirementRuleBase
private readonly IOrderService _orderService;
private readonly IPriceCalculationService _priceCalculationService;
private readonly ITaxService _taxService;
+ private readonly ILogger _logger;
public HadSpentAmountRule(
IOrderService orderService,
IPriceCalculationService priceCalculationService,
- ITaxService taxService)
+ ITaxService taxService,
+ ILogger logger)
{
- this._orderService = orderService;
- this._priceCalculationService = priceCalculationService;
- this._taxService = taxService;
+ _orderService = orderService;
+ _priceCalculationService = priceCalculationService;
+ _taxService = taxService;
+ _logger = logger;
}
public override bool CheckRequirement(CheckDiscountRequirementRequest request)
@@ -88,14 +92,34 @@ private bool CheckTotalHistoryRequirement(CheckDiscountRequirementRequest reques
private bool CheckCurrentSubTotalRequirement(CheckDiscountRequirementRequest request)
{
- var cartItems = request.Customer.GetCartItems(ShoppingCartType.ShoppingCart, request.Store.Id);
+ var spentAmount = decimal.Zero;
- decimal spentAmount = decimal.Zero;
- decimal taxRate = decimal.Zero;
- foreach (var sci in cartItems)
+ try
{
- // includeDiscounts == true produces a stack overflow!
- spentAmount += sci.Item.Quantity * _taxService.GetProductPrice(sci.Item.Product, _priceCalculationService.GetUnitPrice(sci, false), out taxRate);
+ var taxRate = decimal.Zero;
+ var cartItems = request.Customer.GetCartItems(ShoppingCartType.ShoppingCart, request.Store.Id);
+
+ foreach (var cartItem in cartItems)
+ {
+ var product = cartItem.Item.Product;
+ Dictionary mergedValuesClone = null;
+
+ // we must reapply merged values because CheckCurrentSubTotalRequirement uses price calculation and is called by it itself.
+ // this can cause wrong discount calculation if the cart contains a product several times.
+ if (product.MergedDataValues != null)
+ mergedValuesClone = new Dictionary(product.MergedDataValues);
+
+ // includeDiscounts == true produces a stack overflow!
+ spentAmount += cartItem.Item.Quantity * _taxService.GetProductPrice(product, _priceCalculationService.GetUnitPrice(cartItem, false), out taxRate);
+
+ if (mergedValuesClone != null)
+ product.MergedDataValues = new Dictionary(mergedValuesClone);
+ }
+ }
+ catch (Exception exception)
+ {
+ _logger.Error(exception);
+ return false;
}
return spentAmount >= request.DiscountRequirement.SpentAmount;
diff --git a/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs b/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs
index abc3a709bd..5a99884991 100644
--- a/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs
@@ -138,10 +138,10 @@ private ActionResult LoginInternal(string returnUrl, bool verifyResponse)
if (result.Result != null)
return result.Result;
- return HttpContext.Request.IsAuthenticated ?
- new RedirectResult(!string.IsNullOrEmpty(returnUrl) ? returnUrl : "~/") :
+ return HttpContext.Request.IsAuthenticated ?
+ RedirectToReferrer(returnUrl, "~/") :
new RedirectResult(Url.LogOn(returnUrl));
- }
+ }
public ActionResult Login(string returnUrl)
{
diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs
new file mode 100644
index 0000000000..5f0960101b
--- /dev/null
+++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Web;
+using System.Web.Script.Serialization;
+using DotNetOpenAuth.AspNet;
+using DotNetOpenAuth.AspNet.Clients;
+using Newtonsoft.Json;
+
+namespace SmartStore.FacebookAuth.Core
+{
+ ///
+ ///
+ internal class FacebookOAuth2Client : OAuth2Client
+ {
+ ///
+ /// The authorization endpoint.
+ ///
+ private const string AuthorizationEndpoint = "https://www.facebook.com/v2.8/dialog/oauth";
+ ///
+ /// The token endpoint.
+ ///
+ private const string TokenEndpoint = "https://graph.facebook.com/v2.8/oauth/access_token";
+ ///
+ /// The user info endpoint.
+ ///
+ private const string UserInfoEndpoint = "https://graph.facebook.com/v2.8/me";
+ ///
+ /// The app id.
+ ///
+ private readonly string _appId;
+ ///
+ /// The app secret.
+ ///
+ private readonly string _appSecret;
+
+ ///
+ /// The requested scopes.
+ ///
+ private readonly string[] _requestedScopes;
+
+
+ ///
+ /// Creates a new Facebook OAuth2 client, requesting the default "email" scope.
+ ///
+ /// The Facebook App Id
+ /// The Facebook App Secret
+ public FacebookOAuth2Client(string appId, string appSecret)
+ : this(appId, appSecret, new[] { "email" }) { }
+
+ ///
+ /// Creates a new Facebook OAuth2 client.
+ ///
+ /// The Facebook App Id
+ /// The Facebook App Secret
+ /// One or more requested scopes, passed without the base URI.
+ public FacebookOAuth2Client(string appId, string appSecret, params string[] requestedScopes)
+ : base("facebook")
+ {
+ if (string.IsNullOrWhiteSpace(appId))
+ throw new ArgumentNullException("appId");
+
+ if (string.IsNullOrWhiteSpace(appSecret))
+ throw new ArgumentNullException("appSecret");
+
+ if (requestedScopes == null)
+ throw new ArgumentNullException("requestedScopes");
+
+ if (requestedScopes.Length == 0)
+ throw new ArgumentException("One or more scopes must be requested.", "requestedScopes");
+
+ _appId = appId;
+ _appSecret = appSecret;
+ _requestedScopes = requestedScopes;
+ }
+
+ public override void RequestAuthentication(HttpContextBase context, Uri returnUrl)
+ {
+ string redirectUrl = this.GetServiceLoginUrl(returnUrl).AbsoluteUri;
+ context.Response.Redirect(redirectUrl, endResponse: true);
+ }
+
+ public new AuthenticationResult VerifyAuthentication(HttpContextBase context)
+ {
+ throw new NoNullAllowedException();
+ }
+
+ public override AuthenticationResult VerifyAuthentication(HttpContextBase context, Uri returnPageUrl)
+ {
+ string code = context.Request.QueryString["code"];
+ if (string.IsNullOrEmpty(code))
+ {
+ return AuthenticationResult.Failed;
+ }
+
+ string accessToken = this.QueryAccessToken(returnPageUrl, code);
+ if (accessToken == null)
+ {
+ return AuthenticationResult.Failed;
+ }
+
+ IDictionary userData = this.GetUserData(accessToken);
+ if (userData == null)
+ {
+ return AuthenticationResult.Failed;
+ }
+
+ string id = userData["id"];
+ string name;
+
+ // Some oAuth providers do not return value for the 'username' attribute.
+ // In that case, try the 'name' attribute. If it's still unavailable, fall back to 'id'
+ if (!userData.TryGetValue("username", out name) && !userData.TryGetValue("name", out name))
+ {
+ name = id;
+ }
+
+ // add the access token to the user data dictionary just in case page developers want to use it
+ userData["accesstoken"] = accessToken;
+
+ return new AuthenticationResult(
+ isSuccessful: true, provider: this.ProviderName, providerUserId: id, userName: name, extraData: userData);
+ }
+
+ protected override Uri GetServiceLoginUrl(Uri returnUrl)
+ {
+ var state = string.IsNullOrEmpty(returnUrl.Query) ? string.Empty : returnUrl.Query.Substring(1);
+
+ return BuildUri(AuthorizationEndpoint, new NameValueCollection
+ {
+ { "client_id", _appId },
+ { "scope", string.Join(" ", _requestedScopes) },
+ { "redirect_uri", returnUrl.GetLeftPart(UriPartial.Path) },
+ { "state", state },
+ });
+ }
+
+ protected override IDictionary GetUserData(string accessToken)
+ {
+ var uri = BuildUri(UserInfoEndpoint, new NameValueCollection { { "access_token", accessToken } });
+
+ var webRequest = (HttpWebRequest)WebRequest.Create(uri);
+
+ using (var webResponse = webRequest.GetResponse())
+ using (var stream = webResponse.GetResponseStream())
+ {
+ if (stream == null)
+ return null;
+
+ using (var textReader = new StreamReader(stream))
+ {
+ var json = textReader.ReadToEnd();
+ var extraData = JsonConvert.DeserializeObject>(json);
+ var data = extraData.ToDictionary(x => x.Key, x => x.Value.ToString());
+
+ data.Add("picture", string.Format("https://graph.facebook.com/{0}/picture", data["id"]));
+
+ return data;
+ }
+ }
+ }
+
+ public string QueryAccessTokenByCode(Uri returnUrl, string authorizationCode)
+ {
+ return this.QueryAccessToken(returnUrl, authorizationCode);
+ }
+
+ protected override string QueryAccessToken(Uri returnUrl, string authorizationCode)
+ {
+ var uri = BuildUri(TokenEndpoint, new NameValueCollection
+ {
+ { "code", authorizationCode },
+ { "client_id", _appId },
+ { "client_secret", _appSecret },
+ { "redirect_uri", returnUrl.GetLeftPart(UriPartial.Path) },
+ });
+
+ var webRequest = (HttpWebRequest)WebRequest.Create(uri);
+ string accessToken = null;
+ HttpWebResponse response = (HttpWebResponse)webRequest.GetResponse();
+
+ // handle response from FB
+ // this will not be a url with params like the first request to get the 'code'
+ Encoding rEncoding = Encoding.GetEncoding(response.CharacterSet);
+
+ using (StreamReader sr = new StreamReader(response.GetResponseStream(), rEncoding))
+ {
+ var serializer = new JavaScriptSerializer();
+ var jsonObject = serializer.DeserializeObject(sr.ReadToEnd());
+ var jConvert = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(jsonObject));
+
+ Dictionary desirializedJsonObject = JsonConvert.DeserializeObject>(jConvert.ToString());
+ accessToken = desirializedJsonObject["access_token"].ToString();
+ }
+ return accessToken;
+ }
+
+ private static Uri BuildUri(string baseUri, NameValueCollection queryParameters)
+ {
+ var keyValuePairs = queryParameters.AllKeys.Select(k => HttpUtility.UrlEncode(k) + "=" + HttpUtility.UrlEncode(queryParameters[k]));
+ var qs = String.Join("&", keyValuePairs);
+
+ var builder = new UriBuilder(baseUri) { Query = qs };
+ return builder.Uri;
+ }
+
+ ///
+ /// Facebook works best when return data be packed into a "state" parameter.
+ /// This should be called before verifying the request, so that the url is rewritten to support this.
+ ///
+ public static void RewriteRequest()
+ {
+ var ctx = HttpContext.Current;
+
+ var stateString = HttpUtility.UrlDecode(ctx.Request.QueryString["state"]);
+ if (stateString == null || !stateString.Contains("__provider__=facebook"))
+ return;
+
+ var q = HttpUtility.ParseQueryString(stateString);
+ q.Add(ctx.Request.QueryString);
+ q.Remove("state");
+
+ ctx.RewritePath(ctx.Request.Path + "?" + q);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
index 5f89fe62cc..378599e6d5 100644
--- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
@@ -27,7 +27,7 @@ public class FacebookProviderAuthorizer : IOAuthProviderFacebookAuthorizer
private readonly HttpContextBase _httpContext;
private readonly ICommonServices _services;
- private FacebookClient _facebookApplication;
+ private FacebookOAuth2Client _facebookApplication;
#endregion
@@ -50,7 +50,7 @@ public FacebookProviderAuthorizer(IExternalAuthorizer authorizer,
#region Utilities
- private FacebookClient FacebookApplication
+ private FacebookOAuth2Client FacebookApplication
{
get
{
@@ -58,7 +58,7 @@ private FacebookClient FacebookApplication
{
var settings = _services.Settings.LoadSetting(_services.StoreContext.CurrentStore.Id);
- _facebookApplication = new FacebookClient(settings.ClientKeyIdentifier, settings.ClientSecret);
+ _facebookApplication = new FacebookOAuth2Client(settings.ClientKeyIdentifier, settings.ClientSecret);
}
return _facebookApplication;
@@ -93,9 +93,12 @@ private AuthorizeState VerifyAuthentication(string returnUrl)
}
var state = new AuthorizeState(returnUrl, OpenAuthenticationStatus.Error);
- var error = authResult.Error != null ? authResult.Error.Message : "Unknown error";
- state.AddError(error);
- return state;
+
+ state.AddError(authResult.Error != null
+ ? authResult.Error.Message
+ : _services.Localization.GetResource("Admin.Common.UnknownError"));
+
+ return state;
}
private string GetEmailFromFacebook(string accessToken)
diff --git a/src/Plugins/SmartStore.FacebookAuth/Description.txt b/src/Plugins/SmartStore.FacebookAuth/Description.txt
index 6e028c02d4..d60a7a363b 100644
--- a/src/Plugins/SmartStore.FacebookAuth/Description.txt
+++ b/src/Plugins/SmartStore.FacebookAuth/Description.txt
@@ -1,7 +1,7 @@
FriendlyName: Facebook
SystemName: SmartStore.FacebookAuth
Group: Security
-Version: 2.5.0
+Version: 2.6.0.1
MinAppVersion: 2.5.0
DisplayOrder: 5
FileName: SmartStore.FacebookAuth.dll
diff --git a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj
index 3709846816..85992eb451 100644
--- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj
+++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj
@@ -180,6 +180,7 @@
Properties\AssemblyVersionInfo.cs
+
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Description.txt b/src/Plugins/SmartStore.GoogleAnalytics/Description.txt
index 908e329118..59bf21b018 100644
--- a/src/Plugins/SmartStore.GoogleAnalytics/Description.txt
+++ b/src/Plugins/SmartStore.GoogleAnalytics/Description.txt
@@ -1,7 +1,7 @@
FriendlyName: Google Analytics
SystemName: SmartStore.GoogleAnalytics
Group: Analytics
-Version: 2.5.0
+Version: 2.6.0
MinAppVersion: 2.5.0
DisplayOrder: 1
FileName: SmartStore.GoogleAnalytics.dll
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/AdminMenu.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/AdminMenu.cs
index b6c3684093..2dbc226f57 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/AdminMenu.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/AdminMenu.cs
@@ -7,17 +7,13 @@ public class AdminMenu : AdminMenuProvider
{
protected override void BuildMenuCore(TreeNode