From 4f66270cb075aae77c8d6f52300e8781ef778dea Mon Sep 17 00:00:00 2001 From: mahan Date: Mon, 29 Dec 2025 19:14:35 +0330 Subject: [PATCH] feat: add OneMonthPrice to institution verification details and update contract pricing logic --- .../GetInstitutionVerificationDetailsViewModel.cs | 1 + ...GetInstitutionVerificationDetailsWorkshopsViewModel.cs | 1 - .../Repository/InstitutionContractRepository.cs | 8 +++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsViewModel.cs b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsViewModel.cs index 0e3cc092..4d28eebc 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsViewModel.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsViewModel.cs @@ -13,6 +13,7 @@ public class GetInstitutionVerificationDetailsViewModel public string ContractStart { get; set; } public string ContractEnd { get; set; } public List Workshops { get; set; } + public string OneMonthPrice { get; set; } public string TotalPrice { get; set; } public string TaxPrice { get; set; } public string PaymentPrice { get; set; } diff --git a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs index cd1ef514..09a0d2dc 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs @@ -5,5 +5,4 @@ public class GetInstitutionVerificationDetailsWorkshopsViewModel public string Name { get; set; } public int PersonnelCount { get; set; } public WorkshopServicesViewModel Services { get; set; } - public string Price { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index f15189ca..0ce06461 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -1866,6 +1866,9 @@ public class InstitutionContractRepository : RepositoryBase x.InstallmentDateGr).First().Amount.ToMoney(): + query.contract.ContractAmount.ToMoney(), TotalPrice = (query.contract.TotalAmount - query.contract.ValueAddedTax).ToMoney(), PaymentPrice = query.contract.TotalAmount.ToMoney(), IsInstallment = query.contract.IsInstallment, @@ -1899,8 +1902,8 @@ public class InstitutionContractRepository : RepositoryBase