Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Adam:343fb818c7b76c821bcda9d9185cbf959bb6ab26
Branches Tags
Adam:main
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
..
compare: Adam:ffa4e2cc31c159acf1b1bfcadd74fc49186521d6
Branches Tags
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
Adam:main

No commits in common. "343fb818c7b76c821bcda9d9185cbf959bb6ab26" and "ffa4e2cc31c159acf1b1bfcadd74fc49186521d6" have entirely different histories.
343fb818c7 ... ffa4e2cc31

10 changed files with 48 additions and 159 deletions
Show Stats Expand all files Collapse all files

3
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderController.cs
View File

@ -168,11 +168,12 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers
return RedirectToAction("List"); return RedirectToAction("List");
//prepare model //prepare model
var model = await _orderModelFactory.PrepareOrderModelExtendedAsync(null, order); var model = await _orderModelFactory.PrepareOrderModelAsync(null, order);
return View("~/Plugins/Misc.FruitBankPlugin/Areas/Admin/Views/Order/Edit.cshtml", model); return View("~/Plugins/Misc.FruitBankPlugin/Areas/Admin/Views/Order/Edit.cshtml", model);
} }
public async Task<OrderListModelExtended> GetOrderListModelByFilter(OrderSearchModel searchModel) public async Task<OrderListModelExtended> GetOrderListModelByFilter(OrderSearchModel searchModel)
{ {
//return _customOrderService. //return _customOrderService.

2
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/Edit.cshtml
View File

@ -1,4 +1,4 @@
@model Nop.Plugin.Misc.FruitBankPlugin.Models.Orders.OrderModelExtended @model OrderModel
@{ @{

20
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
View File

@ -307,8 +307,6 @@
Name = "orders-grid", Name = "orders-grid",
UrlRead = new DataUrl("OrderList", "CustomOrder", null), UrlRead = new DataUrl("OrderList", "CustomOrder", null),
SearchButtonId = "search-orders", SearchButtonId = "search-orders",
Ordering = true,
ServerSide = false,
Length = Model.PageSize, Length = Model.PageSize,
LengthMenu = Model.AvailablePageSizes, LengthMenu = Model.AvailablePageSizes,
FooterCallback = !Model.IsLoggedInAsVendor ? "ordersfootercallback" : null, FooterCallback = !Model.IsLoggedInAsVendor ? "ordersfootercallback" : null,
@ -350,28 +348,27 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.CustomerCompany)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.CustomerCompany))
{ {
Title = T("Admin.Orders.Fields.Customer").Text, Title = T("Admin.Orders.Fields.Customer").Text,
Width = "150"
//Render = new RenderCustom("renderColumnCustomer") //Render = new RenderCustom("renderColumnCustomer")
}); });
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasurable)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasurable))
{ {
Title = T($"FruitBank.{nameof(OrderModelExtended.IsMeasurable)}").Text, Title = T("Admin.Orders.Fields.IsMeasurable").Text,
Width = "80", Width = "100",
Render = new RenderCustom("renderColumnIsMeasurable"), Render = new RenderCustom("renderColumnIsMeasurable"),
ClassName = NopColumnClassDefaults.CenterAll ClassName = NopColumnClassDefaults.CenterAll
}); });
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasured)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModelExtended.IsMeasured))
{ {
Title = T($"FruitBank.{nameof(OrderModelExtended.IsMeasured)}").Text, Title = T("Admin.Orders.Fields.IsMeasured").Text,
Width = "80", Width = "100",
Render = new RenderCustom("renderColumnIsMeasurable"), Render = new RenderCustom("renderColumnIsMeasurable"),
ClassName = NopColumnClassDefaults.CenterAll ClassName = NopColumnClassDefaults.CenterAll
}); });
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(IOrderDto.DateOfReceipt)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(IOrderDto.DateOfReceipt))
{ {
Title = T($"FruitBank.{nameof(IOrderDto.DateOfReceipt)}").Text, Title = T("Admin.Orders.Fields.PickupDate").Text,
Width = "100", Width = "100",
Render = new RenderCustom("renderColumnPickupDateAndTime"), Render = new RenderCustom("renderColumnPickupDateAndTime"),
ClassName = NopColumnClassDefaults.CenterAll ClassName = NopColumnClassDefaults.CenterAll
@ -390,7 +387,7 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.PaymentStatus)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.PaymentStatus))
{ {
Title = T("Admin.Orders.Fields.PaymentStatus").Text, Title = T("Admin.Orders.Fields.PaymentStatus").Text,
Width = "130" Width = "150"
}); });
//a vendor does not have access to this functionality //a vendor does not have access to this functionality
if (!Model.IsLoggedInAsVendor) if (!Model.IsLoggedInAsVendor)
@ -398,9 +395,10 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.ShippingStatus)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.ShippingStatus))
{ {
Title = T("Admin.Orders.Fields.ShippingStatus").Text, Title = T("Admin.Orders.Fields.ShippingStatus").Text,
Width = "130" Width = "150"
}); });
} }
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName))
{ {
Title = T("Admin.Orders.Fields.Store").Text, Title = T("Admin.Orders.Fields.Store").Text,
@ -410,7 +408,7 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.CreatedOn)) gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.CreatedOn))
{ {
Title = T("Admin.Orders.Fields.CreatedOn").Text, Title = T("Admin.Orders.Fields.CreatedOn").Text,
Width = "100", Width = "120",
Render = new RenderDate() Render = new RenderDate()
}); });
//a vendor does not have access to this functionality //a vendor does not have access to this functionality

