diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor index 5d222e98..3d87187f 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor @@ -20,7 +20,7 @@ - + @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor index 97a9668d..333e4e89 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor @@ -1,6 +1,7 @@ @using AyCode.Blazor.Components.Components.Grids @using AyCode.Core.Helpers @using AyCode.Utils.Extensions +@using FruitBank.Common @using FruitBank.Common.Dtos @using FruitBank.Common.Models @using FruitBankHybrid.Shared.Components.Grids.GenericAttributes @@ -18,7 +19,7 @@ FilterMenuButtonDisplayMode="@(IsMasterGrid ? GridFilterMenuButtonDisplayMode.Never : GridFilterMenuButtonDisplayMode.Always)"> - + @@ -49,7 +50,7 @@ - + diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor index 4eff31bf..752983a8 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemPallets.razor @@ -1,5 +1,6 @@ @using AyCode.Blazor.Components.Components.Grids @using AyCode.Utils.Extensions +@using FruitBank.Common @using FruitBank.Common.Dtos @using FruitBank.Common.Entities @using FruitBank.Common.Models @@ -32,6 +33,10 @@ + + + + diff --git a/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor b/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor index 291c2864..dd2fd44a 100644 --- a/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor +++ b/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor @@ -1,10 +1,14 @@ -@using AyCode.Utils.Extensions +@using AyCode.Blazor.Components.Components.Grids +@using AyCode.Utils.Extensions +@using FruitBank.Common @using FruitBank.Common.Dtos @using FruitBank.Common.Entities +@using FruitBank.Common.Models @using FruitBankHybrid.Shared.Databases @using FruitBankHybrid.Shared.Services.SignalRs @inject FruitBankSignalRClient FruitBankSignalRClient +@inject LoggedInModel LoggedInModel + + + + diff --git a/FruitBankHybrid.Shared/Components/Grids/ShippingDocuments/GridShippingDocumentInfoPanel.razor b/FruitBankHybrid.Shared/Components/Grids/ShippingDocuments/GridShippingDocumentInfoPanel.razor index b20b4eac..9fb5e487 100644 --- a/FruitBankHybrid.Shared/Components/Grids/ShippingDocuments/GridShippingDocumentInfoPanel.razor +++ b/FruitBankHybrid.Shared/Components/Grids/ShippingDocuments/GridShippingDocumentInfoPanel.razor @@ -72,15 +72,16 @@ } -
-
- + *@ + + @*
@@ -113,13 +114,13 @@ if (dataItem is not ShippingDocument && dataItem is not ShippingItem) return; ShippingDocument? shippingDocument = null; - + if (dataItem is ShippingItem shippingItem) shippingDocument = shippingItem.ShippingDocument; else shippingDocument = dataItem as ShippingDocument; if (shippingDocument == null) return; - if (shippingDocument.ShippingDocumentToFiles?.Count > 0) + if (_lazyContentRef != null && shippingDocument.ShippingDocumentToFiles?.Count > 0) { // Store the PDF to render _randomPdf = _pdfFiles[Random.Shared.Next(_pdfFiles.Length)];