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.

ProductDetailsCart/ProductCatalogCart change ShoppingCartTypeId to enum

support6572dee82cb7
diff --git a/src/Web/Grand.Web/Controllers/ActionCartController.cs b/src/Web/Grand.Web/Controllers/ActionCartController.cs
index 48691cb6e..52bdb1894 100644
--- a/src/Web/Grand.Web/Controllers/ActionCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ActionCartController.cs
@@ -185,8 +185,6 @@ namespace Grand.Web.Controllers
[HttpPost]
public virtual async Task<IActionResult> AddProductCatalog(ProductCatalogCart model)
{
- var cartType = (ShoppingCartType)model.ShoppingCartTypeId;
-
var product = await _productService.GetProductById(model.ProductId);
if (product == null)
//no product found
@@ -196,7 +194,7 @@ namespace Grand.Web.Controllers
message = "No product found with the specified ID"
});
- var redirect = RedirectToProduct(product, cartType, model.Quantity);
+ var redirect = RedirectToProduct(product, model.ShoppingCartTypeId, model.Quantity);
if (redirect != null)
return redirect;
@@ -204,17 +202,17 @@ namespace Grand.Web.Controllers
var warehouseId = GetWarehouse(product);
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, cartType);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, model.ShoppingCartTypeId);
- if (cartType != ShoppingCartType.Wishlist)
+ if (model.ShoppingCartTypeId != ShoppingCartType.Wishlist)
{
- var shoppingCartItem = await _shoppingCartService.FindShoppingCartItem(cart, cartType, product.Id, warehouseId);
+ var shoppingCartItem = await _shoppingCartService.FindShoppingCartItem(cart, model.ShoppingCartTypeId, product.Id, warehouseId);
//if we already have the same product in the cart, then use the total quantity to validate
var quantityToValidate = shoppingCartItem?.Quantity + model.Quantity ?? model.Quantity;
var addToCartWarnings = await _shoppingCartValidator
.GetShoppingCartItemWarnings(customer, new ShoppingCartItem {
- ShoppingCartTypeId = cartType,
+ ShoppingCartTypeId = model.ShoppingCartTypeId,
StoreId = _workContext.CurrentStore.Id,
WarehouseId = warehouseId,
Quantity = quantityToValidate
@@ -235,15 +233,15 @@ namespace Grand.Web.Controllers
//try adding product to the cart
var addToCart = await _shoppingCartService.AddToCart(customer: customer,
productId: product.Id,
- shoppingCartType: cartType,
+ shoppingCartType: model.ShoppingCartTypeId,
storeId: _workContext.CurrentStore.Id,
warehouseId: warehouseId,
quantity: model.Quantity,
validator: new ShoppingCartValidatorOptions {
GetRequiredProductWarnings = false,
- GetInventoryWarnings = cartType == ShoppingCartType.ShoppingCart || !_shoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist,
- GetAttributesWarnings = cartType != ShoppingCartType.Wishlist,
- GetGiftVoucherWarnings = cartType != ShoppingCartType.Wishlist
+ GetInventoryWarnings = model.ShoppingCartTypeId == ShoppingCartType.ShoppingCart || !_shoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist,
+ GetAttributesWarnings = model.ShoppingCartTypeId != ShoppingCartType.Wishlist,
+ GetGiftVoucherWarnings = model.ShoppingCartTypeId != ShoppingCartType.Wishlist
});
if (addToCart.warnings.Any())
@@ -260,7 +258,7 @@ namespace Grand.Web.Controllers
Customer = customer,
ShoppingCartItem = addToCart.shoppingCartItem,
Quantity = model.Quantity,
- CartType = cartType,
+ CartType = model.ShoppingCartTypeId,
Currency = _workContext.WorkingCurrency,
Store = _workContext.CurrentStore,
Language = _workContext.WorkingLanguage,
@@ -268,7 +266,7 @@ namespace Grand.Web.Controllers
});
//added to the cart/wishlist
- switch (cartType)
+ switch (model.ShoppingCartTypeId)
{
case ShoppingCartType.Wishlist:
{
@@ -360,7 +358,7 @@ namespace Grand.Web.Controllers
});
}
- var message = ReturnFailMessage(product, (ShoppingCartType)model.ShoppingCartTypeId);
+ var message = ReturnFailMessage(product, model.ShoppingCartTypeId);
if (message != null)
return message;
@@ -436,8 +434,6 @@ namespace Grand.Web.Controllers
}
}
- var cartType = (ShoppingCartType)model.ShoppingCartTypeId;
-
//save item
var addToCartWarnings = new List<string>();
var warehouseId = _shoppingCartSettings.AllowToSelectWarehouse ?
@@ -448,12 +444,12 @@ namespace Grand.Web.Controllers
//add to the cart
var (warnings, shoppingCartItem) = await _shoppingCartService.AddToCart(_workContext.CurrentCustomer,
- product.Id, cartType, _workContext.CurrentStore.Id, warehouseId,
+ product.Id, model.ShoppingCartTypeId, _workContext.CurrentStore.Id, warehouseId,
attributes, customerEnteredPriceConverted,
rentalStartDate, rentalEndDate, model.EnteredQuantity, true, model.Reservation, parameter, duration,
new ShoppingCartValidatorOptions {
GetRequiredProductWarnings = false,
- GetInventoryWarnings = cartType == ShoppingCartType.ShoppingCart || !_shoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist
+ GetInventoryWarnings = model.ShoppingCartTypeId == ShoppingCartType.ShoppingCart || !_shoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist
});
addToCartWarnings.AddRange(warnings);
@@ -476,7 +472,7 @@ namespace Grand.Web.Controllers
Customer = _workContext.CurrentCustomer,
ShoppingCartItem = shoppingCartItem,
Quantity = model.EnteredQuantity,
- CartType = cartType,
+ CartType = model.ShoppingCartTypeId,
CustomerEnteredPrice = customerEnteredPriceConverted,
Attributes = attributes,
Currency = _workContext.WorkingCurrency,
@@ -491,7 +487,7 @@ namespace Grand.Web.Controllers
});
//added to the cart/wishlist
- switch (cartType)
+ switch (model.ShoppingCartTypeId)
{
case ShoppingCartType.Wishlist:
{
@@ -570,8 +566,6 @@ namespace Grand.Web.Controllers
});
}
}
-
-
#endregion
}
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/ProductCatalogCart.cs b/src/Web/Grand.Web/Models/ShoppingCart/ProductCatalogCart.cs
index d6fc6c530..0fa4a2741 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/ProductCatalogCart.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/ProductCatalogCart.cs
@@ -1,9 +1,13 @@
-namespace Grand.Web.Models.ShoppingCart;
+using Grand.Domain.Orders;
+using Grand.SharedKernel.Attributes;
+
+namespace Grand.Web.Models.ShoppingCart;
public class ProductCatalogCart
{
public string ProductId { get; set; }
- public int ShoppingCartTypeId { get; set; }
- public int Quantity { get; set; }
+ public ShoppingCartType ShoppingCartTypeId { get; set; }
+ public int Quantity { get; set; }
+ [IgnoreApi]
public bool ForceRedirection { get; set; }
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Models/ShoppingCart/ProductDetailsCart.cs b/src/Web/Grand.Web/Models/ShoppingCart/ProductDetailsCart.cs
index c11383437..a2d299244 100644
--- a/src/Web/Grand.Web/Models/ShoppingCart/ProductDetailsCart.cs
+++ b/src/Web/Grand.Web/Models/ShoppingCart/ProductDetailsCart.cs
@@ -1,4 +1,5 @@
-using Grand.Web.Common.Binders;
+using Grand.Domain.Orders;
+using Grand.Web.Common.Binders;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc;
@@ -7,8 +8,9 @@ namespace Grand.Web.Models.ShoppingCart;
public class ProductDetailsCart
{
public string ProductId { get; set; }
- public int ShoppingCartTypeId { get; set; }
+ public ShoppingCartType ShoppingCartTypeId { get; set; }
public string ShoppingCartItemId { get; set; }
+ public int EnteredQuantity { get; set; }
public string WarehouseId { get; set; }
public string ReservationDatepickerFrom { get; set; }
public string ReservationDatepickerTo { get; set; }
@@ -20,8 +22,7 @@ public class ProductDetailsCart
[ModelBinder(BinderType = typeof(CustomAttributesBinder))]
public IList<CustomAttributeModel> Attributes { get; set; }
-
public string Reservation { get; set; }
public string CustomerEnteredPrice { get; set; }
- public int EnteredQuantity { get; set; }
+
}
\ No newline at end of file