improvements, fixes, etc..

Mango.Nop.Core/Dtos/MgOrderDto.cs

@@ -2,12 +2,14 @@
 using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 using Mango.Nop.Core.Interfaces;
+using Newtonsoft.Json;
 using Nop.Core;
 using Nop.Core.Domain.Common;
 using Nop.Core.Domain.Customers;
 using Nop.Core.Domain.Orders;
 using Nop.Core.Domain.Payments;
 using Nop.Core.Domain.Shipping;
+using System.Linq.Expressions;
 
 namespace Mango.Nop.Core.Dtos;
 
@@ -34,6 +36,9 @@ public abstract class MgOrderDto<TOrderItemDto, TProductDto> : MgEntityBase, IMo
     [Association(ThisKey = nameof(Id), OtherKey = nameof(OrderItem.OrderId), CanBeNull = true)]
     public List<TOrderItemDto> OrderItemDtos { get; set; }
 
+    [Association(ThisKey = nameof(Id), OtherKey = nameof(OrderNote.OrderId), CanBeNull = true)]
+    public List<OrderNote> OrderNotes { get; set; }
+
     public OrderStatus OrderStatus
     {
         get => (OrderStatus)OrderStatusId;

Mango.Nop.Core/Interfaces/IMgOrderDto.cs

@@ -34,6 +34,7 @@ public interface IMgOrderDto<TOrderItemDto, TProductDto> : IEntityInt, ISoftDele
 
     public Customer Customer { get; } //TODO: CustomerDto!!! - J.
     public List<TOrderItemDto> OrderItemDtos { get; }
+    public List<OrderNote> OrderNotes { get; }
 
     void InitializeOrderItemDtos(List<TOrderItemDto> orderItemDtos);
     void CopyEntityValuesToDto(Order entity, List<TOrderItemDto> orderItemDtos);

Mango.Nop.Core/NopDependencies/Catalogs/OrderNote.cs

@@ -0,0 +1,32 @@
+namespace Nop.Core.Domain.Orders;
+
+/// <summary>
+/// Represents an order note
+/// </summary>
+public partial class OrderNote : BaseEntity
+{
+    /// <summary>
+    /// Gets or sets the order identifier
+    /// </summary>
+    public int OrderId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the note
+    /// </summary>
+    public string Note { get; set; }
+
+    /// <summary>
+    /// Gets or sets the attached file (download) identifier
+    /// </summary>
+    public int DownloadId { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether a customer can see a note
+    /// </summary>
+    public bool DisplayToCustomer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the date and time of order note creation
+    /// </summary>
+    public DateTime CreatedOnUtc { get; set; }
+}