devextreme, devexpress, shipping controller, cutsom adminlayout, custom Scripts partial, custom OrderGrid, AI services, AI messages
This commit is contained in:
parent
aa87ed275a
commit
37ead9dbbe
|
|
@ -3324,7 +3324,7 @@ public partial class ImportManager : IImportManager
|
||||||
if (orderBillingAddress.Id == 0)
|
if (orderBillingAddress.Id == 0)
|
||||||
{
|
{
|
||||||
await _addressService.InsertAddressAsync(orderBillingAddress);
|
await _addressService.InsertAddressAsync(orderBillingAddress);
|
||||||
order.BillingAddressId = orderBillingAddress.Id;
|
order.BillingAddressId = orderBillingAddress.Id; //WTF :)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
await _addressService.UpdateAddressAsync(orderBillingAddress);
|
await _addressService.UpdateAddressAsync(orderBillingAddress);
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,13 @@
|
||||||
"WithNoLock": false
|
"WithNoLock": false
|
||||||
},
|
},
|
||||||
"AzureBlobConfig": {
|
"AzureBlobConfig": {
|
||||||
"ConnectionString": "",
|
"ConnectionString": null,
|
||||||
"ContainerName": "",
|
"ContainerName": null,
|
||||||
"EndPoint": "",
|
"EndPoint": null,
|
||||||
"AppendContainerName": true,
|
"AppendContainerName": true,
|
||||||
"StoreDataProtectionKeys": false,
|
"StoreDataProtectionKeys": false,
|
||||||
"DataProtectionKeysContainerName": "",
|
"DataProtectionKeysContainerName": null,
|
||||||
"DataProtectionKeysVaultId": ""
|
"DataProtectionKeysVaultId": null
|
||||||
},
|
},
|
||||||
"CacheConfig": {
|
"CacheConfig": {
|
||||||
"DefaultCacheTime": 60,
|
"DefaultCacheTime": 60,
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
"UseSessionStateTempDataProvider": false,
|
"UseSessionStateTempDataProvider": false,
|
||||||
"ScheduleTaskRunTimeout": null,
|
"ScheduleTaskRunTimeout": null,
|
||||||
"StaticFilesCacheControl": "public,max-age=31536000",
|
"StaticFilesCacheControl": "public,max-age=31536000",
|
||||||
"PluginStaticFileExtensionsBlacklist": "",
|
"PluginStaticFileExtensionsBlacklist": null,
|
||||||
"ServeUnknownFileTypes": false,
|
"ServeUnknownFileTypes": false,
|
||||||
"UseAutofac": true,
|
"UseAutofac": true,
|
||||||
"PermitLimit": 0,
|
"PermitLimit": 0,
|
||||||
|
|
@ -39,32 +39,32 @@
|
||||||
"ConnectionString": "127.0.0.1:6379,ssl=False",
|
"ConnectionString": "127.0.0.1:6379,ssl=False",
|
||||||
"SchemaName": "dbo",
|
"SchemaName": "dbo",
|
||||||
"TableName": "DistributedCache",
|
"TableName": "DistributedCache",
|
||||||
"InstanceName": "nopCommerce",
|
"InstanceName": "",
|
||||||
"PublishIntervalMs": 500
|
"PublishIntervalMs": 0
|
||||||
},
|
},
|
||||||
"HostingConfig": {
|
"HostingConfig": {
|
||||||
"UseProxy": false,
|
"UseProxy": false,
|
||||||
"ForwardedProtoHeaderName": "",
|
"ForwardedProtoHeaderName": null,
|
||||||
"ForwardedForHeaderName": "",
|
"ForwardedForHeaderName": null,
|
||||||
"KnownProxies": "",
|
"KnownProxies": null,
|
||||||
"KnownNetworks": ""
|
"KnownNetworks": null
|
||||||
},
|
},
|
||||||
"InstallationConfig": {
|
"InstallationConfig": {
|
||||||
"DisableSampleData": false,
|
"DisableSampleData": false,
|
||||||
"DisabledPlugins": "",
|
"DisabledPlugins": null,
|
||||||
"InstallRegionalResources": true
|
"InstallRegionalResources": true
|
||||||
},
|
},
|
||||||
"PluginConfig": {
|
"PluginConfig": {
|
||||||
"UseUnsafeLoadAssembly": true
|
"UseUnsafeLoadAssembly": true
|
||||||
},
|
},
|
||||||
"WebOptimizer": {
|
"WebOptimizer": {
|
||||||
"EnableJavaScriptBundling": true,
|
"EnableJavaScriptBundling": false,
|
||||||
"EnableCssBundling": true,
|
"EnableCssBundling": false,
|
||||||
"JavaScriptBundleSuffix": ".scripts",
|
"JavaScriptBundleSuffix": ".scripts",
|
||||||
"CssBundleSuffix": ".styles",
|
"CssBundleSuffix": ".styles",
|
||||||
"EnableCaching": true,
|
"EnableCaching": true,
|
||||||
"EnableMemoryCache": true,
|
"EnableMemoryCache": true,
|
||||||
"EnableDiskCache": true,
|
"EnableDiskCache": false,
|
||||||
"CacheDirectory": "\\Presentation\\Nop.Web\\wwwroot\\bundles",
|
"CacheDirectory": "\\Presentation\\Nop.Web\\wwwroot\\bundles",
|
||||||
"EnableTagHelperBundling": false,
|
"EnableTagHelperBundling": false,
|
||||||
"CdnUrl": "",
|
"CdnUrl": "",
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,10 @@
|
||||||
<None Include="appsettings.json">
|
<None Include="appsettings.json">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
<PackageReference Include="DevExpress.AspNetCore.Common" Version="25.1.3" />
|
||||||
|
<PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.3" />
|
||||||
|
<PackageReference Include="DevExtreme.AspNet.Data" Version="5.1.0" />
|
||||||
|
<PackageReference Include="PdfPig" Version="0.1.11" />
|
||||||
|
|
||||||
<None Update="Areas\Admin\sitemap.config">
|
<None Update="Areas\Admin\sitemap.config">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue