From 018f12f0e447d717367b8aa4c7024b6b3fc155b4 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 6 Apr 2024 05:24:13 +0200 Subject: [PATCH 1/2] Implement ContactName to transfer --- TIAM.Database.Test/AdminDalTest.cs | 1 + TIAM.Entities/Transfers/Transfer.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index 840dcd6e..38b4e876 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -378,6 +378,7 @@ namespace TIAM.Database.Test ToAddress = toAddress, PassengerCount = 3, Price = 20000, + ContactName = "xyztest", ContactEmail = "xyztest@gmail.hu", ContactPhone = "+3671542771", TransferStatusType = TransferStatusType.OrderConfirmed, diff --git a/TIAM.Entities/Transfers/Transfer.cs b/TIAM.Entities/Transfers/Transfer.cs index 10256c16..4e7900f7 100644 --- a/TIAM.Entities/Transfers/Transfer.cs +++ b/TIAM.Entities/Transfers/Transfer.cs @@ -38,6 +38,7 @@ public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey, I [MaxLength(200)] public string FromAddress { get; set; } [MaxLength(200)] public string? ToAddress { get; set; } + public string ContactName {get;set; } public string ContactEmail {get;set; } public string ContactPhone {get;set; } From 1bc801234b8161dce1257e7f6372a1fc6eef651e Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 6 Apr 2024 06:21:06 +0200 Subject: [PATCH 2/2] Implement ProductCommis --- TIAM.Entities/Transfers/ITransfeDestinationPrices.cs | 1 + TIAM.Entities/Transfers/TransferDestination.cs | 4 ++-- TIAM.Entities/Transfers/TransferDestinationToProduct.cs | 1 + TIAMWebApp/Server/Services/TransferBackendService.cs | 3 ++- .../UI/WizardModels/TransferDestinationWizardModel.cs | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs b/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs index 36d7119c..f565f0c3 100644 --- a/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs +++ b/TIAM.Entities/Transfers/ITransfeDestinationPrices.cs @@ -7,6 +7,7 @@ public interface ITransfeDestinationPrices public double? Price2 { get; set; } public double? Price3 { get; set; } + public double ProductCommis { get; set; } public double? ExtraPrice { get; set; } /// /// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő... diff --git a/TIAM.Entities/Transfers/TransferDestination.cs b/TIAM.Entities/Transfers/TransferDestination.cs index 50068157..6f70fd77 100644 --- a/TIAM.Entities/Transfers/TransferDestination.cs +++ b/TIAM.Entities/Transfers/TransferDestination.cs @@ -28,6 +28,7 @@ namespace TIAM.Entities.Transfers public double? Price2 { get; set; } public double? Price3 { get; set; } + public double ProductCommis { get;set; } public double? ExtraPrice { get; set; } /// /// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő... @@ -60,5 +61,4 @@ namespace TIAM.Entities.Transfers } } -} - +} \ No newline at end of file diff --git a/TIAM.Entities/Transfers/TransferDestinationToProduct.cs b/TIAM.Entities/Transfers/TransferDestinationToProduct.cs index 77d89a6f..3eb2a308 100644 --- a/TIAM.Entities/Transfers/TransferDestinationToProduct.cs +++ b/TIAM.Entities/Transfers/TransferDestinationToProduct.cs @@ -23,6 +23,7 @@ namespace TIAM.Entities.Transfers public double? Price2 { get; set; } public double? Price3 { get; set; } + public double ProductCommis { get;set; } public double? ExtraPrice { get; set; } /// /// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő... diff --git a/TIAMWebApp/Server/Services/TransferBackendService.cs b/TIAMWebApp/Server/Services/TransferBackendService.cs index 9154d186..dcc6ea24 100644 --- a/TIAMWebApp/Server/Services/TransferBackendService.cs +++ b/TIAMWebApp/Server/Services/TransferBackendService.cs @@ -39,7 +39,8 @@ namespace TIAMWebApp.Server.Services var tranferDestinationPrice = transferDestinationToProduct ?? baseDestination as ITransfeDestinationPrices; - var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber); + //A ProductCommis nem ugyanaz mint az ExtraPrice?!? - J. + var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber) + tranferDestinationPrice.ProductCommis; //TODO: ExtraPrice - J. seatnum percent price, FirstName, LastName, CascadeDelete //if (baseDestination.Id == fromTransferDestination.Id && ) diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs index 78f67e88..e8ef9997 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs @@ -94,6 +94,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels destination.Price = model.Price; destination.Price2 = model.Price2; destination.Price3 = model.Price3; + //destination.ProductCommis = model.ProductCommis; //TODO: a wizardba betenni... //destination.PriceType = model.PriceType; destination.Address = model.Address;