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-06 12:53:20 +02:00
parent 0cf8a4d4cc 1bc801234b
commit 65a8c19017
7 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

1
TIAM.Entities/Transfers/ITransfeDestinationPrices.cs
View File

@ -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; }
/// <summary>
/// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő...

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

@ -38,6 +38,7 @@ public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey<Guid?>, 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; }

4
TIAM.Entities/Transfers/TransferDestination.cs
View File

@ -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; }
/// <summary>
/// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő...
@ -60,5 +61,4 @@ namespace TIAM.Entities.Transfers
}
}
}
}

1
TIAM.Entities/Transfers/TransferDestinationToProduct.cs
View File

@ -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; }
/// <summary>
/// Kihajtás v. behajtás az ExtraPrice! Ha null, akkor mindkettő...

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

@ -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 && )

1
TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs
View File

@ -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;