diff --git a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
index da0c2e3e..ef652354 100644
--- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
@@ -327,12 +327,12 @@ public class InstitutionContractInstallmentViewModel
///
/// مبلغ قسط
///
- public double Amount { get; set; }
+ public string Amount { get; set; }
///
- /// توضیحات قسط
+ /// عدد قسط فارسی
///
- public string Description { get; set; }
+ public string InstallmentIndex { get; set; }
///
/// شناسه قرارداد مؤسسه مربوط به این قسط
diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
index 10f14bc0..ba15bfb4 100644
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -1693,6 +1693,8 @@ public class InstitutionContractRepository : RepositoryBase new InstitutionContractInstallmentViewModel()
- {
- Amount = x.Amount,
- Description = x.Description,
- Id = x.Id,
- InstallmentDateFa = x.InstallmentDateFa,
- InstallmentDateGr = x.InstallmentDateGr,
- InstitutionContractId = x.InstitutionContractId
- }).ToList(),
+ Installments = query.contract.Installments.OrderBy(x=>x.InstallmentDateGr)
+ .Select(x =>
+ {
+ var res = new InstitutionContractInstallmentViewModel()
+ {
+ Amount = x.Description,
+ InstallmentIndex = GetInstallmentPersianNumber(installmentNumber),
+ Id = x.Id,
+ InstallmentDateFa = x.InstallmentDateFa,
+ InstallmentDateGr = x.InstallmentDateGr,
+ InstitutionContractId = x.InstitutionContractId,
+ };
+ installmentNumber++;
+ return res;
+ }).ToList(),
Workshops = query.contract.WorkshopGroup.WorkshopDetails
.Where(x => x.DetailType == WorkshopDetailType.Initial)
.Select(x => new GetInstitutionVerificationDetailsWorkshopsViewModel
@@ -1757,7 +1765,23 @@ public class InstitutionContractRepository : RepositoryBase "اول",
+ 2 => "دوم",
+ 3 => "سوم",
+ 4 => "چهارم",
+ 5 => "پنجم",
+ 6 => "ششم",
+ 7 => "هفتم",
+ 8 => "هشتم",
+ 9 => "نهم",
+ 10 => "دهم",
+ _ => number.ToString()
+ };
+ }
public async Task GetByPublicIdAsync(Guid id)
{
return await _context.InstitutionContractSet.FirstOrDefaultAsync(x => x.PublicId == id);