Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Move EventPublisherExtensions to Grand.Business.Core

supportd0534b301b48
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
index d9303c1fa..a387b54f2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
@@ -1,5 +1,4 @@
using Grand.Business.Core.Commands.Checkout.Orders;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
@@ -9,6 +8,7 @@ using Grand.Domain.Logging;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
index 259514637..5d8ff8d62 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
@@ -6,13 +6,11 @@ using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Events.Checkout.Orders;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
-using Grand.Business.Checkout.Services.Orders;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
index d592fcbca..ddd1ca1c4 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
@@ -1,5 +1,4 @@
using Grand.Business.Core.Commands.Checkout.Orders;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Core.Queries.Checkout.Orders;
@@ -8,6 +7,7 @@ using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Logging;
using Grand.SharedKernel;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
index b9062886b..f4b180edb 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
@@ -1,6 +1,5 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Commands.Checkout.Shipping;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
index ece822f39..20172c338 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
@@ -1,6 +1,5 @@
using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Core.Commands.Checkout.Shipping;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Core.Interfaces.Messages;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
index c7607dd92..14b9d4824 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
@@ -1,6 +1,5 @@
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Catalog.Tax;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Common.Directory;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
index 247820f3f..6298483ec 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
index 74f3896f5..d8a321992 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
@@ -4,7 +4,6 @@ using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Business.Core.Utilities.Catalog;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Business.Core.Interfaces.Checkout.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
index 55550110b..9669ec700 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
@@ -1,6 +1,5 @@
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Checkout.Extensions;
using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Checkout.Shipping;
@@ -698,11 +697,11 @@ namespace Grand.Business.Checkout.Services.Orders
if (!recurringProducts.HasValue)
recurringProducts = (product.RecurringCyclePeriodId, product.RecurringCycleLength, product.RecurringTotalCycles);
else
- if (recurringProducts.Value.recurringCyclePeriod != product.RecurringCyclePeriodId ||
- recurringProducts.Value.recurringCycleLength != product.RecurringCycleLength ||
+ if (recurringProducts.Value.recurringCyclePeriod != product.RecurringCyclePeriodId ||
+ recurringProducts.Value.recurringCycleLength != product.RecurringCycleLength ||
recurringProducts.Value.recurringTotalCycles != product.RecurringTotalCycles
)
- hasRecurringProductsMix = true;
+ hasRecurringProductsMix = true;
}
else
hasStandartProducts = true;
@@ -841,7 +840,7 @@ namespace Grand.Business.Checkout.Services.Orders
warnings.Add("Wishlist is disabled");
return warnings;
}
-
+
if (quantity <= 0)
{
warnings.Add(_translationService.GetResource("ShoppingCart.QuantityShouldPositive"));
diff --git a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
index ca47c6a9c..d2ce8142c 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/OrderEventPublisherExtensions.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class OrderEventPublisherExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
index cd0d7b34b..140b1106d 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShippingEventPublisherExtensions.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class ShippingEventPublisherExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
index 7b5785738..0e8c71554 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShoppingCartEventPublisherExtensions.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class ShoppingCartEventPublisherExtensions
{