diff --git a/Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtenstionTemp.cs b/Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtenstionTemp.cs index 2cb570ce..df88c56c 100644 --- a/Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtenstionTemp.cs +++ b/Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtenstionTemp.cs @@ -30,6 +30,8 @@ public class InstitutionContractExtenstionTemp public InstitutionContractExtensionPlanDetail ThreeMonths { get; set; } public InstitutionContractExtensionPlanDetail SixMonths { get; set; } public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; } + public InstitutionContractExtensionPaymentMonthly MonthlyPayment { get; set; } + public InstitutionContractExtensionPaymentOneTime OneTimePayment { get; set; } public bool HasContractInPerson { get; set; } @@ -56,15 +58,21 @@ public class InstitutionContractExtenstionTemp HasContractInPerson = hasContractInPerson; } - public void SetSelectedDuration(InstitutionContractDuration duration) + public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractExtensionPaymentMonthly monthly, + InstitutionContractExtensionPaymentOneTime oneTime) { Duration = duration; + MonthlyPayment = monthly; + OneTimePayment = oneTime; } + } public class InstitutionContractExtenstionTempPlan { - public InstitutionContractExtenstionTempPlan(string contractStart, string contractEnd, string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment, string totalPayment, string dailyCompenseation, string obligation) + public InstitutionContractExtenstionTempPlan(string contractStart, string contractEnd, + string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment, + string totalPayment, string dailyCompensation, string obligation) { ContractStart = contractStart; ContractEnd = contractEnd; @@ -72,7 +80,7 @@ public class InstitutionContractExtenstionTempPlan OneMonthDiscount = oneMonthDiscount; OneMonthOriginalPayment = oneMonthOriginalPayment; TotalPayment = totalPayment; - DailyCompenseation = dailyCompenseation; + DailyCompensation = dailyCompensation; Obligation = obligation; } @@ -82,7 +90,7 @@ public class InstitutionContractExtenstionTempPlan public string OneMonthDiscount { get; set; } public string OneMonthOriginalPayment { get; set; } public string TotalPayment { get; set; } - public string DailyCompenseation { get; set; } + public string DailyCompensation { get; set; } public string Obligation { get; set; } } diff --git a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs index ae68500e..53862ec8 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs @@ -223,7 +223,7 @@ public interface IInstitutionContractApplication Task GetExtenstionInstitutionPlan(InstitutionContractExtensionPlanRequest request); Task GetExtenstionPaymentMethod( InstitutionContractExtensionPaymentRequest request); - //TODO:calculate Payment method + //TODO:Complete Data. diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index 3e836ef9..ca69055c 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -2044,7 +2044,6 @@ public class InstitutionContractRepository : RepositoryBase x.Id == institutionTemp.Id, institutionTemp); return res; }