Merge branch '4.80' of https://git.aycode.com/Adam/Mango.Nop.Plugins into 4.80
This commit is contained in:
commit
93d39b4957
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
var welcomeMessage = await aiCalculationService.GetWelcomeMessageAsync(customer);
|
var welcomeMessage = await aiCalculationService.GetWelcomeMessageAsync(customer);
|
||||||
if (welcomeMessage.IsNullOrWhiteSpace())
|
if (welcomeMessage.IsNullOrWhiteSpace())
|
||||||
|
//if(string.IsNullOrWhiteSpace(welcomeMessage))
|
||||||
{
|
{
|
||||||
<p class="lead">Nincs kapcsolat az AI szerverrel...</p>
|
<p class="lead">Nincs kapcsolat az AI szerverrel...</p>
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Loggers;
|
using Mango.Nop.Core.Loggers;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ using FruitBank.Common.Interfaces;
|
||||||
using FruitBank.Common.Models;
|
using FruitBank.Common.Models;
|
||||||
using Mango.Nop.Core.Extensions;
|
using Mango.Nop.Core.Extensions;
|
||||||
using Mango.Nop.Core.Loggers;
|
using Mango.Nop.Core.Loggers;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core;
|
using Nop.Core;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Domain.Catalog;
|
using Nop.Core.Domain.Catalog;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Core.Domain.Orders;
|
using Nop.Core.Domain.Orders;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using FruitBank.Common.Interfaces;
|
using FruitBank.Common.Interfaces;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Interfaces;
|
using Mango.Nop.Data.Interfaces;
|
||||||
using Nop.Data;
|
using Nop.Data;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Interfaces;
|
using FruitBank.Common.Interfaces;
|
||||||
using Mango.Nop.Core.Entities;
|
using Mango.Nop.Core.Entities;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Domain.Orders;
|
using Nop.Core.Domain.Orders;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Domain.Orders;
|
using Nop.Core.Domain.Orders;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Domain.Catalog;
|
using Nop.Core.Domain.Catalog;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using Mango.Nop.Core.Loggers;
|
using Mango.Nop.Core.Loggers;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using FruitBank.Common.Interfaces;
|
using FruitBank.Common.Interfaces;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using Mango.Nop.Core.Repositories;
|
using Mango.Nop.Data.Repositories;
|
||||||
using Nop.Core.Caching;
|
using Nop.Core.Caching;
|
||||||
using Nop.Core.Configuration;
|
using Nop.Core.Configuration;
|
||||||
using Nop.Core.Events;
|
using Nop.Core.Events;
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,7 @@
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="AyCode.Utils">
|
<Reference Include="AyCode.Utils">
|
||||||
<HintPath>..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Utils.dll</HintPath>
|
<HintPath>..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Utils.dll</HintPath>
|
||||||
|
<Private></Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FruitBank.Common">
|
<Reference Include="FruitBank.Common">
|
||||||
<HintPath>..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.dll</HintPath>
|
<HintPath>..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,8 @@
|
||||||
<!--Set this parameter to true to get the dlls copied from the NuGet cache to the output of your project.
|
<!--Set this parameter to true to get the dlls copied from the NuGet cache to the output of your project.
|
||||||
You need to set this parameter to true if your plugin has a nuget package
|
You need to set this parameter to true if your plugin has a nuget package
|
||||||
to ensure that the dlls copied from the NuGet cache to the output of your project-->
|
to ensure that the dlls copied from the NuGet cache to the output of your project-->
|
||||||
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
|
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,8 @@
|
||||||
<!--Set this parameter to true to get the dlls copied from the NuGet cache to the output of your project.
|
<!--Set this parameter to true to get the dlls copied from the NuGet cache to the output of your project.
|
||||||
You need to set this parameter to true if your plugin has a nuget package
|
You need to set this parameter to true if your plugin has a nuget package
|
||||||
to ensure that the dlls copied from the NuGet cache to the output of your project-->
|
to ensure that the dlls copied from the NuGet cache to the output of your project-->
|
||||||
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
|
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue