From 89eaca8d4adbbc9adb5fa3989fc860d0959acc95 Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 4 Nov 2025 15:57:09 +0100 Subject: [PATCH 1/2] Add Mango.Nop.Data project to solution --- Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FilesDbTable.cs | 2 +- .../Domains/DataLayer/FruitBankDbContext.cs | 2 +- .../Domains/DataLayer/Interfaces/IFilesDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IOrderDtoDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IOrderItemDtoDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IOrderItemPalletDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IPartnerDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IShippingDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IShippingDocumentDbSet.cs | 2 +- .../DataLayer/Interfaces/IShippingDocumentToFilesDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IShippingItemDbSet.cs | 2 +- .../Domains/DataLayer/Interfaces/IShippingItemPalletDbSet.cs | 2 +- .../Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs | 2 +- Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs | 2 +- .../Domains/DataLayer/OrderItemDtoDbTable.cs | 2 +- Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/PartnerDbTable.cs | 2 +- Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ProductDtoDbTable.cs | 2 +- Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs | 2 +- .../Domains/DataLayer/ShippingDocumentDbTable.cs | 2 +- .../Domains/DataLayer/ShippingDocumentToFilesDbTable.cs | 2 +- .../Domains/DataLayer/ShippingItemDbTable.cs | 2 +- .../Domains/DataLayer/ShippingItemPalletDbTable.cs | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FilesDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FilesDbTable.cs index c840cf7..34c1596 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FilesDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FilesDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using Mango.Nop.Core.Loggers; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs index 1d2311b..e7469b9 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs @@ -8,7 +8,7 @@ using FruitBank.Common.Interfaces; using FruitBank.Common.Models; using Mango.Nop.Core.Extensions; using Mango.Nop.Core.Loggers; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core; using Nop.Core.Caching; using Nop.Core.Domain.Catalog; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IFilesDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IFilesDbSet.cs index 7d08c28..9fd1081 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IFilesDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IFilesDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderDtoDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderDtoDbSet.cs index d935195..014a075 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderDtoDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderDtoDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Dtos; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Core.Domain.Orders; using Nop.Data; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemDtoDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemDtoDbSet.cs index 1f645c0..0e03779 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemDtoDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemDtoDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Dtos; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemPalletDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemPalletDbSet.cs index da94aa6..5bfc4df 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemPalletDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IOrderItemPalletDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IPartnerDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IPartnerDbSet.cs index f128def..5bed809 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IPartnerDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IPartnerDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDbSet.cs index 7d885a4..47fb234 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentDbSet.cs index 20b8040..b7f1d25 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentDbSet.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using FruitBank.Common.Interfaces; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentToFilesDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentToFilesDbSet.cs index 7a2761d..6aedf34 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentToFilesDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingDocumentToFilesDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemDbSet.cs index 31d4793..0267446 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemPalletDbSet.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemPalletDbSet.cs index fbf833f..9287bb0 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemPalletDbSet.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/Interfaces/IShippingItemPalletDbSet.cs @@ -1,5 +1,5 @@ using FruitBank.Common.Entities; -using Mango.Nop.Core.Interfaces; +using Mango.Nop.Data.Interfaces; using Nop.Data; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer.Interfaces; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs index e62a6af..690c7f2 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Interfaces; using Mango.Nop.Core.Entities; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs index 0b57f11..a2be19e 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs @@ -1,7 +1,7 @@ using FruitBank.Common.Dtos; using FruitBank.Common.Entities; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Domain.Orders; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemDtoDbTable.cs index ce7a67c..77ac036 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemDtoDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemDtoDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Dtos; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Domain.Orders; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/PartnerDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/PartnerDbTable.cs index b2823c9..87331d8 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/PartnerDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/PartnerDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ProductDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ProductDtoDbTable.cs index c38b1f8..45bc186 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ProductDtoDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ProductDtoDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Dtos; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Domain.Catalog; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs index 6335057..960a3c3 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs index 1cee391..50ce936 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentToFilesDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentToFilesDbTable.cs index c6a2b98..75cb270 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentToFilesDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingDocumentToFilesDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using Mango.Nop.Core.Loggers; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs index 4ed6ab0..d88cc73 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemDbTable.cs @@ -1,7 +1,7 @@ using FruitBank.Common.Entities; using FruitBank.Common.Interfaces; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs index 00f668a..d76b362 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/ShippingItemPalletDbTable.cs @@ -1,6 +1,6 @@ using FruitBank.Common.Entities; using LinqToDB; -using Mango.Nop.Core.Repositories; +using Mango.Nop.Data.Repositories; using Nop.Core.Caching; using Nop.Core.Configuration; using Nop.Core.Events; From 11d82c7193c72662feccfa28f93e150755e65908 Mon Sep 17 00:00:00 2001 From: Loretta Date: Wed, 5 Nov 2025 14:56:40 +0100 Subject: [PATCH 2/2] Mango.Nop.Core cleanup; --- .../Areas/Admin/Components/_WelcomeMessage.cshtml | 1 + .../Nop.Plugin.Misc.FruitBankPlugin.csproj | 1 + Nop.Plugin.Misc.MangoCore/Nop.Plugin.Misc.MangoCore.csproj | 3 ++- Nop.Plugin.Misc.SignalRApi/Nop.Plugin.Misc.SignalRApi.csproj | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Components/_WelcomeMessage.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Components/_WelcomeMessage.cshtml index f1ce668..074d727 100644 --- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Components/_WelcomeMessage.cshtml +++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Components/_WelcomeMessage.cshtml @@ -20,6 +20,7 @@ var welcomeMessage = await aiCalculationService.GetWelcomeMessageAsync(customer); if (welcomeMessage.IsNullOrWhiteSpace()) + //if(string.IsNullOrWhiteSpace(welcomeMessage)) {

Nincs kapcsolat az AI szerverrel...

} diff --git a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj index 1bb38be..ef7b092 100644 --- a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj +++ b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj @@ -133,6 +133,7 @@ ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Utils.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.dll diff --git a/Nop.Plugin.Misc.MangoCore/Nop.Plugin.Misc.MangoCore.csproj b/Nop.Plugin.Misc.MangoCore/Nop.Plugin.Misc.MangoCore.csproj index ee8668d..07e1c8f 100644 --- a/Nop.Plugin.Misc.MangoCore/Nop.Plugin.Misc.MangoCore.csproj +++ b/Nop.Plugin.Misc.MangoCore/Nop.Plugin.Misc.MangoCore.csproj @@ -7,7 +7,8 @@ - false + true + true enable diff --git a/Nop.Plugin.Misc.SignalRApi/Nop.Plugin.Misc.SignalRApi.csproj b/Nop.Plugin.Misc.SignalRApi/Nop.Plugin.Misc.SignalRApi.csproj index f85827f..ec3c961 100644 --- a/Nop.Plugin.Misc.SignalRApi/Nop.Plugin.Misc.SignalRApi.csproj +++ b/Nop.Plugin.Misc.SignalRApi/Nop.Plugin.Misc.SignalRApi.csproj @@ -7,7 +7,8 @@ - false + true + true enable