diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderController.cs b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderController.cs index b142565..e3bead1 100644 --- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderController.cs +++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderController.cs @@ -153,24 +153,59 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers #region CustomOrderSignalREndpoint - [NonAction] public Task> GetAllOrderDtos() => _customOrderSignalREndpoint.GetAllOrderDtos(); - [NonAction] public Task GetOrderDtoById(int orderId) => _customOrderSignalREndpoint.GetOrderDtoById(orderId); - [NonAction] public Task> GetPendingOrderDtos() => _customOrderSignalREndpoint.GetPendingOrderDtos(); - [NonAction] public Task> GetPendingOrderDtosForMeasuring() => _customOrderSignalREndpoint.GetPendingOrderDtosForMeasuring(); - [NonAction] public Task StartMeasuring(int orderId, int userId) => _customOrderSignalREndpoint.StartMeasuring(orderId, userId); - [NonAction] public Task SetOrderStatusToComplete(int orderId, int revisorId) => _customOrderSignalREndpoint.SetOrderStatusToComplete(orderId, revisorId); - [NonAction] public Task> GetAllOrderDtoByIds(int[] orderIds) => _customOrderSignalREndpoint.GetAllOrderDtoByIds(orderIds); - [NonAction] public Task> GetAllOrderItemDtos() => _customOrderSignalREndpoint.GetAllOrderItemDtos(); - [NonAction]public Task> GetAllOrderDtoByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderDtoByProductId(productId); - [NonAction]public Task GetOrderItemDtoById(int orderItemId) => _customOrderSignalREndpoint.GetOrderItemDtoById(orderItemId); - [NonAction]public Task> GetAllOrderItemDtoByOrderId(int orderId) => _customOrderSignalREndpoint.GetAllOrderItemDtoByOrderId(orderId); - [NonAction]public Task> GetAllOrderItemDtoByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderItemDtoByProductId(productId); - [NonAction] public Task> GetAllOrderItemPallets() => _customOrderSignalREndpoint.GetAllOrderItemPallets(); - [NonAction] public Task GetOrderItemPalletById(int orderItemPalletId) => _customOrderSignalREndpoint.GetOrderItemPalletById(orderItemPalletId); - [NonAction] public Task> GetAllOrderItemPalletByOrderItemId(int orderItemId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByOrderItemId(orderItemId); - [NonAction] public Task> GetAllOrderItemPalletByOrderId(int orderId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByOrderId(orderId); - [NonAction] public Task> GetAllOrderItemPalletByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByProductId(productId); - [NonAction]public Task AddOrUpdateMeasuredOrderItemPallet(OrderItemPallet orderItemPallet) => _customOrderSignalREndpoint.AddOrUpdateMeasuredOrderItemPallet(orderItemPallet); + [NonAction] + public Task> GetAllOrderDtos() => _customOrderSignalREndpoint.GetAllOrderDtos(); + + [NonAction] + public Task GetOrderDtoById(int orderId) => _customOrderSignalREndpoint.GetOrderDtoById(orderId); + + [NonAction] + public Task> GetPendingOrderDtos() => _customOrderSignalREndpoint.GetPendingOrderDtos(); + + [NonAction] + public Task> GetPendingOrderDtosForMeasuring() => _customOrderSignalREndpoint.GetPendingOrderDtosForMeasuring(); + + [NonAction] + public Task StartMeasuring(int orderId, int userId) => _customOrderSignalREndpoint.StartMeasuring(orderId, userId); + + [NonAction] + public Task SetOrderStatusToComplete(int orderId, int revisorId) => _customOrderSignalREndpoint.SetOrderStatusToComplete(orderId, revisorId); + + [NonAction] + public Task> GetAllOrderDtoByIds(int[] orderIds) => _customOrderSignalREndpoint.GetAllOrderDtoByIds(orderIds); + + [NonAction] + public Task> GetAllOrderItemDtos() => _customOrderSignalREndpoint.GetAllOrderItemDtos(); + + [NonAction] + public Task> GetAllOrderDtoByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderDtoByProductId(productId); + + [NonAction] + public Task GetOrderItemDtoById(int orderItemId) => _customOrderSignalREndpoint.GetOrderItemDtoById(orderItemId); + + [NonAction] + public Task> GetAllOrderItemDtoByOrderId(int orderId) => _customOrderSignalREndpoint.GetAllOrderItemDtoByOrderId(orderId); + + [NonAction] + public Task> GetAllOrderItemDtoByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderItemDtoByProductId(productId); + + [NonAction] + public Task> GetAllOrderItemPallets() => _customOrderSignalREndpoint.GetAllOrderItemPallets(); + + [NonAction] + public Task GetOrderItemPalletById(int orderItemPalletId) => _customOrderSignalREndpoint.GetOrderItemPalletById(orderItemPalletId); + + [NonAction] + public Task> GetAllOrderItemPalletByOrderItemId(int orderItemId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByOrderItemId(orderItemId); + + [NonAction] + public Task> GetAllOrderItemPalletByOrderId(int orderId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByOrderId(orderId); + + [NonAction] + public Task> GetAllOrderItemPalletByProductId(int productId) => _customOrderSignalREndpoint.GetAllOrderItemPalletByProductId(productId); + + [NonAction] + public Task AddOrUpdateMeasuredOrderItemPallet(OrderItemPallet orderItemPallet) => _customOrderSignalREndpoint.AddOrUpdateMeasuredOrderItemPallet(orderItemPallet); #endregion CustomOrderSignalREndpoint @@ -184,8 +219,8 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers PaymentStatusIds = paymentStatuses, ShippingStatusIds = shippingStatuses, AvailablePageSizes = "20,50,100,500", - - }); + + }); return View("~/Plugins/Misc.FruitBankPlugin/Areas/Admin/Views/Order/List.cshtml", model); } @@ -281,8 +316,8 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers ? sortedData.OrderBy(o => o.Id) : sortedData.OrderByDescending(o => o.Id), "customercompany" => searchModel.SortColumnDirection == "asc" - ? sortedData.OrderBy(o => o.CustomerCompany) - : sortedData.OrderByDescending(o => o.CustomerCompany), + ? sortedData.OrderBy(o => o.CustomerCompany) + : sortedData.OrderByDescending(o => o.CustomerCompany), "customordernumber" => searchModel.SortColumnDirection == "asc" ? sortedData.OrderBy(o => o.CustomOrderNumber) : sortedData.OrderByDescending(o => o.CustomOrderNumber), @@ -1056,6 +1091,7 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers return RedirectToAction("List"); } } + #endregion [HttpPost] @@ -1064,25 +1100,24 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers { try { - if (string.IsNullOrWhiteSpace(message)) { return Json(new { success = false, message = "Az üzenet nem lehet üres" }); } var orderDto = await _dbContext.OrderDtos.GetByIdAsync(orderId, true); - await _sendToClient.SendMeasuringNotification("Módosult a rendelés, mérjétek újra!", orderDto); + + await _sendToClient.SendMeasuringNotification(message, orderDto); return Json(new { success = true, message = "Üzenet sikeresen elküldve" }); } catch (Exception ex) { - + _logger.Error($"Error sending notification for order {orderId}", ex); return Json(new { success = false, message = $"Hiba történt: {ex.Message}" }); } } - } }