From b1a15bfa54cec6b4ad0285c08d6341c6c8ab69fc Mon Sep 17 00:00:00 2001 From: MahanCh Date: Tue, 26 Aug 2025 09:57:50 +0330 Subject: [PATCH] feat: update institution plan calculator to use total amount directly and remove workshop list parameter --- .../ITemporaryClientRegistrationApplication.cs | 6 +++--- .../TemporaryClientRegistrationApplication.cs | 13 +++++++------ .../Controllers/institutionContractController.cs | 5 ++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs index 92b42050..6e9f67be 100644 --- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs +++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs @@ -67,13 +67,13 @@ public interface ITemporaryClientRegistrationApplication /// و هنوز در دیتابیس ثبت نشده اند /// /// - /// + /// /// - /// /// + /// /// Task GetTotalPaymentAndWorkshopList(long contractingPartyTempId, - List workshopList, + double totalPaymentMonth, InstitutionContractDuration duration = InstitutionContractDuration.TwelveMonths, string contractStartType = "currentMonth"); /// diff --git a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs index 4f16de8e..8f99e5d8 100644 --- a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs +++ b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs @@ -514,18 +514,19 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati } public async Task GetTotalPaymentAndWorkshopList(long contractingPartyTempId, - List workshops, InstitutionContractDuration duration = InstitutionContractDuration.TwelveMonths, string contractStartType = "currentMonth") + double totalPaymentMonth, InstitutionContractDuration duration = InstitutionContractDuration.TwelveMonths, string contractStartType = "currentMonth") { //دریافت کارگاه ها double totalPayment1MonthDouble = 0; - //بدست آوردن جمع کل برای یک ماه - foreach (var workshop in workshops) - { - totalPayment1MonthDouble += workshop.WorkshopServicesAmount; - } + // //بدست آوردن جمع کل برای یک ماه + // foreach (var workshop in workshops) + // { + // totalPayment1MonthDouble += workshop.WorkshopServicesAmount; + // } + totalPayment1MonthDouble = totalPaymentMonth; if (totalPayment1MonthDouble == 0) return new ReviewAndPaymentViewModel(); diff --git a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs index 3d0b8e2f..1d64670c 100644 --- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs +++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs @@ -609,8 +609,7 @@ public class institutionContractController : AdminBaseController public async Task> InstitutionPlanCalculator( [FromBody] InstitutionPlanCalculatorRequest request) { - var res = await _temporaryClientRegistration.GetTotalPaymentAndWorkshopList(0, - request.workshopList, contractStartType: request.ContractStartType,duration:request.Duration); + var res = await _temporaryClientRegistration.GetTotalPaymentAndWorkshopList(0, request.TotalAmountMonth,duration: request.Duration, contractStartType: request.ContractStartType); var response = new InstitutionPlanCalculatorResponse { Installments = res.MonthlyInstallments, @@ -680,7 +679,7 @@ public class WorkshopServiceCalculatorResponse public string TotalAmount { get; set; } } -public record InstitutionPlanCalculatorRequest(List workshopList, +public record InstitutionPlanCalculatorRequest(double TotalAmountMonth, InstitutionContractDuration Duration = InstitutionContractDuration.TwelveMonths, string PaymentModel = "OneTime", string ContractStartType = "currentMonth");