@CreateEditFormFields()
@@ -54,6 +54,8 @@ else
[Parameter] public bool userAvailable { get; set; }
[Parameter] public UserModelDtoDetail userModelDtodetail { get; set; }
[Parameter] public Product? CurrentProduct { get; set; } = null;
+ [Parameter] public string TitleString { get; set; } = "Edit your details";
+ [Parameter] public string ButtonTextString { get; set; } = "Submit";
string _formSubmitResult = "";
private string _spinnerClass = "";
@@ -365,7 +367,7 @@ else
{
editor.OpenComponent
(i++);
editor.AddAttribute(i++, "SubmitFormOnClick", true);
- editor.AddAttribute(i++, "Text", "Save");
+ editor.AddAttribute(i++, "Text", ButtonTextString);
editor.CloseComponent();
})));
diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor
index b507ed32..afc2304d 100644
--- a/TIAMSharedUI/Pages/EditTransfers.razor
+++ b/TIAMSharedUI/Pages/EditTransfers.razor
@@ -1,7 +1,13 @@
@page "/mytransfers/{transferId:guid}"
+@using AyCode.Core.Enums
@using AyCode.Core.Extensions
+@using TIAM.Core.Consts
+@using TIAM.Entities.Drivers
@using TIAM.Entities.Transfers
+@using TIAM.Models.Dtos.Users
@using TIAM.Resources
+@using TIAM.Services
+@using TIAMSharedUI.Pages.Components.EditComponents
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAMWebApp.Shared.Application.Interfaces
@using AyCode.Services.Loggers
@@ -36,22 +42,47 @@
CloseOnOutsideClick="false"
ShowCloseButton="false"
HeaderText="MessageBox"
- Closing="EulaPopupClosing"
- Closed="EulaPopupClosed">
+ Closing="EmailPopupClosing"
+ Closed="EmailPopupClosed"
+ SizeMode="SizeMode.Large">
-
+ @{
+ if(showResultMessage)
+ {
+ @resultMessage
+ }
+ else
+ {
+
+ }
+ }
+
-
+ @{
+ if(showResultMessage)
+ {
+
+ }
+ else
+ {
+
+ }
+ }
+
@@ -85,7 +116,7 @@ else
-
-
-
-
EUR @_transfer.Price via (COD)
-
+
@@ -255,9 +284,15 @@ else
[Parameter] public Guid transferId { get; set; } = Guid.Empty;
private Transfer _transfer = new Transfer();
+ private List _drivers = new List();
+ private List _cars = new List();
private bool _isLoading = true;
private string _errorMessage = string.Empty;
+ private bool showResultMessage = false;
+ private string resultMessage = string.Empty;
+ private List sysAdmins = [];
+
private LoggerClient _logger = null!;
private MessageWizardModel _messageWizardModel = new();
@@ -274,6 +309,7 @@ else
"SenderFullName",
"SenderId",
"ContextId",
+ "ContextType"
];
private bool _editMode = false;
@@ -281,29 +317,36 @@ else
void SendMail(Transfer item)
{
- _logger.Info($"Sending mail to {item.ContactEmail}, {item.Id}");
+ _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
+ _messageWizardModel.Subject = $"[#{item.OrderId}] New message from guest";
+ _messageWizardModel.ReceiverId = TiamConstClient.SysAccounts["SystemEmailSender"];
+ //get first sysadmin
+
+ _messageWizardModel.ReceiverEmailAddress = sysAdmins[0].UserDto.EmailAddress;
+ _messageWizardModel.ReceiverFullName = "Admin user";
+
+ _messageWizardModel.SenderId = item.UserId;
+ _messageWizardModel.SenderEmailAddress = TiamConstClient.SystemEmailAddress;
- _messageWizardModel.ReceiverId = item.UserId;
_messageWizardModel.ContextId = item.Id;
- _messageWizardModel.SenderEmailAddress = "info@touriam.com";
- _messageWizardModel.ReceiverEmailAddress = item.ContactEmail;
- _messageWizardModel.ReceiverFullName = item.FullName;
+ _messageWizardModel.ContextType = MessageContextType.Transfer;
_popupVisible = true;
}
void CancelCreateClick()
{
-
+ showResultMessage = false;
+ resultMessage = "";
_popupVisible = false;
}
- void EulaPopupClosed()
+ void EmailPopupClosed()
{
//cancel clicked
}
- void EulaPopupClosing(PopupClosingEventArgs args)
+ void EmailPopupClosing(PopupClosingEventArgs args)
{
//myModel = new TransferWizardModel();
_messageWizardModel = new MessageWizardModel();
@@ -311,28 +354,20 @@ else
public async Task SubmitForm(object result)
{
- var messageModel = result as MessageWizardModel;
- messageModel.ContextId = _messageWizardModel.ContextId;
- //messageModel.SenderId = sessionService.User.UserId;
-
- string FormatEmailContent()
- {
- return $@"
-
-
- Dear {messageModel.SenderFullName},
- {messageModel.Content}:
- Best regards,
Tour I Am team
-
- ";
- }
-
- messageModel.Content = FormatEmailContent();
-
+ var messageModel = (result as MessageWizardModel)!;
_logger.Info(messageModel.Content);
var email = await wizardProcessor.ProcessWizardAsync(result.GetType(), messageModel);
-
+ if(email != null)
+ {
+ resultMessage = "Message sent";
+ }
+ else
+ {
+ resultMessage = $"Something went wrong, please try again later, or contact us by regular email at {TiamConstClient.SystemEmailAddress}!";
+ }
+ showResultMessage = true;
_logger.Info($"Submitted nested form: {result.GetType().FullName}");
+
}
private async Task Pay()
@@ -374,6 +409,7 @@ else
_logger.Info($"parameter: {transferId.ToString()}");
await LoadTransfer();
+ sysAdmins = await _adminSignalRClient.GetByIdAsync>(SignalRTags.GetAllUserModelDtoDetails, TiamConstClient.SysAdmins[0]);
var test = _transfer.UserId;
if (!_transfer.UserId.IsNullOrEmpty())
{
@@ -389,7 +425,7 @@ else
{
//I am logged in, and this is my transfer
await UserDataService.SetEmailConfirmed(_transfer.UserId);
-
+
}
else
{
@@ -402,7 +438,7 @@ else
}
}
}
-
+
}
}
@@ -427,6 +463,15 @@ else
if (response != null)
{
_transfer = response;
+ _drivers = await _adminSignalRClient.GetByIdAsync>(SignalRTags.GetTransferDriversByTransferId, _transfer.Id);
+ if(_drivers.Count > 0)
+ {
+ foreach (var _transferToDriver in _drivers)
+ {
+ _cars.Add(_transferToDriver.Car);
+ }
+ _logger.DebugConditional($"{_drivers.FirstOrDefault().Id}");
+ }
}
else
diff --git a/TIAMWebApp/Client/Services/WizardProcessor.cs b/TIAMWebApp/Client/Services/WizardProcessor.cs
index 5d1e99b0..9fbaddc8 100644
--- a/TIAMWebApp/Client/Services/WizardProcessor.cs
+++ b/TIAMWebApp/Client/Services/WizardProcessor.cs
@@ -37,7 +37,14 @@ namespace TIAMWebApp.Client.Services
case nameof(MessageWizardModel):
EmailMessage emailMessage = ((MessageWizardModel)data).CopyToEmailMessage();
var messageResult = await MessageSenderService.SendNoticeAsync(emailMessage, 1);
- return messageResult as TModelType;
+ if (messageResult == "OK")
+ {
+ return data as TModelType;
+ }
+ else
+ {
+ return null;
+ }
//case nameof(ServiceProvider):
// return null;
diff --git a/TIAMWebApp/Client/wwwroot/index.html b/TIAMWebApp/Client/wwwroot/index.html
index 0e24ba12..e2ead78a 100644
--- a/TIAMWebApp/Client/wwwroot/index.html
+++ b/TIAMWebApp/Client/wwwroot/index.html
@@ -36,7 +36,11 @@
-
+
@@ -53,11 +57,7 @@
Reload
🗙
-
+
diff --git a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs
index 81d80f8e..09113980 100644
--- a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs
+++ b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs
@@ -51,7 +51,6 @@ namespace TIAMWebApp.Shared.Application.Services
var result = (string)(await response.Content.ReadAsStringAsync());
return result;
-
}
else