diff --git a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
index ba4827ae..6ee7a7c4 100644
--- a/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
+++ b/FruitBankHybrid.Shared.Tests/OrderClientTests.cs
@@ -4,6 +4,7 @@ using FruitBank.Common;
using FruitBank.Common.Loggers;
using FruitBankHybrid.Shared.Services.SignalRs;
using Nop.Core.Domain.Orders;
+using Nop.Core.Domain.Payments;
namespace FruitBankHybrid.Shared.Tests;
@@ -70,7 +71,7 @@ public sealed class OrderClientTests
Assert.IsNotNull(orderDtosForMeasuring);
//Assert.IsTrue(orderDtosForMeasuring.Any(x=>x.Id ==51));
- Assert.IsTrue(orderDtosForMeasuring.All(o => o.OrderStatus == OrderStatus.Pending));
+ Assert.IsTrue(orderDtosForMeasuring.All(o => o.PaymentStatus < PaymentStatus.Paid));
Assert.IsTrue(orderDtosForMeasuring.Count != 0);
}
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
index efe53821..96f4831c 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
@@ -21,7 +21,7 @@
-
+
@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
index d8999408..135eb2b7 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
@@ -35,7 +35,7 @@
-
+
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
index 16a55306..f0a1c4dc 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor
@@ -25,7 +25,7 @@
-
+
-
+
@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
index 8e6ff5a6..fdc76b28 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor
@@ -22,7 +22,7 @@
-
+
@if (IsMasterGrid)
diff --git a/FruitBankHybrid.Shared/Components/GridShippingItem.razor b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
index 20042de8..b2e573b7 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingItem.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingItem.razor
@@ -35,7 +35,7 @@
-
+
@* *@
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
index 0340a99c..05bee03a 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
@@ -110,6 +110,11 @@
*@
@ctxShippingitem.DisplayText)
+
+
+
+
@@ -133,7 +138,7 @@
@if (SelectedShippingItem is { ProductId: > 0 })
{
- @SelectedShippingItem.ProductName
+ #@(SelectedShippingItem.ProductId). @(SelectedShippingItem.ProductName)
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
index 5a5fe6db..01f6896c 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
@@ -57,6 +57,10 @@ namespace FruitBankHybrid.Shared.Pages
NotMeasuredShippings = shippings.Where(shipping => MeasurementService.DaysEqual(shipping.ShippingDate.Date, dateTime)).ToList();
SelectedShipping = NotMeasuredShippings.FirstOrDefault();
+ //if (SelectedShipping != null && SelectedShippingItem != null && (SelectedShippingItem.ShippingDocument?.ShippingId ?? 0) == SelectedShipping.Id)
+ //{
+ // SelectedShippingItem = _shippingItemsDataSource.
+ //}
LoadingPanelVisible = false;
}
@@ -130,6 +134,13 @@ namespace FruitBankHybrid.Shared.Pages
StateHasChanged();
}
+ private async Task OnOrdersRefreshClick()
+ {
+ LoadingPanelVisible = true;
+
+ await RefreshShippingsFromDb(SelectedShipping?.ShippingDate ?? DateTime.Now);
+ StateHasChanged();
+ }
private Task OnShippingItemPalletValueChanged(ShippingItemPallet shippingItemPallet, ShippingItem shippingItem)
{
@@ -140,17 +151,18 @@ namespace FruitBankHybrid.Shared.Pages
return Task.CompletedTask;
}
- private Task OnShippingItemPalletSaved(ShippingItemPallet? responseShippingItemPallet)
+ private async Task OnShippingItemPalletSaved(ShippingItemPallet? responseShippingItemPallet)
{
if (responseShippingItemPallet != null)
{
SelectedShippingItem!.ShippingItemPallets!.UpdateCollection(responseShippingItemPallet, false);
+ SelectedShippingItem.IsMeasured = SelectedShippingItem!.ShippingItemPallets!.All(sip => sip.IsMeasuredAndValid(SelectedShippingItem.IsMeasurable));
+
MeasuringValuesHelper.SetShippingItemTotalMeasuringValues(SelectedShippingItem);
}
else DisplayErrorText($"Sikertelen volt a raklap adatainak mentése!");
- StateHasChanged();
- return Task.CompletedTask;
+ await InvokeAsync(StateHasChanged);
}
private bool IsShippingitemPalletMeasuredAndValid(ShippingItemPallet shippingItemPallet)