From 93891f3837ba07475d5d179e928d865034abce26 Mon Sep 17 00:00:00 2001
From: mahan <mahanch83@gmail.com>
Date: Sat, 20 Dec 2025 19:18:27 +0330
Subject: [PATCH 1/2] add one month more details for InstitutionContract.cs
 print

---
 Company.Domain/InstitutionContractAgg/InstitutionContract.cs  | 4 +++-
 .../InstitutionContract/IInstitutionContractApplication.cs    | 2 ++
 CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs | 2 ++
 .../Repository/InstitutionContractRepository.cs               | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
index 0ed2d269..8eccd1f1 100644
--- a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
+++ b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
@@ -98,8 +98,10 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract && IsInstallment ? ContractAmount + (ContractAmount * 0.10)
+    public double ContractAmountWithTax => !IsOldContract && IsInstallment ? ContractAmount + ContractAmountTax
         : ContractAmount;
+    
+    public double ContractAmountTax => ContractAmount*0.10;
 
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
diff --git a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
index b7fc6701..524fbb56 100644
--- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
@@ -345,6 +345,8 @@ public class InstitutionContractPrintViewModel
     public string TaxPrice { get; set; }
     public string PaymentPrice { get; set; }
     public string OneMonthPrice { get; set; }
+    public string OneMonthWithoutTax { get; set; }
+    public string OneMonthTax { get; set; }
     public string VerifyCode { get; set; }
     public string VerifyDate { get; set; }
     public string VerifyTime { get; set; }
diff --git a/CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs b/CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs
index ca709949..d0face36 100644
--- a/CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs
+++ b/CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs
@@ -48,5 +48,7 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
 
         builder.Ignore(x => x.ContractAmountWithTax);
+        builder.Ignore(x => x.ContractAmountTax);
+        builder.Ignore(x => x.ContractAmountTax);
     }
 }
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
index 1b7ec3f6..1f2f7fb2 100644
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -3215,6 +3215,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
                 TaxPrice = institution.ValueAddedTax.ToMoney(),
                 OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
+                OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
+                OneMonthTax = institution.ContractAmountTax.ToMoney(),
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,

From 56e79d2099ce4a6da8b447b0e04000cf25483f9d Mon Sep 17 00:00:00 2001
From: mahan <mahanch83@gmail.com>
Date: Sat, 20 Dec 2025 19:38:32 +0330
Subject: [PATCH 2/2] fix: correct ContractAmountWithTax calculation for old
 contracts

---
 Company.Domain/InstitutionContractAgg/InstitutionContract.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
index 8eccd1f1..662779dd 100644
--- a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
+++ b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
@@ -98,7 +98,7 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract && IsInstallment ? ContractAmount + ContractAmountTax
+    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
         : ContractAmount;
     
     public double ContractAmountTax => ContractAmount*0.10;