diff --git a/src/Libraries/Nop.Core/Nop.Core.csproj b/src/Libraries/Nop.Core/Nop.Core.csproj index 61ea13b3f71..2f15217341f 100644 --- a/src/Libraries/Nop.Core/Nop.Core.csproj +++ b/src/Libraries/Nop.Core/Nop.Core.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 The Nop.Core project contains a set of core classes for nopCommerce, such as caching, events, helpers, and business objects (for example, Order and Customer entities). https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Libraries/Nop.Core/NopVersion.cs b/src/Libraries/Nop.Core/NopVersion.cs index 25342679d1c..d31f1ac18cf 100644 --- a/src/Libraries/Nop.Core/NopVersion.cs +++ b/src/Libraries/Nop.Core/NopVersion.cs @@ -1,13 +1,13 @@ namespace Nop.Core { /// - /// nopCommere version + /// Represents nopCommerce version /// public static class NopVersion { /// /// Gets or sets the store version /// - public static string CurrentVersion { get; } = "4.30"; + public static string CurrentVersion => "4.40"; } -} +} \ No newline at end of file diff --git a/src/Libraries/Nop.Data/Nop.Data.csproj b/src/Libraries/Nop.Data/Nop.Data.csproj index df6c563d3b0..b0ff3127c4d 100644 --- a/src/Libraries/Nop.Data/Nop.Data.csproj +++ b/src/Libraries/Nop.Data/Nop.Data.csproj @@ -5,8 +5,8 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 - The Nop.Data project contains a set of classes and functions for reading from and writing to a database or other data store. It helps separate data-access logic from your business objects. nopCommerce uses the Entity Framework (EF) Code-First approach. It allows you to define entities in the source code (all core entities are defined into Nop.Core project), and then get EF to generate the database from that. That's why it's called Code-First. You can then query your objects using LINQ, which gets translated to SQL behind the scenes and executed against the database. nopCommerces use a fluent code API to fully customize the persistence mapping. + 4.4.0.0 + The Nop.Data project contains a set of classes and functions for reading from and writing to a database or other data store. It helps separate data-access logic from your business objects. https://www.nopcommerce.com/license https://www.nopcommerce.com/ https://github.com/nopSolutions/nopCommerce diff --git a/src/Libraries/Nop.Services/Nop.Services.csproj b/src/Libraries/Nop.Services/Nop.Services.csproj index f1f99fc6a94..d7db8842c60 100644 --- a/src/Libraries/Nop.Services/Nop.Services.csproj +++ b/src/Libraries/Nop.Services/Nop.Services.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 This project contains a set of core services, business logic, validations or calculations related with the data, if needed. Some people call it Business Access Layer (BAL). https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Libraries/Nop.Services/Plugins/Samples/uploadedItems.json b/src/Libraries/Nop.Services/Plugins/Samples/uploadedItems.json index ee7c063c8e0..e86a0b86d72 100644 --- a/src/Libraries/Nop.Services/Plugins/Samples/uploadedItems.json +++ b/src/Libraries/Nop.Services/Plugins/Samples/uploadedItems.json @@ -16,27 +16,27 @@ "SourceDirectoryPath": "DiscountRules.CustomerRoles/nopCommerce 3.90/Nop.Plugin.DiscountRules.CustomerRoles/" }, - //"Must be assigned to customer role" discount rule for version 4.30 + //"Must be assigned to customer role" discount rule for version 4.40 { "Type": "Plugin", - "SupportedVersion": "4.30", - "DirectoryPath": "DiscountRules.CustomerRoles/nopCommerce 4.30/DiscountRules.CustomerRoles/", + "SupportedVersion": "4.40", + "DirectoryPath": "DiscountRules.CustomerRoles/nopCommerce 4.40/DiscountRules.CustomerRoles/", "SystemName": "DiscountRequirement.MustBeAssignedToCustomerRole", - "SourceDirectoryPath": "DiscountRules.CustomerRoles/nopCommerce 4.30/Nop.Plugin.DiscountRules.CustomerRoles/" + "SourceDirectoryPath": "DiscountRules.CustomerRoles/nopCommerce 4.40/Nop.Plugin.DiscountRules.CustomerRoles/" }, - //"Has one product" discount rule for version 4.30 + //"Has one product" discount rule for version 4.40 { "Type": "Plugin", - "SupportedVersion": "4.30", + "SupportedVersion": "4.40", "DirectoryPath": "DiscountRules.HasOneProduct/", "SystemName": "DiscountRequirement.HasOneProduct" }, - //"Default clean" theme for version 4.30 + //"Default clean" theme for version 4.40 { "Type": "Theme", - "SupportedVersion": "4.30", + "SupportedVersion": "4.40", "DirectoryPath": "DefaultClean/" } ] \ No newline at end of file diff --git a/src/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/plugin.json b/src/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/plugin.json index 4c1b265486e..eb8b37c050d 100644 --- a/src/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/plugin.json +++ b/src/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Must be assigned to customer role", "SystemName": "DiscountRequirement.MustBeAssignedToCustomerRole", "Version": "1.34", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.DiscountRules.CustomerRoles.dll", diff --git a/src/Plugins/Nop.Plugin.ExchangeRate.EcbExchange/plugin.json b/src/Plugins/Nop.Plugin.ExchangeRate.EcbExchange/plugin.json index ab8c582478b..c876676c54d 100644 --- a/src/Plugins/Nop.Plugin.ExchangeRate.EcbExchange/plugin.json +++ b/src/Plugins/Nop.Plugin.ExchangeRate.EcbExchange/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "ECB exchange rate provider", "SystemName": "CurrencyExchange.ECB", "Version": "1.26", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.ExchangeRate.EcbExchange.dll", diff --git a/src/Plugins/Nop.Plugin.ExternalAuth.Facebook/plugin.json b/src/Plugins/Nop.Plugin.ExternalAuth.Facebook/plugin.json index af0a6c9efc2..f441c6be057 100644 --- a/src/Plugins/Nop.Plugin.ExternalAuth.Facebook/plugin.json +++ b/src/Plugins/Nop.Plugin.ExternalAuth.Facebook/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Facebook authentication", "SystemName": "ExternalAuth.Facebook", "Version": "1.63", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 5, "FileName": "Nop.Plugin.ExternalAuth.Facebook.dll", diff --git a/src/Plugins/Nop.Plugin.Misc.SendinBlue/plugin.json b/src/Plugins/Nop.Plugin.Misc.SendinBlue/plugin.json index 51a5cfd485a..3e70da12ce0 100644 --- a/src/Plugins/Nop.Plugin.Misc.SendinBlue/plugin.json +++ b/src/Plugins/Nop.Plugin.Misc.SendinBlue/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "SendinBlue", "SystemName": "Misc.SendinBlue", "Version": "3.26", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Misc.SendinBlue.dll", diff --git a/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/plugin.json b/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/plugin.json index cf076ae5d34..f7eefd33712 100644 --- a/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/plugin.json +++ b/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Check / Money Order", "SystemName": "Payments.CheckMoneyOrder", "Version": "1.44", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Payments.CheckMoneyOrder.dll", diff --git a/src/Plugins/Nop.Plugin.Payments.Manual/plugin.json b/src/Plugins/Nop.Plugin.Payments.Manual/plugin.json index 8df8458b821..1e5c5fe7141 100644 --- a/src/Plugins/Nop.Plugin.Payments.Manual/plugin.json +++ b/src/Plugins/Nop.Plugin.Payments.Manual/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Credit Card", "SystemName": "Payments.Manual", "Version": "1.53", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Payments.Manual.dll", diff --git a/src/Plugins/Nop.Plugin.Payments.PayPalSmartPaymentButtons/plugin.json b/src/Plugins/Nop.Plugin.Payments.PayPalSmartPaymentButtons/plugin.json index 28be8b9366a..cc4ba1f00b8 100644 --- a/src/Plugins/Nop.Plugin.Payments.PayPalSmartPaymentButtons/plugin.json +++ b/src/Plugins/Nop.Plugin.Payments.PayPalSmartPaymentButtons/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "PayPal Smart Payment Buttons", "SystemName": "Payments.PayPalSmartPaymentButtons", "Version": "1.13", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Payments.PayPalSmartPaymentButtons.dll", diff --git a/src/Plugins/Nop.Plugin.Payments.PayPalStandard/plugin.json b/src/Plugins/Nop.Plugin.Payments.PayPalStandard/plugin.json index 688d70303ee..54f37127b00 100644 --- a/src/Plugins/Nop.Plugin.Payments.PayPalStandard/plugin.json +++ b/src/Plugins/Nop.Plugin.Payments.PayPalStandard/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "PayPal Standard", "SystemName": "Payments.PayPalStandard", "Version": "1.60", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Payments.PayPalStandard.dll", diff --git a/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json b/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json index 86b8812fd53..62c0d17a8da 100644 --- a/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json +++ b/src/Plugins/Nop.Plugin.Pickup.PickupInStore/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Pickup in store", "SystemName": "Pickup.PickupInStore", "Version": "1.34", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Pickup.PickupInStore.dll", diff --git a/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json b/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json index d74ec5a99cb..bafeedcb71f 100644 --- a/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json +++ b/src/Plugins/Nop.Plugin.Shipping.FixedByWeightByTotal/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Manual (Fixed or By Weight and By Total)", "SystemName": "Shipping.FixedByWeightByTotal", "Version": "2.23", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Shipping.FixedByWeightByTotal.dll", diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json b/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json index 8f50be33e78..01ba56a935d 100644 --- a/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json +++ b/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "ShipStation", "SystemName": "Shipping.ShipStation", "Version": "1.06", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Shipping.ShipStation.dll", diff --git a/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json b/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json index 111b0b702ed..b8e6e2f40d1 100644 --- a/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json +++ b/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "UPS (United Parcel Service)", "SystemName": "Shipping.UPS", "Version": "1.60", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Shipping.UPS.dll", diff --git a/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json b/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json index ecd718a5b81..eb19cf3e462 100644 --- a/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json +++ b/src/Plugins/Nop.Plugin.Tax.Avalara/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Avalara tax provider", "SystemName": "Tax.Avalara", "Version": "2.35", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Tax.Avalara.dll", diff --git a/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json b/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json index ddc01b0f5bf..64c36232869 100644 --- a/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json +++ b/src/Plugins/Nop.Plugin.Tax.FixedOrByCountryStateZip/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Manual (Fixed or By Country/State/Zip)", "SystemName": "Tax.FixedOrByCountryStateZip", "Version": "1.33", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Tax.FixedOrByCountryStateZip.dll", diff --git a/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json b/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json index 32500b65d74..07586204824 100644 --- a/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json +++ b/src/Plugins/Nop.Plugin.Widgets.FacebookPixel/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Facebook Pixel", "SystemName": "Widgets.FacebookPixel", "Version": "1.02", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Widgets.FacebookPixel.dll", diff --git a/src/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/plugin.json b/src/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/plugin.json index 7659c08d804..16a35ba76c5 100644 --- a/src/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/plugin.json +++ b/src/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Google Analytics", "SystemName": "Widgets.GoogleAnalytics", "Version": "1.62", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team, Nicolas Muniere", "DisplayOrder": 1, "FileName": "Nop.Plugin.Widgets.GoogleAnalytics.dll", diff --git a/src/Plugins/Nop.Plugin.Widgets.NivoSlider/plugin.json b/src/Plugins/Nop.Plugin.Widgets.NivoSlider/plugin.json index 092a85bcc0f..ffcde82ba19 100644 --- a/src/Plugins/Nop.Plugin.Widgets.NivoSlider/plugin.json +++ b/src/Plugins/Nop.Plugin.Widgets.NivoSlider/plugin.json @@ -3,7 +3,7 @@ "FriendlyName": "Nivo Slider", "SystemName": "Widgets.NivoSlider", "Version": "1.38", - "SupportedVersions": [ "4.30" ], + "SupportedVersions": [ "4.40" ], "Author": "nopCommerce team", "DisplayOrder": 1, "FileName": "Nop.Plugin.Widgets.NivoSlider.dll", diff --git a/src/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj b/src/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj index a31f00d4169..8ada20b7c79 100644 --- a/src/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj +++ b/src/Presentation/Nop.Web.Framework/Nop.Web.Framework.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 Nop.Web.Framework is a class library project containing some common presentation things for Nop.Web project https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Presentation/Nop.Web/Nop.Web.csproj b/src/Presentation/Nop.Web/Nop.Web.csproj index 80f216c1124..659231367dc 100644 --- a/src/Presentation/Nop.Web/Nop.Web.csproj +++ b/src/Presentation/Nop.Web/Nop.Web.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 Nop.Web is also an MVC web application project, a presentation layer for public store and admin area. https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-144x144.png b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-144x144.png new file mode 100644 index 00000000000..7a92846eff7 Binary files /dev/null and b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-144x144.png differ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-36x36.png b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-36x36.png new file mode 100644 index 00000000000..a1d9dae3bbe Binary files /dev/null and b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-36x36.png differ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-48x48.png b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-48x48.png new file mode 100644 index 00000000000..6d9fa760865 Binary files /dev/null and b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-48x48.png differ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-72x72.png b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-72x72.png new file mode 100644 index 00000000000..3e5fc3f9415 Binary files /dev/null and b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-72x72.png differ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-96x96.png b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-96x96.png new file mode 100644 index 00000000000..9b1839ce90a Binary files /dev/null and b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/android-chrome-96x96.png differ diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/browserconfig.xml b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/browserconfig.xml index 37464f98ede..1425f4f964b 100644 --- a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/browserconfig.xml +++ b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/browserconfig.xml @@ -2,10 +2,10 @@ - - - - + + + + #2b5797 diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/html_code.html b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/html_code.html index 027c002e7af..484ae5b9b2a 100644 --- a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/html_code.html +++ b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/html_code.html @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + - - + + \ No newline at end of file diff --git a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/site.webmanifest b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/site.webmanifest index c4ebff63e2f..706891a40e8 100644 --- a/src/Presentation/Nop.Web/wwwroot/icons/icons_0/site.webmanifest +++ b/src/Presentation/Nop.Web/wwwroot/icons/icons_0/site.webmanifest @@ -3,37 +3,37 @@ "short_name": "", "icons": [ { - "src": "/icons/icons_0/android-chrome-36x36.png?v=4.30", + "src": "/icons/icons_0/android-chrome-36x36.png?v=4.40", "sizes": "36x36", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-48x48.png?v=4.30", + "src": "/icons/icons_0/android-chrome-48x48.png?v=4.40", "sizes": "48x48", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-72x72.png?v=4.30", + "src": "/icons/icons_0/android-chrome-72x72.png?v=4.40", "sizes": "72x72", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-96x96.png?v=4.30", + "src": "/icons/icons_0/android-chrome-96x96.png?v=4.40", "sizes": "96x96", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-144x144.png?v=4.30", + "src": "/icons/icons_0/android-chrome-144x144.png?v=4.40", "sizes": "144x144", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-192x192.png?v=4.30", + "src": "/icons/icons_0/android-chrome-192x192.png?v=4.40", "sizes": "192x192", "type": "image/png" }, { - "src": "/icons/icons_0/android-chrome-256x256.png?v=4.30", + "src": "/icons/icons_0/android-chrome-256x256.png?v=4.40", "sizes": "256x256", "type": "image/png" } diff --git a/src/Presentation/Nop.Web/wwwroot/icons/samples/favicon_package.zip b/src/Presentation/Nop.Web/wwwroot/icons/samples/favicon_package.zip index 610c1934b54..bf02217cf9b 100644 Binary files a/src/Presentation/Nop.Web/wwwroot/icons/samples/favicon_package.zip and b/src/Presentation/Nop.Web/wwwroot/icons/samples/favicon_package.zip differ diff --git a/src/Tests/Nop.Core.Tests/Nop.Core.Tests.csproj b/src/Tests/Nop.Core.Tests/Nop.Core.Tests.csproj index ff2f1b0f541..a915b4a6748 100644 --- a/src/Tests/Nop.Core.Tests/Nop.Core.Tests.csproj +++ b/src/Tests/Nop.Core.Tests/Nop.Core.Tests.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 The project contains a set of classes for testing of Nop.Core https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Tests/Nop.Services.Tests/Nop.Services.Tests.csproj b/src/Tests/Nop.Services.Tests/Nop.Services.Tests.csproj index ad70ec02e26..939736244a5 100644 --- a/src/Tests/Nop.Services.Tests/Nop.Services.Tests.csproj +++ b/src/Tests/Nop.Services.Tests/Nop.Services.Tests.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 The project contains a set of classes for testing of Nop.Services https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Tests/Nop.Tests/Nop.Tests.csproj b/src/Tests/Nop.Tests/Nop.Tests.csproj index a50133d3491..6efc47ee912 100644 --- a/src/Tests/Nop.Tests/Nop.Tests.csproj +++ b/src/Tests/Nop.Tests/Nop.Tests.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 The project contains a set of core classes for testing https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/src/Tests/Nop.Web.MVC.Tests/Nop.Web.MVC.Tests.csproj b/src/Tests/Nop.Web.MVC.Tests/Nop.Web.MVC.Tests.csproj index 8c7419549d3..3cf65feeb00 100644 --- a/src/Tests/Nop.Web.MVC.Tests/Nop.Web.MVC.Tests.csproj +++ b/src/Tests/Nop.Web.MVC.Tests/Nop.Web.MVC.Tests.csproj @@ -5,7 +5,7 @@ Copyright © Nop Solutions, Ltd Nop Solutions, Ltd Nop Solutions, Ltd - 4.3.0.0 + 4.4.0.0 The project contains a set of classes for testing of web projects https://www.nopcommerce.com/license https://www.nopcommerce.com/ diff --git a/upgradescripts/4.20-4.30 (under development)/Readme.txt b/upgradescripts/4.20-4.30/Readme.txt similarity index 100% rename from upgradescripts/4.20-4.30 (under development)/Readme.txt rename to upgradescripts/4.20-4.30/Readme.txt diff --git a/upgradescripts/4.20-4.30 (under development)/upgrade.sql b/upgradescripts/4.20-4.30/upgrade.sql similarity index 100% rename from upgradescripts/4.20-4.30 (under development)/upgrade.sql rename to upgradescripts/4.20-4.30/upgrade.sql diff --git a/upgradescripts/4.30-4.40 (under development)/Readme.txt b/upgradescripts/4.30-4.40 (under development)/Readme.txt new file mode 100644 index 00000000000..f8d77dec530 --- /dev/null +++ b/upgradescripts/4.30-4.40 (under development)/Readme.txt @@ -0,0 +1,10 @@ +Steps: +1. Make a backup of everything on your site, including the database. This is extremely important so that you can roll back to a running site no matter what happens during migration. +2. Execute upgrade.sql script over your database +3. Remove all files from the previous version except \App_Data\dataSettings.json (Settings.txt) and \App_Data\plugins.json. Also \App_Data\installedPlugins.json or \App_Data\InstalledPlugins.txt (if exists) +4. Upload new site files +5. Copy back \App_Data\dataSettings.json and \App_Data\plugins.json files. And \App_Data\installedPlugins.json (if exists) +6. Ensure that everything is OK + +Notes: +1. If you stored your pictures on the file system, then also backup them (\wwwroot\Images\) and copy back after upgrade \ No newline at end of file diff --git a/upgradescripts/4.30-4.40 (under development)/upgrade.sql b/upgradescripts/4.30-4.40 (under development)/upgrade.sql new file mode 100644 index 00000000000..15985d67ffa --- /dev/null +++ b/upgradescripts/4.30-4.40 (under development)/upgrade.sql @@ -0,0 +1,82 @@ +--upgrade scripts from nopCommerce 4.30 to 4.40 +--new locale resources +declare @resources xml +--a resource will be deleted if its value is empty +set @resources=' + + + + + +' + +CREATE TABLE #LocaleStringResourceTmp + ( + [ResourceName] [nvarchar](200) NOT NULL, + [ResourceValue] [nvarchar](max) NOT NULL + ) + +INSERT INTO #LocaleStringResourceTmp (ResourceName, ResourceValue) +SELECT nref.value('@Name', 'nvarchar(200)'), nref.value('Value[1]', 'nvarchar(MAX)') +FROM @resources.nodes('//Language/LocaleResource') AS R(nref) + +--do it for each existing language +DECLARE @ExistingLanguageID int +DECLARE cur_existinglanguage CURSOR FOR +SELECT [ID] +FROM [Language] +OPEN cur_existinglanguage +FETCH NEXT FROM cur_existinglanguage INTO @ExistingLanguageID +WHILE @@FETCH_STATUS = 0 +BEGIN + DECLARE @ResourceName nvarchar(200) + DECLARE @ResourceValue nvarchar(MAX) + DECLARE cur_localeresource CURSOR FOR + SELECT ResourceName, ResourceValue + FROM #LocaleStringResourceTmp + OPEN cur_localeresource + FETCH NEXT FROM cur_localeresource INTO @ResourceName, @ResourceValue + WHILE @@FETCH_STATUS = 0 + BEGIN + IF (EXISTS (SELECT 1 FROM [LocaleStringResource] WHERE LanguageID=@ExistingLanguageID AND ResourceName=@ResourceName)) + BEGIN + UPDATE [LocaleStringResource] + SET [ResourceValue]=@ResourceValue + WHERE LanguageID=@ExistingLanguageID AND ResourceName=@ResourceName + END + ELSE + BEGIN + INSERT INTO [LocaleStringResource] + ( + [LanguageId], + [ResourceName], + [ResourceValue] + ) + VALUES + ( + @ExistingLanguageID, + @ResourceName, + @ResourceValue + ) + END + + IF (@ResourceValue is null or @ResourceValue = '') + BEGIN + DELETE [LocaleStringResource] + WHERE LanguageID=@ExistingLanguageID AND ResourceName=@ResourceName + END + + FETCH NEXT FROM cur_localeresource INTO @ResourceName, @ResourceValue + END + CLOSE cur_localeresource + DEALLOCATE cur_localeresource + + + --fetch next language identifier + FETCH NEXT FROM cur_existinglanguage INTO @ExistingLanguageID +END +CLOSE cur_existinglanguage +DEALLOCATE cur_existinglanguage + +DROP TABLE #LocaleStringResourceTmp +GO \ No newline at end of file