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.

fix(arch001): address final review findings (C1 Vendor Order view model mismatch, C2 PdfInvoiceSelected vendor leak, I1 RoutedOrderDataScope CanView, I2 Vendor totals gating, I3 PDF/GoToOrderId test coverage, M2/M4)

KrzysztofPajak2fa96a25c83b
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderControllerTests.cs
index 58720b714..a84197dbb 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderControllerTests.cs
@@ -1,6 +1,7 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.AdminShared.Controllers;
@@ -39,6 +40,7 @@ public class BaseOrderControllerTests
private Mock<IOrderService> _orderServiceMock;
private Mock<IOrderViewModelService> _orderViewModelServiceMock;
private Mock<IAdminDataScope<Order>> _scopeMock;
+ private Mock<IPdfService> _pdfServiceMock;
[TestInitialize]
public void Setup()
@@ -47,17 +49,21 @@ public class BaseOrderControllerTests
_orderViewModelServiceMock = new Mock<IOrderViewModelService>();
_scopeMock = new Mock<IAdminDataScope<Order>>();
_scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _pdfServiceMock = new Mock<IPdfService>();
var translationServiceMock = new Mock<ITranslationService>();
translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");
var contextAccessorMock = new Mock<IContextAccessor>();
+ var workContextMock = new Mock<IWorkContext>();
+ workContextMock.Setup(w => w.WorkingLanguage).Returns(new Language { Id = "lang-1" });
+ contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
_controller = new TestOrderController(
_orderViewModelServiceMock.Object,
_orderServiceMock.Object,
translationServiceMock.Object,
contextAccessorMock.Object,
- new Mock<IPdfService>().Object,
+ _pdfServiceMock.Object,
_scopeMock.Object);
var httpContext = new DefaultHttpContext();
@@ -276,4 +282,87 @@ public class BaseOrderControllerTests
It.IsAny<IList<string>>(), It.IsAny<IList<string>>(), It.IsAny<Grand.Domain.Catalog.ProductSortingEnum>(),
true, It.IsAny<bool?>()), Times.Once);
}
+
+ [TestMethod]
+ public async Task PdfInvoice_ThreadsScopeDefaultVendorId()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+ _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-A");
+
+ var result = await _controller.PdfInvoice("o1");
+
+ Assert.IsInstanceOfType(result, typeof(FileContentResult));
+ _pdfServiceMock.Verify(
+ p => p.PrintOrdersToPdf(It.IsAny<Stream>(), It.Is<IList<Order>>(l => l.Count == 1 && l[0] == order),
+ "lang-1", "vendor-A"), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task PdfInvoiceAll_ThreadsScopeDefaultVendorId()
+ {
+ _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-A");
+ var orders = new List<Order> { new() { Id = "o1" } };
+ _orderViewModelServiceMock.Setup(v => v.PrepareOrders(It.IsAny<OrderListModel>()))
+ .ReturnsAsync((IList<Order>)orders);
+
+ var result = await _controller.PdfInvoiceAll(new OrderListModel());
+
+ Assert.IsInstanceOfType(result, typeof(FileContentResult));
+ _pdfServiceMock.Verify(
+ p => p.PrintOrdersToPdf(It.IsAny<Stream>(), It.IsAny<IList<Order>>(), "lang-1", "vendor-A"),
+ Times.Once);
+ }
+
+ [TestMethod]
+ public async Task PdfInvoiceSelected_ThreadsScopeDefaultVendorId()
+ {
+ // Direct regression guard for the final review C2 fix: PdfInvoiceSelected must pass
+ // scope.DefaultVendorId to IPdfService.PrintOrdersToPdf, matching PdfInvoice/PdfInvoiceAll.
+ _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-A");
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrdersByIds(It.Is<string[]>(ids => ids.Length == 1 && ids[0] == "o1")))
+ .ReturnsAsync((IList<Order>)new List<Order> { order });
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+
+ var result = await _controller.PdfInvoiceSelected("o1");
+
+ Assert.IsInstanceOfType(result, typeof(FileContentResult));
+ _pdfServiceMock.Verify(
+ p => p.PrintOrdersToPdf(It.IsAny<Stream>(), It.Is<IList<Order>>(l => l.Count == 1 && l[0] == order),
+ "lang-1", "vendor-A"), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task PdfInvoiceSelected_ScopeDenies_ExcludesOrderFromPdf()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrdersByIds(It.IsAny<string[]>()))
+ .ReturnsAsync((IList<Order>)new List<Order> { order });
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);
+
+ var result = await _controller.PdfInvoiceSelected("o1");
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ _pdfServiceMock.Verify(
+ p => p.PrintOrdersToPdf(It.IsAny<Stream>(), It.IsAny<IList<Order>>(), It.IsAny<string>(), It.IsAny<string>()),
+ Times.Never);
+ }
+
+ [TestMethod]
+ public async Task GoToOrderId_ScopeDenies_RedirectsToList()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrderByNumber(7)).ReturnsAsync(order);
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);
+
+ var result = await _controller.GoToOrderId(new OrderListModel { GoDirectlyToNumber = "7" });
+
+ var redirect = result as RedirectToActionResult;
+ Assert.IsNotNull(redirect);
+ Assert.AreEqual("List", redirect.ActionName);
+ }
}
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/OrderControllerRoutingTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/OrderControllerRoutingTests.cs
index 6b87e4533..3edba26bf 100644
--- a/src/Tests/Grand.Web.Store.Tests/Controllers/OrderControllerRoutingTests.cs
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/OrderControllerRoutingTests.cs
@@ -1,5 +1,8 @@
using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
using Grand.Web.Store.Controllers;
+using Grand.Web.Store.Extensions;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Grand.Web.Store.Tests.Controllers;
@@ -17,6 +20,23 @@ public class StoreControllerRoutingTests
.GetCustomAttributes(typeof(Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute), false)
.Length > 0);
+ // Regression guard for the defect class Task 17 caught: BaseOrderManagementController can't
+ // carry a host's [Area]/[Authorize*] attributes itself (they differ per host), so each concrete
+ // subclass must restate its own - a missing one here would 404 or deauthorize the whole
+ // controller silently. Same shape as ProductControllerAttributesTests (Admin).
+ [TestMethod]
+ public void StoreOrderController_HasAreaAttributeWithStoreArea()
+ {
+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(typeof(OrderController), typeof(AreaAttribute), false);
+ Assert.IsNotNull(areaAttr, "Missing [Area].");
+ Assert.AreEqual(Constants.AreaStore, areaAttr.RouteValue);
+ }
+
+ [TestMethod]
+ public void StoreOrderController_HasAuthorizeStoreAttribute() =>
+ Assert.IsTrue(typeof(OrderController).IsDefined(typeof(AuthorizeStoreAttribute), false),
+ "Missing [AuthorizeStore].");
+
[TestMethod]
public void StoreOrderController_DoesNotDeclareAdminOnlyExportOrDeleteSelected()
{
diff --git a/src/Tests/Grand.Web.Vendor.Tests/Controllers/OrderControllerSurfaceTests.cs b/src/Tests/Grand.Web.Vendor.Tests/Controllers/OrderControllerSurfaceTests.cs
index 4cc64ccb9..d68f717d5 100644
--- a/src/Tests/Grand.Web.Vendor.Tests/Controllers/OrderControllerSurfaceTests.cs
+++ b/src/Tests/Grand.Web.Vendor.Tests/Controllers/OrderControllerSurfaceTests.cs
@@ -1,4 +1,7 @@
+using Grand.Web.Common.Filters;
using Grand.Web.Vendor.Controllers;
+using Grand.Web.Vendor.Extensions;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Grand.Web.Vendor.Tests.Controllers;
@@ -36,4 +39,21 @@ public class OrderControllerSurfaceTests
var leaked = ManagementOnlyActionNames.Where(declaredMethodNames.Contains).ToList();
Assert.AreEqual(0, leaked.Count, $"Vendor's OrderController exposes management-only action(s): {string.Join(", ", leaked)}");
}
+
+ // Regression guard for the defect class Task 17 caught: BaseOrderController can't carry a
+ // host's [Area]/[Authorize*] attributes itself (they differ per host), so each concrete
+ // subclass must restate its own - a missing one here would 404 or deauthorize the whole
+ // controller silently. Same shape as ProductControllerAttributesTests (Admin).
+ [TestMethod]
+ public void VendorOrderController_HasAreaAttributeWithVendorArea()
+ {
+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(typeof(OrderController), typeof(AreaAttribute), false);
+ Assert.IsNotNull(areaAttr, "Missing [Area].");
+ Assert.AreEqual(Constants.AreaVendor, areaAttr.RouteValue);
+ }
+
+ [TestMethod]
+ public void VendorOrderController_HasAuthorizeVendorAttribute() =>
+ Assert.IsTrue(typeof(OrderController).IsDefined(typeof(AuthorizeVendorAttribute), false),
+ "Missing [AuthorizeVendor].");
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderController.cs
index 7f768be24..d198b2a63 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderController.cs
@@ -144,9 +144,11 @@ public abstract class BaseOrderController(
// Store filters by StoreId; Vendor's original filtered by HasAccessToOrder (any-item
// vendor match); Admin's original has no filter here at all. scope.HasAccess already
- // expresses all three checks per-host - safe to apply unconditionally, it's a true no-op
- // for Admin (AdminOrderDataScope.HasAccess is the Sales-Manager check, which Admin's
- // *original* PdfInvoiceSelected never applied - see plan risk note below).
+ // expresses all three checks per-host, so applying it unconditionally is a deliberate,
+ // disclosed, security-positive behavior change for Admin: it closes a pre-existing gap
+ // where a Sales Manager could previously export any order id via a crafted selectedIds
+ // list, bypassing the Sales-Manager scoping that AdminOrderDataScope.HasAccess enforces
+ // everywhere else in this controller.
var accessible = new List<Order>();
foreach (var order in orders)
if (await scope.HasAccess(order))
@@ -162,7 +164,8 @@ public abstract class BaseOrderController(
byte[] bytes;
using (var stream = new MemoryStream())
{
- await pdfService.PrintOrdersToPdf(stream, orders, contextAccessor.WorkContext.WorkingLanguage.Id);
+ await pdfService.PrintOrdersToPdf(stream, orders, contextAccessor.WorkContext.WorkingLanguage.Id,
+ scope.DefaultVendorId);
bytes = stream.ToArray();
}
diff --git a/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
index 68d085796..667009634 100644
--- a/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/OrderViewModelService.cs
@@ -414,8 +414,14 @@ public class OrderViewModelService : IOrderViewModelService
}
}
+ model.CurrencyRate = order.CurrencyRate;
+ model.CurrencyCode = order.CustomerCurrencyCode;
+
#region Order totals
+ // primaryStoreCurrency/orderCurrency stay ungated: they're needed below (outside this
+ // gate) to format each OrderItemModel's unit price/discount/subtotal/commission, which
+ // Vendor's own OrderDetails.Products partial does render.
var primaryStoreCurrency = await _currencyService.GetCurrencyByCode(order.PrimaryCurrencyCode) ??
await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId);
@@ -426,6 +432,15 @@ public class OrderViewModelService : IOrderViewModelService
if (orderCurrency == null)
throw new Exception("Cannot load order currency");
+ // Vendor's original service never populated the rest of this block (subtotal, discount,
+ // shipping, tax, payment fee, order total, refund, loyalty points, gift vouchers,
+ // discount usage, profit) - matches the gating already applied above for CustomerId,
+ // CustomerIp, Affiliate, SalesEmployee, OrderTags and OrderStatuses (final review I2).
+ // None of Vendor's own Order partials render these fields today, so this has no visible
+ // behavior change for Vendor - it closes a latent exposure risk (e.g. a future shared
+ // view rendering merchant Profit to a vendor).
+ if (_scope.DefaultVendorId is null)
+ {
//subtotal
model.OrderSubtotalInclTax = _priceFormatter.FormatPrice(order.OrderSubtotalInclTax, orderCurrency);
model.OrderSubtotalExclTax = _priceFormatter.FormatPrice(order.OrderSubtotalExclTax, orderCurrency);
@@ -503,8 +518,6 @@ public class OrderViewModelService : IOrderViewModelService
//total
model.OrderTotal = _priceFormatter.FormatPrice(order.OrderTotal, orderCurrency);
model.OrderTotalValue = order.OrderTotal;
- model.CurrencyRate = order.CurrencyRate;
- model.CurrencyCode = order.CustomerCurrencyCode;
//refunded amount
if (order.RefundedAmount > 0)
@@ -579,6 +592,7 @@ public class OrderViewModelService : IOrderViewModelService
}
#endregion
+ }
#region Payment info
@@ -587,12 +601,18 @@ public class OrderViewModelService : IOrderViewModelService
model.PaymentMethod = pm != null ? pm.FriendlyName : order.PaymentMethodSystemName;
model.PaymentStatus = _enumTranslationService.GetTranslationEnum(order.PaymentStatusId);
model.PaymentStatusEnum = order.PaymentStatusId;
- var pt = await _paymentTransactionService.GetOrderByGuid(order.OrderGuid);
- if (pt != null)
- model.PaymentTransactionId = pt.Id;
- model.PrimaryStoreCurrencyCode = order.PrimaryCurrencyCode;
- model.MaxAmountToRefund = order.OrderTotal - order.RefundedAmount;
+ // Vendor's original service never populated PaymentTransactionId, PrimaryStoreCurrencyCode
+ // or MaxAmountToRefund either - same gate as the totals block above (final review I2).
+ if (_scope.DefaultVendorId is null)
+ {
+ var pt = await _paymentTransactionService.GetOrderByGuid(order.OrderGuid);
+ if (pt != null)
+ model.PaymentTransactionId = pt.Id;
+
+ model.PrimaryStoreCurrencyCode = order.PrimaryCurrencyCode;
+ model.MaxAmountToRefund = order.OrderTotal - order.RefundedAmount;
+ }
#endregion
@@ -629,7 +649,10 @@ public class OrderViewModelService : IOrderViewModelService
model.BillingAddress.FaxRequired = _addressSettings.FaxRequired;
model.BillingAddress.NoteEnabled = _addressSettings.NoteEnabled;
- model.ShippingStatus = _enumTranslationService.GetTranslationEnum(order.ShippingStatusId);
+ // Vendor's original service never populated ShippingStatus - same gate as the totals
+ // block above (final review I2).
+ if (_scope.DefaultVendorId is null)
+ model.ShippingStatus = _enumTranslationService.GetTranslationEnum(order.ShippingStatusId);
if (order.ShippingStatusId != ShippingStatus.ShippingNotRequired)
{
model.IsShippable = true;
diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedOrderDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedOrderDataScope.cs
index e3b148ba8..108e09e7a 100644
--- a/src/Web/Grand.Web.AdminShared/Services/RoutedOrderDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedOrderDataScope.cs
@@ -42,6 +42,7 @@ public class RoutedOrderDataScope(
}
public Task<bool> HasAccess(Order entity) => Resolved.HasAccess(entity);
+ public Task<bool> CanView(Order entity) => Resolved.CanView(entity);
public IEnumerable<OrderItem> FilterOrderItems(IEnumerable<OrderItem> orderItems) =>
Resolved.FilterOrderItems(orderItems);
public string? DefaultStoreId => Resolved.DefaultStoreId;
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
index 83c4d41cb..7459fba57 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
@@ -30,7 +30,16 @@
Grand.Web.Vendor.Models.Catalog's own ProductModel etc. are no longer used by any controller/view
and importing both would make bare "ProductModel" ambiguous. *@
@using Grand.Web.AdminShared.Models.Catalog;
-@using Grand.Web.Vendor.Models.Orders;
+@* Order views bind to Grand.Web.AdminShared's OrderModel/OrderListModel (ARCH-001 Phase 5 Order
+ consolidation) - Grand.Web.Vendor.Models.Orders's own OrderModel/OrderListModel are no longer
+ used by any controller/view. Unlike the ProductModel case above, this can't be a blanket
+ "@using Grand.Web.AdminShared.Models.Orders" - that namespace also holds ShipmentModel,
+ MerchandiseReturnModel, *ReportModel etc., which Vendor's Shipment/MerchandiseReturn/Reports
+ views still bind to their own Grand.Web.Vendor.Models.* equivalents (not yet consolidated), so
+ a wildcard import here would make those bare names ambiguous instead. Alias just the two types
+ that are actually consolidated. *@
+@using OrderModel = Grand.Web.AdminShared.Models.Orders.OrderModel;
+@using OrderListModel = Grand.Web.AdminShared.Models.Orders.OrderListModel;
@using Grand.Web.Vendor.Models.Shipment;
@using Grand.Web.Vendor.Models.MerchandiseReturn;
@using Grand.Web.Vendor.Models.Vendor;
diff --git a/src/Web/Grand.Web.Vendor/Models/Orders/OrderListModel.cs b/src/Web/Grand.Web.Vendor/Models/Orders/OrderListModel.cs
deleted file mode 100644
index e0c1b74ce..000000000
--- a/src/Web/Grand.Web.Vendor/Models/Orders/OrderListModel.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Grand.Infrastructure.ModelBinding;
-using Grand.Infrastructure.Models;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.ComponentModel.DataAnnotations;
-
-namespace Grand.Web.Vendor.Models.Orders;
-
-public class OrderListModel : BaseModel
-{
- [GrandResourceDisplayName("Vendor.Orders.List.StartDate")]
- [UIHint("DateNullable")]
- public DateTime? StartDate { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.EndDate")]
- [UIHint("DateNullable")]
- public DateTime? EndDate { get; set; }
-
- public string CustomerId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.BillingEmail")]
- public string BillingEmail { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.BillingLastName")]
- public string BillingLastName { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.OrderStatus")]
- public int OrderStatusId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.PaymentStatus")]
- public int PaymentStatusId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.ShippingStatus")]
- public int ShippingStatusId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.PaymentMethod")]
- public string PaymentMethodSystemName { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.Warehouse")]
- public string WarehouseId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.Product")]
- public string ProductId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.BillingCountry")]
- public string BillingCountryId { get; set; }
-
-
- [GrandResourceDisplayName("Vendor.Orders.List.OrderGuid")]
-
- public string OrderGuid { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.GoDirectlyToNumber")]
-
- public string GoDirectlyToNumber { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.List.OrderTagId")]
- public string OrderTag { get; set; }
-
- public IList<SelectListItem> AvailableOrderStatuses { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailablePaymentStatuses { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailableShippingStatuses { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailableWarehouses { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailablePaymentMethods { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailableCountries { get; set; } = new List<SelectListItem>();
- public IList<SelectListItem> AvailableOrderTags { get; set; } = new List<SelectListItem>();
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Models/Orders/OrderModel.cs b/src/Web/Grand.Web.Vendor/Models/Orders/OrderModel.cs
deleted file mode 100644
index c222e756f..000000000
--- a/src/Web/Grand.Web.Vendor/Models/Orders/OrderModel.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using Grand.Domain.Catalog;
-using Grand.Domain.Payments;
-using Grand.Domain.Tax;
-using Grand.Infrastructure.ModelBinding;
-using Grand.Infrastructure.Models;
-using Grand.Web.Vendor.Models.Common;
-using System.ComponentModel.DataAnnotations;
-
-namespace Grand.Web.Vendor.Models.Orders;
-
-public class OrderModel : BaseEntityModel
-{
- //identifiers
- [GrandResourceDisplayName("Vendor.Orders.Fields.ID")]
- public override string Id { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.ID")]
- public int OrderNumber { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.Code")]
- public string Code { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.OrderGuid")]
- public Guid OrderGuid { get; set; }
-
- //store
- [GrandResourceDisplayName("Vendor.Orders.Fields.Store")]
- public string StoreName { get; set; }
-
- //customer info
- [GrandResourceDisplayName("Vendor.Orders.Fields.Customer")]
- public string CustomerInfo { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.CustomerEmail")]
- public string CustomerEmail { get; set; }
-
- public string CustomerFullName { get; set; }
-
- //order status
- [GrandResourceDisplayName("Admin.Orders.Fields.OrderStatus")]
- public string OrderStatus { get; set; }
-
- public int OrderStatusId { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.Currency")]
- public string CurrencyCode { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.CurrencyRate")]
- [UIHint("DoubleN4")]
- public double CurrencyRate { get; set; }
-
- public TaxDisplayType TaxDisplayType { get; set; }
-
- //payment info
- [GrandResourceDisplayName("Vendor.Orders.Fields.PaymentStatus")]
- public string PaymentStatus { get; set; }
-
- public PaymentStatus PaymentStatusEnum { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.PaymentMethod")]
- public string PaymentMethod { get; set; }
-
- //shipping info
- public bool IsShippable { get; set; }
- public bool PickUpInStore { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.PickupAddress")]
- public AddressModel PickupAddress { get; set; }
-
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.ShippingAddress")]
- public AddressModel ShippingAddress { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.ShippingMethod")]
- public string ShippingMethod { get; set; }
-
- public string ShippingAdditionDescription { get; set; }
- public string ShippingAddressGoogleMapsUrl { get; set; }
- public bool CanAddNewShipments { get; set; }
-
- //billing info
- [GrandResourceDisplayName("Vendor.Orders.Fields.BillingAddress")]
- public AddressModel BillingAddress { get; set; }
-
- [GrandResourceDisplayName("Vendor.Orders.Fields.VatNumber")]
- public string VatNumber { get; set; }
-
- //items
- public bool HasDownloadableProducts { get; set; }
- public IList<OrderItemModel> Items { get; set; } = new List<OrderItemModel>();
-
- //creation date
- [GrandResourceDisplayName("Vendor.Orders.Fields.CreatedOn")]
- public DateTime CreatedOn { get; set; }
-
- //checkout attributes
- public string CheckoutAttributeInfo { get; set; }
-
-
- #region Nested Classes
-
- public class OrderItemModel : BaseEntityModel
- {
- public string ProductId { get; set; }
- public string ProductName { get; set; }
- public string VendorName { get; set; }
- public string Sku { get; set; }
-
- public string PictureThumbnailUrl { get; set; }
-
- public string UnitPriceInclTax { get; set; }
- public string UnitPriceExclTax { get; set; }
- public double UnitPriceInclTaxValue { get; set; }
- public double UnitPriceExclTaxValue { get; set; }
-
- public int Quantity { get; set; }
- public int OpenQty { get; set; }
- public int CancelQty { get; set; }
- public int ShipQty { get; set; }
- public int ReturnQty { get; set; }
-
- public string DiscountInclTax { get; set; }
- public string DiscountExclTax { get; set; }
- public double DiscountInclTaxValue { get; set; }
- public double DiscountExclTaxValue { get; set; }
-
- public string SubTotalInclTax { get; set; }
- public string SubTotalExclTax { get; set; }
- public double SubTotalInclTaxValue { get; set; }
- public double SubTotalExclTaxValue { get; set; }
-
- public string AttributeInfo { get; set; }
- public string RecurringInfo { get; set; }
-
- public IList<string> MerchandiseReturnIds { get; set; } = new List<string>();
- public IList<string> PurchasedGiftVoucherIds { get; set; } = new List<string>();
-
- public bool IsDownload { get; set; }
- public int DownloadCount { get; set; }
- public DownloadActivationType DownloadActivationType { get; set; }
- public bool IsDownloadActivated { get; set; }
- public Guid LicenseDownloadGuid { get; set; }
-
- public string Commission { get; set; }
- public double CommissionValue { get; set; }
- }
-
- #endregion
-}
\ No newline at end of file