diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index 74da7370..f5694a2f 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -12,6 +12,7 @@ @using TIAMWebApp.Shared.Application.Interfaces @using AyCode.Services.Loggers @using TIAM.Core.Enums +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility @@ -152,7 +153,8 @@ else

Status on: @DateTime.Now.ToString("hh:mm tt"), @DateTime.Today.ToString("MMMM dd, yyyy")

-
@Enum.GetName(typeof(TransferStatusType), _transfer.TransferStatusType)
+
@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType);
+
diff --git a/TIAMSharedUI/Pages/User/CardComponents/ProductCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/ProductCardComponent.razor index fe39c4ab..7de9abe0 100644 --- a/TIAMSharedUI/Pages/User/CardComponents/ProductCardComponent.razor +++ b/TIAMSharedUI/Pages/User/CardComponents/ProductCardComponent.razor @@ -139,6 +139,7 @@ protected override async Task OnInitializedAsync() { + await AdminSignalRClient.GetTransferDestinationsAsync(_destinations); var productOwner = await AdminSignalRClient.GetByIdAsync>(SignalRTags.GetCompaniesById, Context.ServiceProviderId); var productProfiles = await AdminSignalRClient.GetByIdAsync>(SignalRTags.GetProfileById, Context.ProfileId); @@ -153,7 +154,7 @@ _isAddressTransferDestination = CheckDestinations(_productProfile.AddressId); } - AdminSignalRClient.GetTransferDestinationsAsync(_destinations).Forget(); + await base.OnInitializedAsync(); } diff --git a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor index 744be4c9..2e16e3f0 100644 --- a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor +++ b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor @@ -154,6 +154,8 @@ [Parameter] public EventCallback DataChanged { get; set; } + [Parameter] public string Role { get; set; } + private LoggerClient _logger = null!; //Email @@ -301,7 +303,7 @@ void SendMail(Transfer item) { _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}"); - _messageWizardModel.Subject = $"[#{item.OrderId}] New message from guest"; + _messageWizardModel.Subject = $"[#{item.OrderId}] New message from {Role}"; _messageWizardModel.ReceiverId = TiamConstClient.SysAccounts["SystemEmailSender"]; //get first sysadmin diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor index 54121d0e..b6c9d782 100644 --- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor @@ -124,7 +124,7 @@ - + @@ -373,8 +373,15 @@ case 5: return "text-danger fa-solid fa-triangle-exclamation"; - case > 5 and < 35: - return "text-warning fa-solid fa-triangle-exclamation"; + case 10: + return "text-primary fa-solid fa-circle-xmark"; + + case 15: + + return "text-primary fa-solid fa-circle-question"; + + case > 15 and <35: + return "text-success fa-solid fa-clock-rotate-left"; case 35: return "text-success fa-solid fa-circle-check"; diff --git a/TIAMSharedUI/Pages/User/UserManageTransfers.razor b/TIAMSharedUI/Pages/User/UserManageTransfers.razor index 71974a80..4cbdbc0c 100644 --- a/TIAMSharedUI/Pages/User/UserManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/UserManageTransfers.razor @@ -117,7 +117,7 @@ - + @@ -368,8 +368,9 @@ return "text-danger fa-solid fa-triangle-exclamation"; case > 5 and < 35: - return "text-warning fa-solid fa-triangle-exclamation"; - + + return "text-primary fa-solid fa-clock-rotate-left"; + case 35: return "text-success fa-solid fa-circle-check";