From e1dfd8c8e193b7743f9bd874a999cfd3b3621280 Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Sat, 13 Sep 2025 18:23:12 +0330
Subject: [PATCH] Enhance institution contract query to support 'blue' as an
 active status and update discounted amount calculation in client registration

---
 .../TemporaryClientRegistrationApplication.cs          |  2 +-
 .../Repository/InstitutionContractRepository.cs        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
index 8800c323..9c93b139 100644
--- a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
+++ b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
@@ -575,7 +575,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             //مبلغ با مالیات
             var oneTimePayment = discountOneTimePeyment + tenPercent;
             result.OneTimeTotalPaymentStr = oneTimePayment.ToMoney();
-            result.DiscountedAmountForOneMonth = sumOfWorkshopsPaymentDouble.ToMoney();
+            result.DiscountedAmountForOneMonth = roundAmount2.ToMoney();
 
             #endregion
 
diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
index 5b32d2a6..8c7cf88a 100644
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -1253,7 +1253,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public async Task<GetInstitutionContractListStatsViewModel> GetListStats(
         InstitutionContractListSearchModel searchModel)
     {
-        var query = _context.InstitutionContractSet
+             var query = _context.InstitutionContractSet
             .Include(x => x.ContactInfoList);
 
         var now = DateTime.Today;
@@ -1359,7 +1359,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (searchModel.IsActive != null)
         {
             var isActiveStr = searchModel.IsActive == true ? "true" : "false";
-            joinedQuery = joinedQuery.Where(x => x.contract.IsActiveString == isActiveStr);
+            joinedQuery = joinedQuery.Where(x => x.contract.IsActiveString == isActiveStr || x.contract.IsActiveString == "blue");
         }
 
         if (searchModel.Type != null)
@@ -1405,9 +1405,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 case InstitutionContractListStatus.Active:
                     joinedQuery = joinedQuery.Where(x => x.StatusPriority == (int)InstitutionContractListStatus.Active);
                     break;
-                case InstitutionContractListStatus.Deactive:
-                    joinedQuery = joinedQuery.Where(x => x.contract.ContractEndGr < now);
-                    break;
+                 case InstitutionContractListStatus.Deactive:
+                     joinedQuery = joinedQuery.Where(x => x.contract.ContractEndGr < now);
+                     break;
             }
         }
         else