From 37ead9dbbec649ed8bce633f9c10cc0359f47f2a Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 30 Sep 2025 17:15:49 +0200 Subject: [PATCH] devextreme, devexpress, shipping controller, cutsom adminlayout, custom Scripts partial, custom OrderGrid, AI services, AI messages --- .../ExportImport/ImportManager.cs | 4 +-- .../Nop.Web/App_Data/appsettings.json | 32 +++++++++---------- Presentation/Nop.Web/Nop.Web.csproj | 4 +++ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Libraries/Nop.Services/ExportImport/ImportManager.cs b/Libraries/Nop.Services/ExportImport/ImportManager.cs index ba2a513..7d28aca 100644 --- a/Libraries/Nop.Services/ExportImport/ImportManager.cs +++ b/Libraries/Nop.Services/ExportImport/ImportManager.cs @@ -3323,8 +3323,8 @@ public partial class ImportManager : IImportManager //insert or update billing address if (orderBillingAddress.Id == 0) { - await _addressService.InsertAddressAsync(orderBillingAddress); - order.BillingAddressId = orderBillingAddress.Id; + await _addressService.InsertAddressAsync(orderBillingAddress); + order.BillingAddressId = orderBillingAddress.Id; //WTF :) } else await _addressService.UpdateAddressAsync(orderBillingAddress); diff --git a/Presentation/Nop.Web/App_Data/appsettings.json b/Presentation/Nop.Web/App_Data/appsettings.json index 0fd3ffa..5908f33 100644 --- a/Presentation/Nop.Web/App_Data/appsettings.json +++ b/Presentation/Nop.Web/App_Data/appsettings.json @@ -6,13 +6,13 @@ "WithNoLock": false }, "AzureBlobConfig": { - "ConnectionString": "", - "ContainerName": "", - "EndPoint": "", + "ConnectionString": null, + "ContainerName": null, + "EndPoint": null, "AppendContainerName": true, "StoreDataProtectionKeys": false, - "DataProtectionKeysContainerName": "", - "DataProtectionKeysVaultId": "" + "DataProtectionKeysContainerName": null, + "DataProtectionKeysVaultId": null }, "CacheConfig": { "DefaultCacheTime": 60, @@ -26,7 +26,7 @@ "UseSessionStateTempDataProvider": false, "ScheduleTaskRunTimeout": null, "StaticFilesCacheControl": "public,max-age=31536000", - "PluginStaticFileExtensionsBlacklist": "", + "PluginStaticFileExtensionsBlacklist": null, "ServeUnknownFileTypes": false, "UseAutofac": true, "PermitLimit": 0, @@ -39,32 +39,32 @@ "ConnectionString": "127.0.0.1:6379,ssl=False", "SchemaName": "dbo", "TableName": "DistributedCache", - "InstanceName": "nopCommerce", - "PublishIntervalMs": 500 + "InstanceName": "", + "PublishIntervalMs": 0 }, "HostingConfig": { "UseProxy": false, - "ForwardedProtoHeaderName": "", - "ForwardedForHeaderName": "", - "KnownProxies": "", - "KnownNetworks": "" + "ForwardedProtoHeaderName": null, + "ForwardedForHeaderName": null, + "KnownProxies": null, + "KnownNetworks": null }, "InstallationConfig": { "DisableSampleData": false, - "DisabledPlugins": "", + "DisabledPlugins": null, "InstallRegionalResources": true }, "PluginConfig": { "UseUnsafeLoadAssembly": true }, "WebOptimizer": { - "EnableJavaScriptBundling": true, - "EnableCssBundling": true, + "EnableJavaScriptBundling": false, + "EnableCssBundling": false, "JavaScriptBundleSuffix": ".scripts", "CssBundleSuffix": ".styles", "EnableCaching": true, "EnableMemoryCache": true, - "EnableDiskCache": true, + "EnableDiskCache": false, "CacheDirectory": "\\Presentation\\Nop.Web\\wwwroot\\bundles", "EnableTagHelperBundling": false, "CdnUrl": "", diff --git a/Presentation/Nop.Web/Nop.Web.csproj b/Presentation/Nop.Web/Nop.Web.csproj index ed189a9..c0e2662 100644 --- a/Presentation/Nop.Web/Nop.Web.csproj +++ b/Presentation/Nop.Web/Nop.Web.csproj @@ -50,6 +50,10 @@ Always + + + + PreserveNewest