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.

ShippingSettings - Add new settings AdditionalShippingChargeByQty - Allow to the additional shipping charge on the product - multiply by the quantity

KrzysztofPajakc9242f77d341
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
index acd68b980..99bf15803 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
@@ -471,7 +471,7 @@ namespace Grand.Business.Checkout.Services.Orders
foreach (var sci in cart)
if (sci.IsShipEnabled && !sci.IsFreeShipping)
- additionalShippingCharge += sci.AdditionalShippingCharge;
+ additionalShippingCharge += _shippingSettings.AdditionalShippingChargeByQty ? (sci.AdditionalShippingChargeProduct * sci.Quantity) : sci.AdditionalShippingChargeProduct;
return additionalShippingCharge;
}
diff --git a/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs b/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
index 8a024da2d..29214d31f 100644
--- a/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
+++ b/src/Core/Grand.Domain/Orders/ShoppingCartItem.cs
@@ -83,20 +83,12 @@ namespace Grand.Domain.Orders
/// Gets a value indicating whether the shopping cart item is ship enabled
/// </summary>
public bool IsShipEnabled { get; set; }
-
+
+ /// <summary>
+ /// Gets a value the additional shipping charge for product
+ /// </summary>
public double AdditionalShippingChargeProduct { get; set; }
- /// <summary>
- /// Gets the additional shipping charge
- /// </summary>
- public double AdditionalShippingCharge
- {
- get
- {
- return AdditionalShippingChargeProduct * Quantity;
- }
- }
-
/// <summary>
/// Gets a value indicating whether the shopping cart item is tax exempt
/// </summary>
diff --git a/src/Core/Grand.Domain/Shipping/ShippingSettings.cs b/src/Core/Grand.Domain/Shipping/ShippingSettings.cs
index 788303cec..e9922be8a 100644
--- a/src/Core/Grand.Domain/Shipping/ShippingSettings.cs
+++ b/src/Core/Grand.Domain/Shipping/ShippingSettings.cs
@@ -50,5 +50,9 @@ namespace Grand.Domain.Shipping
/// </summary>
public bool SkipShippingMethodSelectionIfOnlyOne { get; set; }
+ /// <summary>
+ /// Gets or sets a value indicating whether we should calculate additional shipping charge on product multiply by the quantity
+ /// </summary>
+ public bool AdditionalShippingChargeByQty { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Settings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Settings.cshtml
index b3a39f8cc..58bd66bf4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Settings.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Settings.cshtml
@@ -47,7 +47,7 @@
<div class="x_content form">
<vc:admin-widget widget-zone="shipping_settings_top" additional-data="null" />
<div class="form-horizontal">
- <div class="form-body">
+ <div class="form-body">
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
<admin-label asp-for="AllowPickUpInStore" class="control-label" />
@@ -141,6 +141,18 @@
<span asp-validation-for="SkipShippingMethodSelectionIfOnlyOne"></span>
</div>
</div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AdditionalShippingChargeByQty" class="control-label" />
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AdditionalShippingChargeByQty" />
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AdditionalShippingChargeByQty"></span>
+ </div>
+ </div>
<div class="panel panel-default">
<div class="panel-heading">
@Loc["Admin.Configuration.Shipping.Settings.shippingoriginaddress"]
diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingSettingsModel.cs
index 251419587..e8df70805 100644
--- a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingSettingsModel.cs
@@ -32,6 +32,9 @@ namespace Grand.Web.Admin.Models.Shipping
[GrandResourceDisplayName("Admin.Configuration.Shipping.Settings.SkipShippingMethodSelectionIfOnlyOne")]
public bool SkipShippingMethodSelectionIfOnlyOne { get; set; }
+ [GrandResourceDisplayName("Admin.Configuration.Shipping.Settings.AdditionalShippingChargeByQty")]
+ public bool AdditionalShippingChargeByQty { get; set; }
+
[GrandResourceDisplayName("Admin.Configuration.Shipping.Settings.ShippingOriginAddress")]
public AddressModel ShippingOriginAddress { get; set; }
}
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 3f56d1459..0661dc7cc 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -4908,6 +4908,9 @@
<Resource Name="Admin.Configuration.Shipping.Settings">
<Value>Shipping settings</Value>
</Resource>
+ <Resource Name="Admin.Configuration.Shipping.Settings.AdditionalShippingChargeByQty">
+ <Value>Additional shipping charge on the product - multiply by the quantity</Value>
+ </Resource>
<Resource Name="Admin.Configuration.Shipping.Settings.AllowPickUpInStore">
<Value>"Pick Up in Store" enabled</Value>
</Resource>