Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:41f7f375698bece0d233753c3d254db47eaf56df
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:6aad8614b97c5a1ad7b1d9716a2c6566b14591d3
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "41f7f375698bece0d233753c3d254db47eaf56df" and "6aad8614b97c5a1ad7b1d9716a2c6566b14591d3" have entirely different histories.
41f7f37569 ... 6aad8614b9

5 changed files with 20 additions and 27 deletions
Show Stats Expand all files Collapse all files

8
TIAMSharedUI/Pages/Formula1.razor
View File

@ -454,7 +454,6 @@ new HeroSliderItem
{
orderModel.UserId = user.Id;
if (user.Products != null)
orderModel.ProductId = user.Products.FirstOrDefault()?.Id;
}
else
@ -510,7 +509,7 @@ new HeroSliderItem
List<TransferWizardModel> transferList = new List<TransferWizardModel>();
double _transferPrice = 0.0f;
if(orderModel.NumberOfPassengers < 5) {
switch (OrderDates.Length)
switch (transferList.Count)
{
case (1):
_transferPrice = 119/2;
@ -522,9 +521,8 @@ new HeroSliderItem
_transferPrice = 269 / 6;
break;
}
}
else if (orderModel.NumberOfPassengers > 5 && orderModel.NumberOfPassengers <= 8) {
switch (OrderDates.Length)
}else if (orderModel.NumberOfPassengers > 5 && orderModel.NumberOfPassengers < 8) {
switch (transferList.Count)
{
case (1):
_transferPrice = 219f /2;

10
TIAMWebApp/Client/Services/UserDataServiceWeb.cs
View File

@ -186,16 +186,16 @@ namespace TIAMWebApp.Client.Services
public async Task<UserModelDto?> GetUserByEmailAsync(string email)
{
var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}";
var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}";
_logger.Info("GetUserByEmailAsync url: " + url + ", " + email);
//GlobalLogger.Info("GetUserByEmailAsync url: " + url + ", " + email, "GLOBAL_LOGGER");
var response = (UserModelDto)(await http.GetFromJsonAsync(url,typeof (UserModelDto)));
//var user = JsonConvert.DeserializeObject<UserModelDto>(result);
return response;
var response = await http.PostAsJsonAsync(url, email);
var result = await response.Content.ReadAsStringAsync();
var user = JsonConvert.DeserializeObject<UserModelDto>(result);
return user;
}
public async Task<UserModelDto?> GetUserByIdAsync(Guid id)

11
TIAMWebApp/Server/Controllers/PaymentAPIController.cs
View File

@ -42,18 +42,13 @@ namespace TIAMWebApp.Server.Controllers
[Route(APIUrls.CreatePaymentRouteName)]
public async Task<string> CreatePayment([FromBody] JsonElement paymentItem)
{
_logger.Detail($"CreatePayment called! {paymentItem.ToString()}");
var transferToPay = JObject.Parse(paymentItem.GetRawText()).ToObject<Transfer>();
if (transferToPay == null)
{
return("error");
}
if (transferToPay.Price == null)
{
transferToPay.Price = 1000;
}
else return "false";
var paymentRequest = new SumupPaymentRequest
{
CheckoutReference = transferToPay.OrderId.ToString(),
@ -65,8 +60,8 @@ namespace TIAMWebApp.Server.Controllers
};
var result = await _sumupService.CreateCheckout(paymentRequest);
_logger.Detail($"CreatePayment result: {result}");
var checkoutId = result.Id.ToString();
return checkoutId;
var checkoutUrl = result.Id.ToString();
return checkoutUrl;
}
[AllowAnonymous]

8
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -249,7 +249,6 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info($"Created transfer, send emailMessage!!!");
var message = new MessageSenderModel<EmailMessage>();
message.Message.Id = Guid.NewGuid();
message.Message.Subject = "[Tour I Am] New transfer in Budapest";
message.Message.ContextId = transfer.Id;
message.Message.SenderId = Guid.Empty;
@ -278,7 +277,7 @@ namespace TIAMWebApp.Server.Controllers
//message.Message.Text = $"Dear {transfer.FullName}! /n We have received an order from you, please confirm the details here: https://www.touriam.com/mytransfer?{transfer.Id}";
var messageElement = message.Message;
var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType);
await _adminDal.AddEmailMessageAsync(messageElement);
//_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message);
_logger.Info("SendEmail result: " + result);
@ -337,7 +336,6 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info($"Created transfer, send emailMessage!!!");
var message = new MessageSenderModel<EmailMessage>();
message.Message = new EmailMessage();
message.Message.Id = Guid.NewGuid();
message.MessageType = AyCode.Models.Enums.MessageTypesEnum.email;
message.Message.Subject = "[Tour I Am] New transfer in Budapest";
message.Message.ContextId = createdTransfer.Id;
@ -367,7 +365,7 @@ namespace TIAMWebApp.Server.Controllers
var messageElement = message.Message;
Console.WriteLine(message.Message);
var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType);
await _adminDal.AddEmailMessageAsync(messageElement);
//_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message);
_logger.Info("SendEmail result: " + result);
}
@ -412,7 +410,7 @@ namespace TIAMWebApp.Server.Controllers
[SignalR(SignalRTags.UpdateTransfer)]
public async Task<Transfer> UpdateTransfer(Transfer transferToModify)
{
_logger.Info($"UpdateTransfer called! + {transferToModify.Id}");
_logger.Info($"UpdateTransfer called! + {Request?.ReadFormAsync()}");
await _adminDal.UpdateTransferAsync(transferToModify);
return transferToModify;

6
TIAMWebApp/Server/Controllers/UserAPIController.cs
View File

@ -356,11 +356,13 @@ namespace TIAMWebApp.Server.Controllers
}
[AllowAnonymous]
[HttpGet]
[Route(APIUrls.GetUserByEmailRouteName + "/{email}")]
[HttpPost]
[Route("GetUserByEmail")]
public Task<UserModelDto?> GetUserByEmail(string email)
{
_logger.Info($"GetUserByEmail called with email: {email}");
_logger.Info($@"GetUserByEmail called with email: {email}");
return _userDal.GetUserModelDtoByEmailAsync<UserModelDto>(email, false);
}