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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Admin panel - minor changes with display order details
KrzysztofPajak3b8e19e1a12f
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtmlindex 5615f4310..eb2ef2f53 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml@@ -280,7 +280,7 @@</div></div>}- if (Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.IncludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.IncludingTax){<div class="form-group"><admin-label asp-for="OrderSubtotalInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>@@ -289,7 +289,7 @@</div></div>}- if (Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.ExcludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax){<div class="form-group"><admin-label asp-for="OrderSubtotalExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>@@ -298,7 +298,7 @@</div></div>}- if ((Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.IncludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.IncludingTax&& !String.IsNullOrEmpty(Model.OrderSubTotalDiscountInclTax)){<div class="form-group">@@ -308,7 +308,7 @@</div></div>}- if ((Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.ExcludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax&& !String.IsNullOrEmpty(Model.OrderSubTotalDiscountExclTax)){<div class="form-group">@@ -318,7 +318,7 @@</div></div>}- if (Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.IncludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.IncludingTax){<div class="form-group"><admin-label asp-for="OrderShippingInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>@@ -327,7 +327,7 @@</div></div>}- if (Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.ExcludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax){<div class="form-group"><admin-label asp-for="OrderShippingExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>@@ -336,7 +336,7 @@</div></div>}- if ((Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.IncludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.IncludingTax&& !String.IsNullOrEmpty(Model.PaymentMethodAdditionalFeeInclTax)){<div class="form-group">@@ -346,7 +346,7 @@</div></div>}- if ((Model.AllowCustomersToSelectTaxDisplayType || Model.TaxDisplayType == TaxDisplayType.ExcludingTax)+ if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax&& !String.IsNullOrEmpty(Model.PaymentMethodAdditionalFeeExclTax)){<div class="form-group">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtmlindex f112c478d..b44b2eb16 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml@@ -195,15 +195,7 @@</div></td><td>- @if (Model.AllowCustomersToSelectTaxDisplayType)- {- @item.UnitPriceInclTax- <br />- @item.UnitPriceExclTax- }- else- {- switch (Model.TaxDisplayType)+ @switch (Model.TaxDisplayType){case TaxDisplayType.ExcludingTax:{@@ -218,7 +210,7 @@default:break;}- }+<div id="pnlEditPvUnitPrice@(item.Id)"><table class="order-edit"><tr>@@ -259,15 +251,7 @@@if (Model.Items.Sum(x => x.DiscountInclTaxValue) > 0){<td>- @if (Model.AllowCustomersToSelectTaxDisplayType)- {- @item.DiscountInclTax- <br />- @item.DiscountExclTax- }- else- {- switch (Model.TaxDisplayType)+ @switch (Model.TaxDisplayType){case TaxDisplayType.ExcludingTax:{@@ -282,7 +266,7 @@default:break;}- }+</td>}@if (Model.Items.Sum(x => x.CommissionValue) > 0)@@ -292,15 +276,8 @@</td>}<td>- @if (Model.AllowCustomersToSelectTaxDisplayType)- {- @item.SubTotalInclTax- <br />- @item.SubTotalExclTax- }- else- {- switch (Model.TaxDisplayType)++ @switch (Model.TaxDisplayType){case TaxDisplayType.ExcludingTax:{@@ -315,7 +292,7 @@default:break;}- }+</td>@if (!Model.IsLoggedInAsVendor)diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.csindex ff3bdf815..861365343 100644--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderModel.cs@@ -72,7 +72,6 @@ namespace Grand.Web.Admin.Models.Orderspublic IList<UsedDiscountModel> UsedDiscounts { get; set; }//totals- public bool AllowCustomersToSelectTaxDisplayType { get; set; }public TaxDisplayType TaxDisplayType { get; set; }[GrandResourceDisplayName("Admin.Orders.Fields.OrderSubtotalInclTax")]public string OrderSubtotalInclTax { get; set; }diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.csindex 75667c090..fbe687f88 100644--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs@@ -396,7 +396,6 @@ namespace Grand.Web.Admin.Servicesmodel.UrlReferrer = order.UrlReferrer;model.VatNumber = order.VatNumber;model.CreatedOn = _dateTimeService.ConvertToUserTime(order.CreatedOnUtc, DateTimeKind.Utc);- model.AllowCustomersToSelectTaxDisplayType = _taxSettings.AllowCustomersToSelectTaxDisplayType;model.TaxDisplayType = _taxSettings.TaxDisplayType;if (!string.IsNullOrEmpty(order.AffiliateId))