73
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
View File

@ -1,11 +1,11 @@
@model Nop.Plugin.Misc.FruitBankPlugin.Models.Orders.OrderModelExtended @model OrderModel
@using Nop.Core.Domain.Tax; @using Nop.Core.Domain.Tax;
@using Nop.Core.Domain.Catalog; @using Nop.Core.Domain.Catalog;
<div class="card-body"> <div class="card-body">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12" style="overflow-x: auto;"> <div class="col-md-12" style="overflow-x: auto;">ANYÁD!!!!!
@foreach (var item in Model.Items) @foreach (var item in Model.Items)
{ {
<script> <script>
@ -20,18 +20,6 @@
// Function to automatically calculate and update total price // Function to automatically calculate and update total price
function calculateTotal@(item.Id)() { function calculateTotal@(item.Id)() {
// Get values // Get values
@* var isMeasurable = ($('#pvIsMeasurable@(item.Id)').val()).toLowerCase() === "true"; *@
var isMeasurable = $($('#pvIsMeasurable@(item.Id)')).is(':checked');
console.log(isMeasurable);
console.log(($('#pvIsMeasurable@(item.Id)')));
console.log(($('#pvIsMeasurable@(item.Id)').val()));
console.log(($('#pvIsMeasurable@(item.Id)').val()).toLowerCase());
var netWeight = parseFloat($('#pvNetWeight@(item.Id)').val()) || 0;
var unitPriceInclTax = parseFloat($('#pvUnitPriceInclTax@(item.Id)').val()) || 0; var unitPriceInclTax = parseFloat($('#pvUnitPriceInclTax@(item.Id)').val()) || 0;
var unitPriceExclTax = parseFloat($('#pvUnitPriceExclTax@(item.Id)').val()) || 0; var unitPriceExclTax = parseFloat($('#pvUnitPriceExclTax@(item.Id)').val()) || 0;
var quantity = parseFloat($('#pvQuantity@(item.Id)').val()) || 0; var quantity = parseFloat($('#pvQuantity@(item.Id)').val()) || 0;
@ -39,8 +27,8 @@
var discountExclTax = parseFloat($('#pvDiscountExclTax@(item.Id)').val()) || 0; var discountExclTax = parseFloat($('#pvDiscountExclTax@(item.Id)').val()) || 0;
// Calculate totals // Calculate totals
var totalInclTax = (unitPriceInclTax * (isMeasurable ? netWeight : quantity)) - discountInclTax; var totalInclTax = (unitPriceInclTax * quantity) - discountInclTax;
var totalExclTax = (unitPriceExclTax * (isMeasurable ? netWeight : quantity)) - discountExclTax; var totalExclTax = (unitPriceExclTax * quantity) - discountExclTax;
// Update total price fields // Update total price fields
$('#pvPriceInclTax@(item.Id)').val(totalInclTax.toFixed(0)); $('#pvPriceInclTax@(item.Id)').val(totalInclTax.toFixed(0));
@ -129,21 +117,12 @@
<th> <th>
@T("Admin.Orders.Products.Price") @T("Admin.Orders.Products.Price")
</th> </th>
<th>
@T("FruitBank.IsMeasurable")
</th>
<th>
@T("FruitBank.StockQuantity")
</th>
<th> <th>
@T("Admin.Orders.Products.Quantity") @T("Admin.Orders.Products.Quantity")
</th> </th>
<th> <th>
@T("FruitBank.NetWeight")
</th>
@* <th>
@T("Admin.Orders.Products.Discount") @T("Admin.Orders.Products.Discount")
</th> *@ </th>
<th> <th>
@T("Admin.Orders.Products.Total") @T("Admin.Orders.Products.Total")
</th> </th>
@ -156,7 +135,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var item in Model.ItemExtendeds) @foreach (var item in Model.Items)
{ {
<tr> <tr>
<td class="text-center preview"> <td class="text-center preview">
@ -261,7 +240,7 @@
<input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@item.UnitPriceInclTaxValue" id="pvUnitPriceInclTax@(item.Id)" class="form-control input-sm" /> <input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@item.UnitPriceInclTaxValue" id="pvUnitPriceInclTax@(item.Id)" class="form-control input-sm" />
</div> </div>
</div> </div>
@* <div class="form-group row"> <div class="form-group row">
<div class="col-md-5"> <div class="col-md-5">
@T("Admin.Orders.Products.Edit.ExclTax") @T("Admin.Orders.Products.Edit.ExclTax")
</div> </div>
@ -269,35 +248,19 @@
<input name="pvUnitPriceExclTax@(item.Id)" type="text" value="@item.UnitPriceExclTaxValue" id="pvUnitPriceExclTax@(item.Id)" class="form-control input-sm" /> <input name="pvUnitPriceExclTax@(item.Id)" type="text" value="@item.UnitPriceExclTaxValue" id="pvUnitPriceExclTax@(item.Id)" class="form-control input-sm" />
</div> </div>
</div> </div>
*@ </div> </div>
</td> </td>
<td style="width: 80px;" class="text-center">
<div><input type="checkbox" name="pvIsMeasurable@(item.Id)" id="pvIsMeasurable@(item.Id)" @(item.IsMeasurable ? " checked" : "") disabled /></div>
</td>
<td style="width: 80px;" class="text-center">
<div>@($"{item.ProductStockQuantity}{(item.ProductIncomingQuantity > 0 ? " (+"+item.ProductIncomingQuantity + ")" : string.Empty)}")</div>
</td>
<td style="width: 10%;" class="text-center"> <td style="width: 10%;" class="text-center">
<div>@item.Quantity</div> <div>@item.Quantity</div>
<div id="pnlEditPvQuantity@(item.Id)"> <div id="pnlEditPvQuantity@(item.Id)">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-8 offset-md-2"> <div class="col-md-8 offset-md-2">
<input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity)" min="0" <input name="pvQuantity@(item.Id)" type="text" value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" /> </div>
</div>
</div> </div>
</div> </div>
</td> </td>
<td style="width: 15%;" class="text-center">
<td style="width: 80px;" class="text-center">
@* <div name="pvNetWeight@(item.Id)" id="pvNetWeight@(item.Id)">@item.NetWeight</div> *@
<div><input name="pvNetWeight@(item.Id)" id="pvNetWeight@(item.Id)" value='@item.NetWeight' disabled /></div>
</td>
@* <td style="width: 15%;" class="text-center">
@if (Model.AllowCustomersToSelectTaxDisplayType) @if (Model.AllowCustomersToSelectTaxDisplayType)
{ {
<div>@Html.Raw(item.DiscountInclTax)</div> <div>@Html.Raw(item.DiscountInclTax)</div>
@ -339,8 +302,8 @@
</div> </div>
</div> </div>
</div> </div>
</td> *@ </td>
<td style="width: 15%;" class="text-center;"> <td style="width: 15%;" class="text-center">
@if (Model.AllowCustomersToSelectTaxDisplayType) @if (Model.AllowCustomersToSelectTaxDisplayType)
{ {
<div>@Html.Raw(item.SubTotalInclTax)</div> <div>@Html.Raw(item.SubTotalInclTax)</div>
@ -370,18 +333,18 @@
@T("Admin.Orders.Products.Edit.InclTax") @T("Admin.Orders.Products.Edit.InclTax")
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input name="pvPriceInclTax@(item.Id)" disabled type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)" class="form-control input-sm" /> <input name="pvPriceInclTax@(item.Id)" type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)" class="form-control input-sm" />
</div> </div>
</div> </div>
@* <div class="form-group row"> <div class="form-group row">
<div class="col-md-5"> <div class="col-md-5">
@T("Admin.Orders.Products.Edit.ExclTax") @T("Admin.Orders.Products.Edit.ExclTax")
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input name="pvPriceExclTax@(item.Id)" disabled type="text" value="@item.SubTotalExclTaxValue" id="pvPriceExclTax@(item.Id)" class="form-control input-sm" /> <input name="pvPriceExclTax@(item.Id)" type="text" value="@item.SubTotalExclTaxValue" id="pvPriceExclTax@(item.Id)" class="form-control input-sm" />
</div> </div>
</div>*@ </div>
</div> </div>
</td> </td>
@if (!Model.IsLoggedInAsVendor) @if (!Model.IsLoggedInAsVendor)
{ {

6
Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemDtoDbTable.cs
View File

@ -26,9 +26,7 @@ public class OrderItemDtoDbTable : MgDtoDbTableBase<OrderItemDto, OrderItem>
.LoadWith(oi => oi.ProductDto).ThenLoad(prod => prod.GenericAttributes); .LoadWith(oi => oi.ProductDto).ThenLoad(prod => prod.GenericAttributes);
} }
public Task<OrderItemDto> GetByIdAsync(int orderItemId, bool loadRelations) => GetAll(loadRelations).Where(oi => oi.Id == orderItemId).FirstOrDefaultAsync(null); public Task<OrderItemDto> GetByIdAsync(int orderItemId, bool loadRelations) => GetAll(loadRelations).Where(x => x.Id == orderItemId).FirstOrDefaultAsync(null);
public IQueryable<OrderItemDto> GetAllByOrderId(int orderId, bool loadRelations = true)=> GetAll(loadRelations).Where(oi => oi.OrderId == orderId); public IQueryable<OrderItemDto> GetAllByOrderId(int orderId, bool loadRelations = true)=> GetAll(loadRelations).Where(o => o.OrderId == orderId);
public IQueryable<OrderItemDto> GetAllByIds(IEnumerable<int> orderItemIds, bool loadRelations = true) => GetAll(loadRelations).Where(oi => orderItemIds.Contains(oi.Id));
} }

4
Nop.Plugin.Misc.AIPlugin/Domains/EventConsumers/FruitBankEventConsumer.cs
View File

@ -31,7 +31,7 @@ public class FruitBankEventConsumer :
IConsumer<EntityInsertedEvent<OrderItem>>, IConsumer<EntityInsertedEvent<OrderItem>>,
IConsumer<EntityUpdatedEvent<OrderItem>> IConsumer<EntityUpdatedEvent<OrderItem>>
{ {
private readonly CustomPriceCalculationService _customPriceCalculationService; private CustomPriceCalculationService _customPriceCalculationService;
private readonly FruitBankDbContext _ctx; private readonly FruitBankDbContext _ctx;
private readonly FruitBankAttributeService _fruitBankAttributeService; private readonly FruitBankAttributeService _fruitBankAttributeService;
@ -44,6 +44,7 @@ public class FruitBankEventConsumer :
_customPriceCalculationService = customPriceCalculationService as CustomPriceCalculationService; _customPriceCalculationService = customPriceCalculationService as CustomPriceCalculationService;
} }
public override async Task HandleEventAsync(EntityUpdatedEvent<Product> eventMessage) public override async Task HandleEventAsync(EntityUpdatedEvent<Product> eventMessage)
{ {
var product = await CheckAndUpdateProductManageInventoryMethodToManageStock(eventMessage.Entity); var product = await CheckAndUpdateProductManageInventoryMethodToManageStock(eventMessage.Entity);
@ -82,6 +83,7 @@ public class FruitBankEventConsumer :
/// <param name="product"></param> /// <param name="product"></param>
/// <returns>IsMeasureable</returns> /// <returns>IsMeasureable</returns>
/// <exception cref="Exception"></exception> /// <exception cref="Exception"></exception>
private async Task<(bool IsMeasurableChanged, bool? IsMeasurable)> SaveProductCustomAttributesAsync(Product product) private async Task<(bool IsMeasurableChanged, bool? IsMeasurable)> SaveProductCustomAttributesAsync(Product product)
{ {
if (product == null) return (false, null); if (product == null) return (false, null);

60
Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs
View File

@ -167,61 +167,21 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Factories
orderDtosById ??= await _ctx.OrderDtos.GetAllByIds(orderListModel.Data.Select(x => x.Id)).ToDictionaryAsync(k => k.Id, v => v); orderDtosById ??= await _ctx.OrderDtos.GetAllByIds(orderListModel.Data.Select(x => x.Id)).ToDictionaryAsync(k => k.Id, v => v);
var orderDto = orderDtosById[orderModelExtended.Id]; var orderDto = orderDtosById[orderModelExtended.Id];
PrepareOrderModelExtended(orderModelExtended, orderDto); orderModelExtended.IsMeasured = orderDto.IsMeasured;
orderModelExtended.IsMeasurable = orderDto.IsMeasurable;
orderModelExtended.DateOfReceipt = orderDto.DateOfReceipt;
orderModelExtended.CustomerCompany = orderDto.Customer.Company;
//orderModelExtended.IsMeasurable = await ShouldMarkAsNeedsMeasurementAsync(orderModel);
//orderModelExtended.DateOfReceipt = await GetPickupDateTimeAsync(orderModel);
//Console.WriteLine(orderModelExtended.Id);
}); });
return orderListModelExtended; return orderListModelExtended;
} }
private static void PrepareOrderModelExtended(OrderModelExtended orderModelExtended, OrderDto orderDto)
{
orderModelExtended.IsMeasured = orderDto.IsMeasured;
orderModelExtended.IsMeasurable = orderDto.IsMeasurable;
orderModelExtended.DateOfReceipt = orderDto.DateOfReceipt;
orderModelExtended.OrderTotal = !orderDto.IsComplete && orderDto.IsMeasurable ? "Kalkuláció alatt..." : orderModelExtended.OrderTotal;
orderModelExtended.CustomerCompany = orderDto.Customer.Company;
}
public override async Task<OrderModel> PrepareOrderModelAsync(OrderModel model, Order order, bool excludeProperties = false)
{
return await base.PrepareOrderModelAsync(model, order, excludeProperties);
}
public async Task<OrderModelExtended> PrepareOrderModelExtendedAsync(OrderModel model, Order order, bool excludeProperties = false)
{
var orderModel = await base.PrepareOrderModelAsync(model, order, excludeProperties);
var orderModelExtended = new OrderModelExtended();
PropertyHelper.CopyPublicValueTypeProperties(orderModel, orderModelExtended);
var orderDto = await _ctx.OrderDtos.GetByIdAsync(order.Id, true);
PrepareOrderModelExtended(orderModelExtended, orderDto);
var orderItemDtosById = await _ctx.OrderItemDtos.GetAllByIds(orderModelExtended.Items.Select(oi => oi.Id)).ToDictionaryAsync(k => k.Id, v => v);
foreach (var orderItemModel in orderModelExtended.Items)
{
var orderItemModelExtended = new OrderItemModelExtended();
PropertyHelper.CopyPublicValueTypeProperties(orderItemModel, orderItemModelExtended);
var orderItemDto = orderItemDtosById[orderItemModelExtended.Id];
orderItemModelExtended.IsMeasured = orderItemDto.IsMeasured;
orderItemModelExtended.IsMeasurable = orderItemDto.IsMeasurable;
orderItemModelExtended.NetWeight = (decimal)orderItemDto.NetWeight;
orderItemModelExtended.ProductStockQuantity = orderItemDto.ProductDto!.StockQuantity;
orderItemModelExtended.ProductIncomingQuantity = orderItemDto.ProductDto.IncomingQuantity;
orderModelExtended.ItemExtendeds ??= new List<OrderItemModelExtended>();
orderModelExtended.ItemExtendeds.Add(orderItemModelExtended);
//var a = orderItemModelExtended;
//var gf= $"{a.ProductStockQuantity} {(a.ProductIncomingQuantity > 0 ? a.ProductIncomingQuantity.ToString() : string.Empty)}";
}
//orderModelExtended.Items.Clear();
return orderModelExtended;
}
// example async custom logic // example async custom logic
private async Task<bool> ShouldMarkAsNeedsMeasurementAsync(OrderModel order) private async Task<bool> ShouldMarkAsNeedsMeasurementAsync(OrderModel order)
{ {

9
Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs
View File

@ -3,15 +3,6 @@ using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders; namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders;
public interface IOrderItemModelExtended //: IMgOrderItemModelExtended, IMeasurable, IMeasured
{
bool IsMeasured { get; set; }
bool IsMeasurable { get; set; }
decimal NetWeight { get; set; }
int ProductStockQuantity { get; set; }
int ProductIncomingQuantity { get; set; }
}
public interface IOrderModelExtended : IMgOrderModelExtended, IMeasurable, IMeasured public interface IOrderModelExtended : IMgOrderModelExtended, IMeasurable, IMeasured
{ {
DateTime? DateOfReceipt { get; set; } DateTime? DateOfReceipt { get; set; }

12
Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs
View File

@ -1,17 +1,7 @@
using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels; using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
using Nop.Web.Areas.Admin.Models.Orders;
namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
{ {
public partial record OrderItemModelExtended : /*MgOrderItemModelExtended*/ OrderItemModel, IOrderItemModelExtended
{
public bool IsMeasured { get; set; }
public bool IsMeasurable { get; set; }
public decimal NetWeight { get; set; }
public int ProductStockQuantity { get; set; }
public int ProductIncomingQuantity { get; set; }
}
public partial record OrderModelExtended : MgOrderModelExtended, IOrderModelExtended public partial record OrderModelExtended : MgOrderModelExtended, IOrderModelExtended
{ {
public bool IsMeasured { get; set; } public bool IsMeasured { get; set; }
@ -19,8 +9,6 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
public DateTime? DateOfReceipt { get; set; } public DateTime? DateOfReceipt { get; set; }
public string CustomerCompany { get; set; } public string CustomerCompany { get; set; }
public IList<OrderItemModelExtended> ItemExtendeds { get; set; }
} }
} }

16
Nop.Plugin.Misc.AIPlugin/Services/CustomPriceCalculationService.cs
View File

@ -74,12 +74,6 @@ public class CustomPriceCalculationService : PriceCalculationService
return await CheckAndUpdateOrderItemFinalPricesAsync(orderItem, orderItemDto); return await CheckAndUpdateOrderItemFinalPricesAsync(orderItem, orderItemDto);
} }
/// <summary>
///
/// </summary>
/// <param name="orderItem"></param>
/// <param name="orderItemDto"></param>
/// <returns>true if has changes</returns>
public async Task<bool> CheckAndUpdateOrderItemFinalPricesAsync(OrderItem orderItem, OrderItemDto orderItemDto) public async Task<bool> CheckAndUpdateOrderItemFinalPricesAsync(OrderItem orderItem, OrderItemDto orderItemDto)
{ {
_logger.Info($"CustomPriceCalculationService->CheckAndUpdateOrderItemFinalPricesAsync; orderItem.Id: {orderItem.Id}"); _logger.Info($"CustomPriceCalculationService->CheckAndUpdateOrderItemFinalPricesAsync; orderItem.Id: {orderItem.Id}");
@ -100,12 +94,7 @@ public class CustomPriceCalculationService : PriceCalculationService
return true; return true;
} }
/// <summary> public async Task CheckAndUpdateOrderTotalPrice(Order order)
///
/// </summary>
/// <param name="order"></param>
/// <returns>true if has changes</returns>
public async Task<bool> CheckAndUpdateOrderTotalPrice(Order order)
{ {
var prevOrderTotal = order.OrderTotal; var prevOrderTotal = order.OrderTotal;
var orderItemDtos = await _dbContext.OrderItemDtos.GetAllByOrderId(order.Id).ToListAsync(); var orderItemDtos = await _dbContext.OrderItemDtos.GetAllByOrderId(order.Id).ToListAsync();
@ -118,7 +107,7 @@ public class CustomPriceCalculationService : PriceCalculationService
order.OrderTotal += itemDto.PriceInclTax; order.OrderTotal += itemDto.PriceInclTax;
} }
if (order.OrderTotal == prevOrderTotal) return false; if (order.OrderTotal == prevOrderTotal) return;
_logger.Error($"HandleEventAsync->CheckAndUpdateOrderItemFinalPrices; order.OrderTotal({order.OrderTotal}) == prevOrderTotal({prevOrderTotal})"); _logger.Error($"HandleEventAsync->CheckAndUpdateOrderItemFinalPrices; order.OrderTotal({order.OrderTotal}) == prevOrderTotal({prevOrderTotal})");
@ -128,7 +117,6 @@ public class CustomPriceCalculationService : PriceCalculationService
order.OrderSubTotalDiscountExclTax = order.OrderTotal; order.OrderSubTotalDiscountExclTax = order.OrderTotal;
await _dbContext.Orders.UpdateAsync(order); await _dbContext.Orders.UpdateAsync(order);
return true;
} }
//public override async Task<(decimal priceWithoutDiscounts, decimal finalPrice, decimal appliedDiscountAmount, List<Discount> appliedDiscounts)> GetFinalPriceAsync( //public override async Task<(decimal priceWithoutDiscounts, decimal finalPrice, decimal appliedDiscountAmount, List<Discount> appliedDiscounts)> GetFinalPriceAsync(