diff --git a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
index ce8157d0..c6103b89 100644
--- a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
+++ b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
@@ -212,35 +212,35 @@ public class InstitutionContractWorkshopDetail:EntityBase
///
/// پلن حضور و غیاب
///
- public bool HasRollCallPlan { get; set; }
+ public bool HasRollCallPlan { get; private set; }
///
/// پلن فیش غیر رسمی
///
- public bool HasCustomizeCheckoutPlan { get; set; }
+ public bool HasCustomizeCheckoutPlan { get; private set; }
///
/// پلن قرارداد و تصفیه
///
- public bool HasContractPlan { get; set; }
+ public bool HasContractPlan { get; private set; }
///
/// پلن قرارداد و تصفیه حضوری
///
- public bool HasContractPlanInPerson { get; set; }
+ public bool HasContractPlanInPerson { get; private set; }
///
/// پلن بیمه
///
- public bool HasInsurancePlan { get; set; }
+ public bool HasInsurancePlan { get; private set; }
///
/// پلن بیمه حضوری
///
- public bool HasInsurancePlanInPerson { get; set; }
+ public bool HasInsurancePlanInPerson { get; private set; }
public int PersonnelCount { get; private set; }
- public bool WorkshopCreated { get; set; }
+ public bool WorkshopCreated { get; private set; }
///
/// شناسه قرارداد نهاد مرتبط
@@ -252,7 +252,7 @@ public class InstitutionContractWorkshopDetail:EntityBase
///
public InstitutionContract InstitutionContract { get; private set; }
- public double Price { get; set; }
+ public double Price { get; private set; }
private InstitutionContractWorkshopDetail()
diff --git a/CompanyManagment.Application/InstitutionContractApplication.cs b/CompanyManagment.Application/InstitutionContractApplication.cs
index 948dac0a..88a2c892 100644
--- a/CompanyManagment.Application/InstitutionContractApplication.cs
+++ b/CompanyManagment.Application/InstitutionContractApplication.cs
@@ -986,7 +986,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
if (command.IsInstallment)
{
- var installments =
+ var installments =
CalculateInstallment(command.TotalAmount, (int)command.Duration, command.ContractStartFa, true);
// دریافت مبلغ اولین قسط
diff --git a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
index 127778d5..014ac7cb 100644
--- a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
+++ b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
@@ -543,7 +543,17 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
//بدست آوردن جمع کل مبالغ کارگاه بر اساس مدت قراداد
var sumOfWorkshopsPaymentDouble = months * roundAmount2;
result.SumOfWorkshopsPayment = sumOfWorkshopsPaymentDouble.ToMoney();
-
+ var installmentstart = (DateTime.Now).ToFarsi();
+
+ var originalDay = int.Parse(installmentstart.Substring(8, 2));
+ result.ContractStartFa = installmentstart;
+ result.ContractStartGr = result.ContractStartFa.ToGeorgianDateTime();
+
+ var findeEnd = Tools.FindEndOfContract(installmentstart, ((int)duration).ToString());
+ var contractEndDate = findeEnd.endDateGr;
+ result.ContractEndGr = contractEndDate;
+ result.ContractEndFa = contractEndDate.ToFarsi();
+
if (hasInPersonContract)
{
var tenPercent = sumOfWorkshopsPaymentDouble * 10 / 100;
@@ -580,18 +590,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
result.MonthlyTotalPaymentStr = monthlyTotalPaymentDouble.ToMoney();
var installmentList = new List();
- var installmentstart = (DateTime.Now).ToFarsi();
- installmentstart = "1404/06/01";
-
- var originalDay = int.Parse(installmentstart.Substring(8, 2));
- result.ContractStartFa = installmentstart;
- result.ContractStartGr = result.ContractStartFa.ToGeorgianDateTime();
-
- var findeEnd = Tools.FindEndOfContract(installmentstart, ((int)duration).ToString());
- var contractEndDate = findeEnd.endDateGr;
- result.ContractEndGr = contractEndDate;
- result.ContractEndFa = contractEndDate.ToFarsi();
-
+
int instalmentCount = (int)duration;
var instalmentAmount = monthlyTotalPaymentDouble / instalmentCount;
int currentInstallmentStartDay = int.Parse(installmentstart.Substring(8, 2));