From 288b81f8f5fcb7f05dd8edd4cba91d35e633b212 Mon Sep 17 00:00:00 2001
From: Adam <adam.g@aycode.com>
Date: Mon, 2 Mar 2026 12:14:20 +0100
Subject: [PATCH] shipping updates

---
 .../FruitBank.Common.Server.csproj                  |  4 +++-
 FruitBank.Common/Entities/Shipping.cs               |  7 +++++--
 .../Components/Grids/Shippings/GridShipping.razor   | 13 +++++++------
 FruitBankHybrid/FruitBankHybrid.csproj              |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/FruitBank.Common.Server/FruitBank.Common.Server.csproj b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
index f73953cb..2cc380da 100644
--- a/FruitBank.Common.Server/FruitBank.Common.Server.csproj
+++ b/FruitBank.Common.Server/FruitBank.Common.Server.csproj
@@ -11,7 +11,9 @@
 		<PackageReference Include="MessagePack" Version="3.1.4" />
 		<PackageReference Include="MessagePack.Annotations" Version="3.1.4" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="9.0.11" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="9.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.11" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.11" />
 		<!--<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.2.0" />-->
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.11" />
@@ -39,7 +41,7 @@
 			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.Server.dll</HintPath>
 		</Reference>
 		<Reference Include="Microsoft.AspNetCore.SignalR.Core">
-			<HintPath>C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.11\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll</HintPath>
+			<HintPath>C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.12\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll</HintPath>
 		</Reference>
 		<Reference Include="Mango.Nop.Core">
 			<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Mango.Nop.Core.dll</HintPath>
diff --git a/FruitBank.Common/Entities/Shipping.cs b/FruitBank.Common/Entities/Shipping.cs
index 704e893a..d3f72043 100644
--- a/FruitBank.Common/Entities/Shipping.cs
+++ b/FruitBank.Common/Entities/Shipping.cs
@@ -1,4 +1,5 @@
-using FruitBank.Common.Interfaces;
+using AyCode.Interfaces.EntityComment;
+using FruitBank.Common.Interfaces;
 using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 
@@ -6,11 +7,13 @@ namespace FruitBank.Common.Entities;
 
 [Table(Name = FruitBankConstClient.ShippingDbTableName)]
 [System.ComponentModel.DataAnnotations.Schema.Table(FruitBankConstClient.ShippingDbTableName)]
-public class Shipping : MgEntityBase, IShipping
+public class Shipping : MgEntityBase, IShipping, IEntityComment
 {
     public DateTime ShippingDate { get; set; } = DateTime.Now;
     public string LicencePlate { get; set; }
     public bool IsAllMeasured { get; set; }
+    public string? Comment { get; set; } = string.Empty;
+    public string? CargoCompany { get; set; }
 
     public DateTime? MeasuredDate { get; set; }
 
diff --git a/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor b/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor
index 6142714a..03564592 100644
--- a/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor
+++ b/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor
@@ -23,12 +23,13 @@
 			<Columns>
 				<DxGridDataColumn FieldName="Id" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" ReadOnly="true" />
 
-				<DxGridDataColumn FieldName="ShippingDate" />
-				<DxGridDataColumn FieldName="LicencePlate" />
-
-				<DxGridDataColumn FieldName="IsAllMeasured" ReadOnly="true" />
-				<DxGridDataColumn FieldName="Created" ReadOnly="true" />
-				<DxGridDataColumn FieldName="Modified" ReadOnly="true" />
+				<DxGridDataColumn FieldName="ShippingDate" Caption="Beérkezés"/>
+				<DxGridDataColumn FieldName="LicencePlate" Caption="Rendszám" />
+				<DxGridDataColumn FieldName="Comment" Caption="Megjegyzés" ReadOnly="false" />
+				<DxGridDataColumn FieldName="CargoCompany" Caption="Fuvarozó" ReadOnly="false" />
+				<DxGridDataColumn FieldName="IsAllMeasured" Caption="Mérések kész" ReadOnly="true" />
+				<DxGridDataColumn FieldName="Created" Caption="Létrehozva" ReadOnly="true" />
+				<DxGridDataColumn FieldName="Modified" Caption="Módosítva" ReadOnly="true" />
 				<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 			</Columns>
 			<DetailRowTemplate>
diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj
index 00784ad2..f25059b0 100644
--- a/FruitBankHybrid/FruitBankHybrid.csproj
+++ b/FruitBankHybrid/FruitBankHybrid.csproj
@@ -19,7 +19,7 @@
 		<ApplicationId>com.mango.fruitbank</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.0.1</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<RunAOTCompilation>false</RunAOTCompilation>