From a399b2845daa82ca22be862b27b614a13edde964 Mon Sep 17 00:00:00 2001 From: Raphael Hinterndorfer Date: Thu, 13 Sep 2018 22:01:59 +0200 Subject: [PATCH 1/5] Ignore private theme; --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 118d11be55..10e80692af 100644 --- a/.gitignore +++ b/.gitignore @@ -321,3 +321,4 @@ Kopie von* src/SmartStoreNET.Packager.sln Log.txt src/Presentation/SmartStore.Web/Themes/FlexMuseo/ +src/Presentation/SmartStore.Web/Themes/FlexArca/ From cad790c54a78f2780a36e3de77eadd10c160f84a Mon Sep 17 00:00:00 2001 From: Raphael Hinterndorfer Date: Fri, 21 Sep 2018 22:35:34 +0200 Subject: [PATCH 2/5] Use current store theme settings for e-mail styling --- .../Messages/MessageModelProvider.cs | 50 ++++--------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 53e703a922..ad818b0636 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -23,7 +23,6 @@ using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Domain.Stores; using SmartStore.Core.Domain.Tax; -using SmartStore.Core.Domain.Themes; using SmartStore.Core.Html; using SmartStore.Core.Localization; using SmartStore.Core.Logging; @@ -37,7 +36,6 @@ using SmartStore.Services.Media; using SmartStore.Services.Orders; using SmartStore.Services.Seo; -using SmartStore.Services.Themes; using SmartStore.Templating; using SmartStore.Utilities; @@ -63,7 +61,6 @@ public partial class MessageModelProvider : IMessageModelProvider private readonly ITemplateEngine _templateEngine; private readonly IMessageTemplateService _messageTemplateService; private readonly IEmailAccountService _emailAccountService; - private readonly IThemeVariablesService _themeVariableService; private readonly UrlHelper _urlHelper; public MessageModelProvider( @@ -71,14 +68,12 @@ public MessageModelProvider( ITemplateEngine templateEngine, IMessageTemplateService messageTemplateService, IEmailAccountService emailAccountService, - IThemeVariablesService themeVariableService, UrlHelper urlHelper) { _services = services; _templateEngine = templateEngine; _messageTemplateService = messageTemplateService; _emailAccountService = emailAccountService; - _themeVariableService = themeVariableService; _urlHelper = urlHelper; T = NullLocalizer.InstanceEx; @@ -376,45 +371,22 @@ public string ResolveModelName(object model) protected virtual object CreateThemeModelPart(MessageContext messageContext) { - var themeSettings = _services.Settings.LoadSetting(messageContext.StoreId ?? 0); - var themeVars = _themeVariableService.GetThemeVariables(themeSettings.DefaultTheme, messageContext.StoreId ?? 0) as IDictionary; - var m = new Dictionary { - { "FontFamily", themeVars["font-family-sans-serif"] }, - { "BodyBg", themeVars["site-bg"] }, - { "BodyColor", themeVars["body-color"] }, - { "TitleColor", themeVars["headings-color"] }, - { "ContentBg", themeVars["body-bg"] }, + { "FontFamily", "-apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif" }, + { "BodyBg", "#f2f4f6" }, + { "BodyColor", "#555" }, + { "TitleColor", "#2f3133" }, + { "ContentBg", "#fff" }, { "ShadeColor", "#e2e2e2" }, - { "LinkColor", themeVars["link-color"] }, - { "BrandPrimary", themeVars["primary"] }, - { "BrandSuccess", themeVars["success"] }, - { "BrandWarning", themeVars["warning"] }, - { "BrandDanger", themeVars["danger"] }, - { "MutedColor", themeVars["text-muted"] }, + { "LinkColor", "#0066c0" }, + { "BrandPrimary", "#3f51b5" }, + { "BrandSuccess", "#4caf50" }, + { "BrandWarning", "#ff9800" }, + { "BrandDanger", "#f44336" }, + { "MutedColor", "#a5a5a5" }, }; - - // replace Sass variables - bool found; - do - { - found = false; - foreach (var entry in m) - { - if (themeVars.ContainsKey(entry.Value?.ToString().TrimStart('$'))) - { - m[entry.Key] = themeVars[entry.Value?.ToString().TrimStart('$')]; - found = true; - break; - } - } - } while (found); - - - - return m; } From ee7112c8b26580d7822560d5ebd7fde22b69a450 Mon Sep 17 00:00:00 2001 From: Raphael Hinterndorfer Date: Sat, 13 Oct 2018 17:12:53 +0200 Subject: [PATCH 3/5] Fix select element on touch enabled devices --- .../Scripts/smartstore.selectwrapper.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js index 9d69cbc932..11cad6d62b 100644 --- a/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js +++ b/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js @@ -141,12 +141,12 @@ return; } - if (Modernizr.touchevents && !sel.hasClass("skin")) { - if (sel.find('option[data-color], option[data-imageurl]').length === 0) { - // skip skinning if device is mobile and no rich content exists (color & image) - return; - } - } + //if (Modernizr.touchevents && !sel.hasClass("skin")) { + // if (sel.find('option[data-color], option[data-imageurl]').length === 0) { + // // skip skinning if device is mobile and no rich content exists (color & image) + // return; + // } + //} var placeholder = getPlaceholder(); From 6856035ea58ab7e41209ec84f5394ed1062931b6 Mon Sep 17 00:00:00 2001 From: Raphael Hinterndorfer Date: Fri, 23 Nov 2018 14:38:34 +0100 Subject: [PATCH 4/5] Add db reset script --- scripts/SQL/ResetMovementData.sql | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 scripts/SQL/ResetMovementData.sql diff --git a/scripts/SQL/ResetMovementData.sql b/scripts/SQL/ResetMovementData.sql new file mode 100644 index 0000000000..dff6b68079 --- /dev/null +++ b/scripts/SQL/ResetMovementData.sql @@ -0,0 +1,28 @@ +truncate table [Log] + +truncate table [QueuedEmailAttachment] +delete from [QueuedEmail] + +truncate table [ShoppingCartItem] + +truncate table [ShipmentItem] +delete from [Shipment] + +truncate table [OrderNote] +delete from [OrderItem] +delete from [Order] + + +delete from [GenericAttribute] where KeyGroup like 'Order' +delete from [GenericAttribute] where KeyGroup like 'Customer' and EntityId >= 10 + +delete from [CustomerAddresses] + +delete from [Customer_CustomerRole_Mapping] where Customer_Id >= 11 +delete from [Customer] where ID >= 11 + +update [Customer] set ShippingAddress_Id = null, BillingAddress_Id = null + +delete from [Address] + + From a5e1876772ed5d824c94f968e62bc6417dc8b4ff Mon Sep 17 00:00:00 2001 From: Raphael Hinterndorfer Date: Fri, 23 Nov 2018 17:08:05 +0100 Subject: [PATCH 5/5] Revert "Add db reset script" This reverts commit 6856035ea58ab7e41209ec84f5394ed1062931b6. --- scripts/SQL/ResetMovementData.sql | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 scripts/SQL/ResetMovementData.sql diff --git a/scripts/SQL/ResetMovementData.sql b/scripts/SQL/ResetMovementData.sql deleted file mode 100644 index dff6b68079..0000000000 --- a/scripts/SQL/ResetMovementData.sql +++ /dev/null @@ -1,28 +0,0 @@ -truncate table [Log] - -truncate table [QueuedEmailAttachment] -delete from [QueuedEmail] - -truncate table [ShoppingCartItem] - -truncate table [ShipmentItem] -delete from [Shipment] - -truncate table [OrderNote] -delete from [OrderItem] -delete from [Order] - - -delete from [GenericAttribute] where KeyGroup like 'Order' -delete from [GenericAttribute] where KeyGroup like 'Customer' and EntityId >= 10 - -delete from [CustomerAddresses] - -delete from [Customer_CustomerRole_Mapping] where Customer_Id >= 11 -delete from [Customer] where ID >= 11 - -update [Customer] set ShippingAddress_Id = null, BillingAddress_Id = null - -delete from [Address] - -