admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance institution contract query to support 'blue' as an active status and update discounted amount calculation in client registration

Browse Source
This commit is contained in:
MahanCh
2025-09-13 18:23:12 +03:30
parent b1c9b2669d
commit e1dfd8c8e1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
View File

@@ -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

10
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -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