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

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
Adam 2024-04-05 17:56:38 +02:00
parent 243ab13abb e83dfcc8ab
commit 5dcd94fd97
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAM.Database.Test/AdminDalTest.cs
View File

@ -378,6 +378,8 @@ namespace TIAM.Database.Test
ToAddress = toAddress,
PassengerCount = 3,
Price = 20000,
ContactEmail = "xyztest@gmail.hu",
ContactPhone = "+3671542771",
TransferStatusType = TransferStatusType.OrderConfirmed,
};

4
TIAM.Entities/Products/IProductForeignKey.cs
View File

@ -1,9 +1,9 @@
namespace TIAM.Entities.Products;
public interface IEmailMessageForeignKey<T>
public interface IProductForeignKey<T>
{
public T ProductId { get; set; }
}
public interface IProductForeignKey : IEmailMessageForeignKey<Guid>
public interface IProductForeignKey : IProductForeignKey<Guid>
{ }

8
TIAM.Entities/Transfers/Transfer.cs
View File

@ -10,7 +10,7 @@ using TIAM.Entities.Users;
namespace TIAM.Entities.Transfers;
[Table(nameof(Transfer))]
public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey, IUserForeignKey
public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey<Guid?>, IUserForeignKey
{
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
@ -19,7 +19,7 @@ public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey, IUserFor
public int OrderId { get; set; }
public Guid UserId { get; set; }
public Guid ProductId { get; set; }
public Guid? ProductId { get; set; }
//public Guid? UserProductMappingId { get; set; }
//public Guid? UserProductToCarId { get; set; }
@ -37,6 +37,10 @@ public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey, IUserFor
[MaxLength(50)] public string? FlightNumber { get; set; }
[MaxLength(200)] public string FromAddress { get; set; }
[MaxLength(200)] public string? ToAddress { get; set; }
public string ContactEmail {get;set; }
public string ContactPhone {get;set; }
[MaxLength(250)] public string? Comment { get; set; }
//[Column("ReferralProductId")]

2
TIAMWebApp/Server/Services/TransferBackendService.cs
View File

@ -41,7 +41,7 @@ namespace TIAMWebApp.Server.Services
var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber);
//TODO: ExtraPrice - J.
//TODO: ExtraPrice - J. seatnum percent price, FirstName, LastName, CascadeDelete
//if (baseDestination.Id == fromTransferDestination.Id && )
return price;
}