Add menu item for bank account information

Added a new menu item with `permission="307"` to `_Menu.cshtml`
for accessing the `account-number-database` page. The link
is dynamically constructed using `AppSetting.Value.Domain`
and styled with `class="clik10"` and inline styles. Included
an SVG icon and the text "اطلاعات بانکی طرف حساب"
("Bank account information of the counterparty"). Maintained
the hierarchical structure of the menu.

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -32,7 +32,7 @@ public static class StaticWorkshopAccounts
     /// 392 - عمار حسن دوست
     /// 20 - سمیرا الهی نیا
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

0_Framework/InfraStructure/NullFaceEmbeddingNotificationService.cs

@@ -27,4 +27,3 @@ public class NullFaceEmbeddingNotificationService : IFaceEmbeddingNotificationSe
         return Task.CompletedTask;
     }
 }
-

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -290,4 +290,13 @@ public class PersonalContractingParty : EntityBase
         this.Gender = gender;
         this.IsAuthenticated = true;
     }
+
+    public void EditLegalPartyFromInstitution(string legalPosition, string companyName,
+        string registerId,string nationalId)
+    {
+        LegalPosition = legalPosition;
+        LName = companyName;
+        RegisterId = registerId;
+        NationalId = nationalId;
+    }
 }

Company.Domain/EmployeeDocumentsAgg/EmployeeDocuments.cs

@@ -37,7 +37,7 @@ namespace Company.Domain.EmployeeDocumentsAgg
         {
             WorkshopId = workshopId;
             EmployeeId = employeeId;
-            Gender = gender;
+            Gender = gender??string.Empty;
         }
 
         private EmployeeDocuments()

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,6 +56,9 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
+    InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
+    
 
     #region Extension
 
@@ -63,6 +66,10 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
     Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
     Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request);
+    Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
+        InstitutionContractSetDiscountForExtensionRequest request);
+    Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(InstitutionContractResetDiscountForExtensionRequest request);
+    
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
 
     #endregion
@@ -145,4 +152,6 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
 
     #endregion
+
+    Task<long> GetIdByInstallmentId(long installmentId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -19,7 +19,8 @@ public class InstitutionContract : EntityBase
         string contractEndFa, double contractAmount, double dailyCompenseation, double obligation,
         double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description,
         string officialCompany, string typeOfcontract, string hasValueAddedTax, double valueAddedTax,
-        List<InstitutionContractWorkshopInitial> workshopDetails, long lawId)
+        List<InstitutionContractWorkshopInitial> workshopDetails, long lawId,
+        int discountPercentage, double discountAmount)
     {
         ContractNo = contractNo;
         RepresentativeId = representativeId;
@@ -57,8 +58,12 @@ public class InstitutionContract : EntityBase
         WorkshopGroup = new InstitutionContractWorkshopGroup(id, workshopDetails);
         PublicId = Guid.NewGuid();
         LawId = lawId;
+        DiscountPercentage = discountPercentage;
+        DiscountAmount = discountAmount;
+
     }
 
+
     public long LawId { get; private set; }
 
     public string ContractNo { get; private set; }
@@ -129,6 +134,10 @@ public class InstitutionContract : EntityBase
     public string VerifierFullName { get; private set; }
     public string VerifierPhoneNumber { get; private set; }
     
+    public double DiscountAmount { get; private set; }
+
+    public int DiscountPercentage { get; private set; }
+
     [NotMapped] public bool VerifyCodeExpired => VerifyCodeCreation.Add(ExpireTime) <= DateTime.Now;
 
     [NotMapped] public bool CanResendVerifyCode => VerifyCodeCreation.Add(ReSendTime) <= DateTime.Now;

Company.Domain/InstitutionContractExtensionTempAgg/InstitutionContractExtensionTemp.cs

@@ -66,6 +66,7 @@ public class InstitutionContractExtensionTemp
         OneTimePayment = oneTime;
     }
 
+    
 }
 
 public class InstitutionContractExtenstionTempPlan

CompanyManagment.App.Contracts/InstitutionContract/CreateInstitutionContractRequest.cs

@@ -87,7 +87,7 @@ public class CreateInstitutionContractRequest
     /// <summary>
     /// مبلغ کل قرارداد
     /// </summary>
-    public double TotalAmount { get; set; }
+    public double PaymentAmount { get; set; }
 
     /// <summary>
     /// آیا قرارداد اقساطی است؟
@@ -102,6 +102,10 @@ public class CreateInstitutionContractRequest
     public double OneMonthAmount { get; set; }
 
     public long LawId { get; set; }
+    
+    public int DiscountPercentage { get; set; }
+    
+    public double DiscountAmount { get; set; }
 }
 /// <summary>
 /// مدت زمان قرارداد نهاد

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -215,6 +215,8 @@ public interface IInstitutionContractApplication
     Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id);
     Task<OperationResult<string>> VerifyOtpAndMakeGateway(Guid publicId, string code, string callbackUrl);
     Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
+    InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
     
     #region Extension
 
@@ -229,6 +231,12 @@ public interface IInstitutionContractApplication
     Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(
         InstitutionContractExtensionPaymentRequest request);
     
+    Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
+        InstitutionContractSetDiscountForExtensionRequest request);
+    Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(
+        InstitutionContractResetDiscountForExtensionRequest request);
+    
+
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,string selected);
 
@@ -253,6 +261,75 @@ public interface IInstitutionContractApplication
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
     Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<long> GetIdByInstallmentId(long installmentId);
+
+}
+
+public class InstitutionContractDiscountResponse
+{
+    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
+}
+
+public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractDiscountOneTimeViewModel
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
+    
+    public string DiscountedAmount { get; set; }
+    
+    public int DiscountPercetage { get; set; }
+
+    public string Obligation { get; set; }
+    
+    public string OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractResetDiscountForCreateRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractSetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}
+
+
+public class InstitutionContractSetDiscountRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+    public bool IsInstallment { get; set; }
 }
 
 public class InstitutionContractPrintViewModel

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -17,6 +17,9 @@ public class InstitutionContractPaymentOneTimeViewModel
     /// مبلغ قابل پرداخت
     /// </summary>
     public string PaymentAmount { get; set; }
+
+    public string DiscountedAmount { get; set; }
+    public int DiscountPercetage { get; set; }
 }
 public class InstitutionContractPaymentMonthlyViewModel:InstitutionContractPaymentOneTimeViewModel
 {

CompanyManagment.Application/EmployeeAplication.cs

@@ -1585,7 +1585,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (employee.IsAuthorized == false)
             {
                 var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-                if (apiResult.ResponseContext.Status.Code == 14)
+                
+                if (apiResult == null)
+                {
+                    return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
+                }
+                if (apiResult.ResponseContext.Status.Code is 14 or 3)
                 {
                     return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
 
@@ -1644,8 +1649,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 };
                 return op.Succcedded(data);
             }
+            
             var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-            if (apiResult.ResponseContext.Status.Code == 14)
+            if (apiResult == null)
+            {
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
+            }
+            if (apiResult.ResponseContext.Status.Code is 14 or 3)
             {
                 return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
 

CompanyManagment.Application/EmployerApplication.cs

@@ -1485,12 +1485,12 @@ public class EmployerApplication : IEmployerApplication
             return opration.Failed("نام شرکت وارد شده تکراری است");
         }
 
-        if (_EmployerRepository.Exists(x =>
+        // if (_EmployerRepository.Exists(x =>
-                x.RegisterId == command.RegisterId && !string.IsNullOrWhiteSpace(command.RegisterId) &&
+        //         x.RegisterId == command.RegisterId && !string.IsNullOrWhiteSpace(command.RegisterId) &&
-                x.RegisterId != null))
+        //         x.RegisterId != null))
-        {
+        // {
-            return opration.Failed(" شماره ثبت وارد شده تکراری است");
+        //     return opration.Failed(" شماره ثبت وارد شده تکراری است");
-        }
+        // }
 
         if (!string.IsNullOrEmpty(command.NationalId) && command.NationalId.Length != 11)
         {

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -69,7 +69,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IContractingPartyTempRepository contractingPartyTempRepository,
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
         IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
-		IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory, IPaymentTransactionRepository paymentTransactionRepository)
+        IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
+        IPaymentTransactionRepository paymentTransactionRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -222,7 +223,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 			command.ContractStartFa, contractEndGr, command.ContractEndFa, command.ContractAmount,
 			command.DailyCompenseation, command.Obligation,
 			command.TotalAmount, 0, command.WorkshopManualCount, command.EmployeeManualCount, command.Description,
-			command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax, command.ValueAddedTax, [], command.LawId);
+			command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax, command.ValueAddedTax, [], command.LawId,0,0);
 
 		_institutionContractRepository.Create(createContract);
 		_institutionContractRepository.SaveChanges();
@@ -331,7 +332,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 			command.DailyCompenseation, command.Obligation,
 			command.TotalAmount, command.ExtensionNo, command.WorkshopManualCount, command.EmployeeManualCount,
 			command.Description, command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax,
-			command.ValueAddedTax, [], command.LawId);
+			command.ValueAddedTax, [], command.LawId,0,0);
 
 		_institutionContractRepository.Create(createContract);
 		_institutionContractRepository.SaveChanges();
@@ -887,6 +888,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     public void RemoveContract(long id)
     {
         _institutionContractRepository.RemoveContract(id);
+        
     }
 
 
@@ -943,7 +945,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
     public async Task<OperationResult> CreateAsync(CreateInstitutionContractRequest command)
     {
-
         var opration = new OperationResult();
         var syear = command.ContractStartFa.Substring(0, 4);
         var smonth = command.ContractStartFa.Substring(5, 2);
@@ -975,12 +976,18 @@ public class InstitutionContractApplication : IInstitutionContractApplication
                 }
             }
 
-			if (!command.LegalParty.IsAuth)
+			if (!command.LegalParty.IsAuth && existingContractingParty != null)
 			{
 				var legalCommand = command.LegalParty;
 				existingContractingParty.UnAuthenticateLegalEdit(legalCommand.FName,legalCommand.LName,legalCommand.FatherName,legalCommand.IdNumber,existingContractingParty.IdNumberSeri,existingContractingParty.IdNumberSerial,
 					legalCommand.BirthDateFa,legalCommand.Gender,legalCommand.PhoneNumber);
 			}
+
+            if (existingContractingParty != null)
+            {
+                existingContractingParty.EditLegalPartyFromInstitution(command.LegalParty.Position,command.LegalParty.CompanyName,
+                    command.LegalParty.RegisterId,command.LegalParty.NationalId);
+            }
 		}
 		else if (command.ContractingPartyLegalType == LegalType.Real)
 		{
@@ -997,7 +1004,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 					throw new BadRequestException("امکان ایجاد قرارداد تکراری وجود ندارد");
 				}
 			}
-			if (!command.RealParty.IsAuth)
+			if (!command.RealParty.IsAuth && existingContractingParty != null)
 			{
 				var realCommand = command.RealParty;
 				existingContractingParty.UnAuthenticateRealEdit(realCommand.FName,realCommand.LName,realCommand.FatherName,realCommand.IdNumber,existingContractingParty.IdNumberSeri,existingContractingParty.IdNumberSerial,
@@ -1030,6 +1037,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 			contractingParty = contractingPartyResult.Data;
 		}
 		
+		
+
         if (_institutionContractRepository.Exists(x =>
                 x.ContractingPartyId == contractingParty.id && x.RepresentativeId == command.RepresentativeId &&
                 x.TypeOfContract == "JobRelation"))
@@ -1060,7 +1069,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var contractingPartyFullName = "";
         if (contractingParty.IsLegal == "حقیقی")
         {
-
             contractingPartyFullName = contractingParty.FName + " " + contractingParty.LName;
         }
         else
@@ -1080,11 +1088,11 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             contractStartGr,
             contractStartGr.ToFarsi(), contractEndGr, contractEndGr.ToFarsi(), command.OneMonthAmount,
             command.DailyCompensation,
-			command.Obligation, command.TotalAmount, 0,
+            command.Obligation, command.PaymentAmount, 0,
             command.Workshops.Count.ToString(),
             command.Workshops.Sum(x => x.PersonnelCount).ToString(), command.Description,
             "NotOfficial", "JobRelation", hasValueAddedTax,
-			command.TaxAmount, workshopDetails, command.LawId);
+            command.TaxAmount, workshopDetails, command.LawId,command.DiscountPercentage,command.DiscountAmount );
 
 
 		FinancialStatment financialStatement;
@@ -1100,14 +1108,10 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		await _institutionContractRepository.CreateAsync(entity);
 		await _institutionContractRepository.SaveChangesAsync();
 		
-		double invoiceAmount;
-		string invoiceItemDescription;
-		FinancialInvoiceItemType invoiceItemType;
-		long invoiceItemEntityId;
 		if (command.IsInstallment)
 		{
 			var installments =
-				CalculateInstallment(command.TotalAmount, (int)command.Duration, command.ContractStartFa, true);
+				CalculateInstallment(command.PaymentAmount, (int)command.Duration, command.ContractStartFa, true);
 
 
             // دریافت مبلغ اولین قسط
@@ -1128,33 +1132,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
 			await _institutionContractRepository.SaveChangesAsync();
 			
-			var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-				"قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
-
-			financialStatement.AddFinancialTransaction(financialTransaction);
-			invoiceAmount = firstInstallmentAmount;
-			invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {entity.ContractNo}";
-			invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-			invoiceItemEntityId = todayInstallment.Id;
 		}
-		else
-		{
-			var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-				"پرداخت کل سرویس", "debt", "بابت خدمات", command.TotalAmount, 0, 0);
-			financialStatement.AddFinancialTransaction(financialTransaction);
-			invoiceAmount = command.TotalAmount;
-			invoiceItemDescription = $"پرداخت کل قرارداد شماره {entity.ContractNo}";
-			invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
-			invoiceItemEntityId = entity.id;
-		}
-
-		var financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {entity.ContractNo}");
-		var financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0, invoiceItemType, invoiceItemEntityId);
-		financialInvoice.AddItem(financialInvoiceItem);
-
-
-		await _financialInvoiceRepository.CreateAsync(financialInvoice);
-		await _institutionContractRepository.SaveChangesAsync();
 		
 		var mainContactInfo = new CreateContactInfo
 		{
@@ -1274,7 +1252,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		try
 		{
 			await _institutionContractRepository.SaveChangesAsync();
-			_smsService.VerifySend(contractingParty.Phone, code);
+			await _smsService.SendInstitutionVerificationCode(contractingParty.Phone, code,contractingPartyFullName,
+				contractingParty.id, institutionContract.id);
 		}
 		catch (Exception e)
 		{
@@ -1315,25 +1294,74 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		if (institutionContract.VerifyCode != code)
 			return op.Failed("کد وارد شده صحیح نمی باشد");
 		
-		var dbTransaction = await _institutionContractRepository.BeginTransactionAsync();
+		var financialStatement =await _financialStatmentRepository.GetByContractingPartyId(contractingParty.id);
+
+		var dbTransaction = await _institutionContractRepository.BeginTransactionAsync();
+		FinancialInvoice financialInvoice;
+		FinancialInvoiceItem financialInvoiceItem;
+		var today = DateTime.Today;
+		double invoiceAmount = 0;
+		string invoiceItemDescription = string.Empty;
+		FinancialInvoiceItemType invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+		long invoiceItemEntityId = 0;
 
-		long entityId = 0;
-		FinancialInvoiceItemType financialInvoiceItemType;
 		if (institutionContract.IsInstallment)
 		{
-			entityId = institutionContract.Installments.MinBy(x => x.InstallmentDateGr).Id;
+			var firstInstallment = institutionContract.Installments.First();
-			financialInvoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
+			var firstInstallmentAmount = firstInstallment.Amount;
+
+			financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(firstInstallment.Id, FinancialInvoiceItemType.BuyInstitutionContractInstallment);
+			if (financialInvoice == null)
+			{
+				var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+					"قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
+				financialStatement.AddFinancialTransaction(financialTransaction);
+				invoiceAmount = firstInstallmentAmount;
+				invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {institutionContract.ContractNo}";
+				invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
+				invoiceItemEntityId = firstInstallment.Id;
 			}
 			else
 			{
-			entityId = institutionContract.id;
+				invoiceAmount = financialInvoice.Amount;
-			financialInvoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+				invoiceItemDescription = financialInvoice.Items.First().Description;
+				invoiceItemType = financialInvoice.Items.First().Type;
+				invoiceItemEntityId = financialInvoice.Items.First().EntityId;
+			}
+		}
+		else
+		{
+			financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(institutionContract.id, FinancialInvoiceItemType.BuyInstitutionContract);
+			if (financialInvoice == null)
+			{
+				var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+					"پرداخت کل سرویس", "debt", "بابت خدمات", institutionContract.TotalAmount, 0, 0);
+				financialStatement.AddFinancialTransaction(financialTransaction);
+				invoiceAmount = institutionContract.TotalAmount;
+				invoiceItemDescription = $"پرداخت کل قرارداد شماره {institutionContract.ContractNo}";
+				invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+				invoiceItemEntityId = institutionContract.id;
+			}
+			else
+			{
+				invoiceAmount = financialInvoice.Amount;
+				invoiceItemDescription = financialInvoice.Items.First().Description;
+				invoiceItemType = financialInvoice.Items.First().Type;
+				invoiceItemEntityId = financialInvoice.Items.First().EntityId;
+			}
 		}
 
-		var financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(entityId, financialInvoiceItemType);
+		if (financialInvoice == null)
-		var amount = financialInvoice.Amount;
+		{
+			financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {institutionContract.ContractNo}");
+			financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0, invoiceItemType, invoiceItemEntityId);
+			financialInvoice.AddItem(financialInvoiceItem);
+			await _financialInvoiceRepository.CreateAsync(financialInvoice);
+		}
 
-		var transaction = new PaymentTransaction(institutionContract.ContractingPartyId, amount,
+		await _financialInvoiceRepository.SaveChangesAsync();
+
+		var transaction = new PaymentTransaction(institutionContract.ContractingPartyId, invoiceAmount,
 			institutionContract.ContractingPartyName, "https://client.gozareshgir.ir",
 			PaymentTransactionGateWay.SepehrPay);
 		await _paymentTransactionRepository.CreateAsync(transaction);
@@ -1341,7 +1369,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
 		var createPayment = new CreatePaymentGatewayRequest()
 		{
-			Amount = amount,
+			Amount = invoiceAmount,
 			TransactionId = transaction.id.ToString(),
 			CallBackUrl = callbackUrl,
 			FinancialInvoiceId = financialInvoice.id,
@@ -1402,6 +1430,17 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return res;
     }
 
+    public InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request)
+    {
+        return _institutionContractRepository.CalculateDiscount(request);
+    }
+
+    public InstitutionContractDiscountResponse ResetDiscountCreate(
+        InstitutionContractResetDiscountForCreateRequest request)
+    {
+        return _institutionContractRepository.ResetDiscountCreate(request);
+    }
+
     public async Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId)
     {
         return await _institutionContractRepository.GetExtensionInquiry(previousContractId);
@@ -1425,12 +1464,25 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return await _institutionContractRepository.GetExtensionPaymentMethod(request);
     }
 
+    public async Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
+        InstitutionContractSetDiscountForExtensionRequest request)
+    {
+        return await  _institutionContractRepository.SetDiscountForExtension(request);
+    }
+
+    public async Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(
+        InstitutionContractResetDiscountForExtensionRequest request)
+    {
+        return await _institutionContractRepository.ResetDiscountForExtension(request);
+    }
+
     public async Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request)
     {
         return await _institutionContractRepository.ExtensionComplete(request);
     }
 
-	public async Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected)
+    public async Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,
+        string selected)
     {
         return await _institutionContractRepository.GetInstitutionContractSelectList(search, selected);
     }
@@ -1440,7 +1492,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return await _institutionContractRepository.GetAmendmentWorkshops(institutionContractId);
     }
 
-	public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request)
+    public async Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(
+        InstitutionContractAmendmentTempWorkshopViewModel request)
     {
         return await _institutionContractRepository.InsertAmendmentTempWorkshops(request);
     }
@@ -1450,7 +1503,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return _institutionContractRepository.RemoveAmendmentWorkshops(workshopTempId);
     }
 
-	public Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request)
+    public Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(
+        InsitutionContractAmendmentPaymentRequest request)
     {
         return _institutionContractRepository.GetAmendmentPaymentDetails(request);
     }
@@ -1468,6 +1522,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             throw new BadRequestException("این قرارداد مالی در وضعیت مناسبی برای ارسال مجدد لینک تایید نمی باشد");
         }
+
         var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
         if (contractingParty == null)
             throw new NotFoundException("طرف قرارداد یافت نشد");
@@ -1485,7 +1540,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     public async Task<OperationResult> SetPendingWorkflow(long entityId)
     {
         var op = new OperationResult();
-		var institutionContract = _institutionContractRepository.Get(entityId);
+        var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
         if (institutionContract == null)
         {
             return op.Failed("قرارداد مالی یافت نشد");
@@ -1495,11 +1550,24 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
         }
+
+        if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
+        {
+            institutionContract.Verified();
+        }
+        else
+        {
             institutionContract.SetPendingWorkflow();
+        }
+
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
 
+	public async Task<long> GetIdByInstallmentId(long installmentId)
+	{
+		return await _institutionContractRepository.GetIdByInstallmentId(installmentId);
+	}
 
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
@@ -1704,3 +1772,4 @@ public class WorkshopsAndEmployeeViewModel
 }
 
 #endregion
+

CompanyManagment.Application/LeftWorkTempApplication.cs

@@ -290,17 +290,11 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
 
 
         //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
+        
         var rollCallsEmployee = _rollCallEmployeeRepository.GetBy(employeeId, workshopId);
 
-        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
+        if (rollCallsEmployee != null)
-        // {
+        {
-        //     x.WorkshopId,
-        //     x.EmployeeId,
-        //     y.LeftWorkDateGr,
-        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
-        // });
-
-
             var status = rollCallsEmployee.EmployeesStatus.OrderByDescending(z => z.StartDate)
                 .FirstOrDefault(rollCallEmployeeStatus => rollCallEmployeeStatus.StartDate.Date < maxLeftWork.LeftWorkDateGr
                                                           && rollCallEmployeeStatus.EndDate.Date >
@@ -323,5 +317,16 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
                 _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
                 _rollCallEmployeeStatusRepository.SaveChanges();
             }
+        }
+        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
+        // {
+        //     x.WorkshopId,
+        //     x.EmployeeId,
+        //     y.LeftWorkDateGr,
+        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
+        // });
+
+
+       
     }
 }

CompanyManagment.Application/TemporaryClientRegistrationApplication.cs

@@ -240,6 +240,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 result.IdNumberSerial = createTemp.IdNumberSerial;
                 result.IdNumber = idNumber;
                 result.NationalCode = createTemp.NationalCode;
+                result.Phone = createTemp.Phone;
+                result.IdNumberSeri = createTemp.IdNumberSeri;
 
 
                 return op.Succcedded(result);

CompanyManagment.EFCore/Migrations/20251129103132_add discount to institutioncontract.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class adddiscounttoinstitutioncontract : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "DiscountAmount",
+                table: "InstitutionContracts",
+                type: "float",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "DiscountPercentage",
+                table: "InstitutionContracts",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DiscountAmount",
+                table: "InstitutionContracts");
+
+            migrationBuilder.DropColumn(
+                name: "DiscountPercentage",
+                table: "InstitutionContracts");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -3265,6 +3265,12 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10000)
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<double>("DiscountAmount")
+                        .HasColumnType("float");
+
+                    b.Property<int>("DiscountPercentage")
+                        .HasColumnType("int");
+
                     b.Property<string>("EmployeeManualCount")
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -4724,6 +4724,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
         #region KebabMahdiAbsentsCaclculation
         
+     
+
         var rollCallDays = groupedRollCall.Count > mandatoryDays ? mandatoryDays : groupedRollCall.Count;
 
         absenceDays = mandatoryDays - rollCallDays;
@@ -5109,6 +5111,45 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
         }
         #endregion
 
+        #region اگر که پرسنل در روز های جمعه یا پنجشنبه غیبت داشت یک روز به غیبت اضافه شود
+//این منطق زمانی برقرار هست که مرخصی در اون روز نداشته باشه
+
+        // ساخت لیست روزهای بین شروع و پایان قرارداد
+        var contractDaysList = Enumerable.Range(0, (contractEnd - contractStart).Days + 1)
+            .Select(offset => contractStart.AddDays(offset))
+            .ToList();
+
+        // کم کردن روزهایی که حضور دارند
+        var absentDaysList = contractDaysList
+            .Where(date => !groupedRollCall.Any(g => g.ShiftDate.Date == date.Date))
+            .ToList();
+        
+        var absentFridaysOrThursdays = absentDaysList
+            .Where(date => date.DayOfWeek is DayOfWeek.Friday or DayOfWeek.Thursday)
+            .ToList();
+        
+        var leaveList = _context.LeaveList
+            .Where(x => x.EmployeeId == employeeId 
+                        && x.WorkshopId == workshopId 
+                        && x.IsAccepted == true
+                        && x.StartLeave <= contractEnd 
+                        && x.EndLeave >= contractStart
+                        && x.LeaveType == "استحقاقی" 
+                        && x.PaidLeaveType =="روزانه")
+            .Select(x => new { x.StartLeave, x.EndLeave })
+            .ToList();
+
+        // بررسی کدام روزهای غایب جمعه/پنجشنبه در بازه مرخصی قرار ندارند
+        var absentFridaysOrThursdaysWithoutLeave = absentFridaysOrThursdays
+            .Where(date => !leaveList.Any(leave => date.Date >= leave.StartLeave.Date && date.Date <= leave.EndLeave.Date))
+            .ToList();
+
+        // تعداد روزهای غایب جمعه/پنجشنبه بدون مرخصی
+        int absentFridaysOrThursdaysWithoutLeaveCount = absentFridaysOrThursdaysWithoutLeave.Count;
+        
+        absentsDeductionAmount += absentFridaysOrThursdaysWithoutLeaveCount * dailyWage;
+        #endregion
+        
 
         return new CustomizeCheckoutMandatoryViewModel
         {

CompanyManagment.EFCore/Services/UidService.cs

@@ -70,13 +70,23 @@ public class UidService : IUidService
 
             if (!requestResult.IsSuccessStatusCode)
                 return null;
+            
             var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
+            
             if (responseResult.BasicInformation != null)
             {
+                if (string.IsNullOrWhiteSpace(responseResult.BasicInformation.FirstName))
+                {
+                    return null;
+                }
                 responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
                 responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
                 responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
             }
+            else
+            {
+                return null;
+            }
 
             // ذخیره اطلاعات در جدول AuthorizedPerson
             await SaveAuthorizedPersonData(responseResult, nationalCode, birthDate);

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -451,8 +451,19 @@ public class institutionContractController : AdminBaseController
         
         return operationResult;
     }
+    [HttpPost("create/set-discount")]
+    public ActionResult<InstitutionContractDiscountResponse> SetDiscountForInstitutionContract([FromBody]InstitutionContractSetDiscountRequest request)
+    {
+        var res = _institutionContractApplication.CalculateDiscount(request);
+        return res;
+    }
 
-    
+    [HttpPost("create/reset-discount")]
+    public ActionResult<InstitutionContractDiscountResponse> ResetDiscountForCreate([FromBody]InstitutionContractResetDiscountForCreateRequest request)
+    {
+        var res = _institutionContractApplication.ResetDiscountCreate(request);
+        return res;
+    }
     /// <summary>
     /// 
     /// </summary>
@@ -546,6 +557,20 @@ public class institutionContractController : AdminBaseController
         return res;
     }
     
+    [HttpPost("extension/set-discount")]
+    public async Task<ActionResult<InstitutionContractDiscountResponse>> SetDiscountForExtension([FromBody]InstitutionContractSetDiscountForExtensionRequest request)
+    {
+        var res =await _institutionContractApplication.SetDiscountForExtension(request);
+        return res;
+    }
+
+    [HttpPost("extension/reset-discount")]
+    public async Task<ActionResult<InstitutionContractDiscountResponse>> ResetDiscountForExtension([FromBody]InstitutionContractResetDiscountForExtensionRequest request)
+    {
+        var res =await _institutionContractApplication.ResetDiscountForExtension(request);
+        return res;
+    }
+    
     [HttpPost("extenstion/complete")]
     public async Task<ActionResult<OperationResult>> ExtensionComplete([FromBody]InstitutionContractExtensionCompleteRequest request)
     {

ServiceHost/Areas/Admin/Pages/Shared/_Menu.cshtml

@@ -507,6 +507,13 @@
                                 </svg>
                                 لیست تراکنش های درگاه پرداخت
                             </a></li>
+                        <li permission="307" style=";white-space: nowrap">
+                            <a class="clik10 " href="https://admin@(AppSetting.Value.Domain)/account-number-database" style="width: 7px;margin: 0 6px;">
+                                <svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <circle cx="6.5" cy="6.5" r="6.5" fill="white"/>
+                                </svg>
+                                اطلاعات بانکی طرف حساب
+                            </a></li>
                     </ul>
 
 

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs

@@ -28,6 +28,7 @@ using Parbad;
 using Parbad.AspNetCore;
 using Parbad.Gateway.Sepehr;
 using System.ComponentModel.DataAnnotations;
+using _0_Framework.Application.Enums;
 using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
@@ -46,7 +47,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IOnlinePayment _onlinePayment;
 
 
-
         [BindProperty] public IFormFile File { get; set; }
 
         [BindProperty]
@@ -58,6 +58,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         [Required(ErrorMessage = "لطفا کد ورژن را وارد کنید")]
         [Display(Name = "کد ورژن")]
         public string VersionCode { get; set; }
+
         [BindProperty] public ApkType SelectedApkType { get; set; }
         [BindProperty] public bool IsForce { get; set; }
 
@@ -82,7 +83,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
         public async Task<IActionResult> OnPostUpload()
         {
-            var result = await _application.CreateAndActive(File,SelectedApkType, VersionName, VersionCode, IsForce);
+            var result = await _application.CreateAndActive(File, SelectedApkType, VersionName, VersionCode, IsForce);
             ViewData["message"] = result.Message;
             return Page();
         }
@@ -103,7 +104,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
 
             var amount = 10000;
-            var transaction = new PaymentTransaction(30427, amount, "سید حسن مصباح", "https://client.gozareshgir.ir", PaymentTransactionGateWay.SepehrPay);
+            var transaction = new PaymentTransaction(30427, amount, "سید حسن مصباح", "https://client.gozareshgir.ir",
+                PaymentTransactionGateWay.SepehrPay);
 
             _context.PaymentTransactions.Add(transaction);
             await _context.SaveChangesAsync();
@@ -132,21 +134,9 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         }
 
 
-
+        public async Task<IActionResult> OnPostShiftDateNew()
-        public IActionResult OnPostShiftDateNew()
         {
-            var startRollCall = new DateTime(2025, 4, 21);
+            await UpdateInstitutionContract();
-            //var employees = _context.CustomizeWorkshopEmployeeSettings
-            //    .Where(x => x.WorkshopShiftStatus == WorkshopShiftStatus.Rotating).Select(x => x.EmployeeId).ToList();
-
-            var rollCalls = _context.RollCalls.Where(x => x.ShiftDate >= startRollCall && x.EndDate != null).ToList();
-            var r1 = rollCalls.ToList();
-
-            Console.ForegroundColor = ConsoleColor.DarkRed;
-            Console.WriteLine("endStep 1 ============");
-            SetBreakTime(r1);
-
-
             ViewData["message"] = "تومام یک";
             return Page();
         }
@@ -169,20 +159,21 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                 .ThenInclude(x => x.LeftWorks)
                 .Include(x => x.Workshop)
                 .ThenInclude(x => x.WorkshopEmployers)
-                .ThenInclude(x=>x.Employer)
+                .ThenInclude(x => x.Employer)
                 .Select(x => new WorkshopRollCallExcelViewModel()
                 {
                     EmployerName = x.Workshop.WorkshopEmployers.First().Employer.FullName,
                     IsActive = x.IsActiveString == "true",
                     PersonnelCount = x.Workshop.LeftWorks.Count(l => l.StartWorkDate <= now && l.LeftWorkDate >= now),
                     WorkshopName = x.Workshop.WorkshopFullName
-                }).OrderByDescending(x=>x.IsActive).ToList();
+                }).OrderByDescending(x => x.IsActive).ToList();
             var dataBytes = WorkshopRollCallExcelExporter.Export(data);
             return File(dataBytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                 "RollCallServices.xlsx");
             ViewData["message"] = "تومام دو";
             return Page();
         }
+
         private async System.Threading.Tasks.Task CreateDadmehrWorkshopFaceEmbedding()
         {
             var basePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "faces");
@@ -820,7 +811,10 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         {
             var today = DateTime.Today;
             var transaction = await _context.Database.BeginTransactionAsync();
+
             var query = _context.InstitutionContractSet
+                .Where(a => a.VerifyCode == null
+                            && a.PublicId == Guid.Empty)
                 .Include(x => x.WorkshopGroup)
                 .Join(_context.PersonalContractingParties
                         .Include(x => x.Employers)
@@ -854,13 +848,17 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         var personnelCount =
                             w.LeftWorks.Count(lw => lw.StartWorkDate <= today && lw.LeftWorkDate >= today);
 
+                        var rollCallService = _context.RollCallServices
+                            .Where(x => x.WorkshopId == w.id)
+                            .ToList().MaxBy(x => x.StartService);
+
                         var calculation = _clientRegistrationApplication
                             .GetInstitutionPlanForWorkshop(new WorkshopTempViewModel()
                             {
                                 CustomizeCheckout = false,
                                 Insurance = true,
                                 InsuranceInPerson = false,
-                                RollCall = true,
+                                RollCall = rollCallService != null,
                                 WorkshopName = "",
                                 ContractAndCheckout = true,
                                 ContractAndCheckoutInPerson = false,
@@ -915,14 +913,19 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).ToList()
                     .DistinctBy(x => x.id).ToList();
 
+
                 var initialWorkshop = workshops
                     .Select(w =>
                     {
                         var personnelCount =
                             w.LeftWorks.Count(lw => lw.StartWorkDate <= today && lw.LeftWorkDate >= today);
 
-                        bool hasRollCallPlan = true;
+                        var rollCallService = _context.RollCallServices
-                        bool hasRollCallPlanInPerson = false;
+                            .Where(x => x.WorkshopId == w.id)
+                            .ToList().MaxBy(x => x.StartService);
+
+                        bool hasRollCallPlan = rollCallService != null;
+                        bool hasRollCallPlanInPerson = rollCallService != null;
                         bool hasCustomizeCheckoutPlan = w.id == 170;
                         bool hasContractPlan = true;
                         bool hasContractPlanInPerson = true;

ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml

@@ -136,6 +136,9 @@
 						        <div class="card-title">قرارداد های مالی</div>
 					        </div>
 				        </div>
+				        <div class="countNumber" id="InstitutionContractCount">
+					        <span></span>
+				        </div>
 			        </div>
 			        <div class="spinner-loading loading" style="display: none;">
 				        <span class="spinner-border spinner-border-sm loading text-white" role="status" aria-hidden="true"></span>
@@ -192,6 +195,7 @@
     <script>
 		$(document).ready(function () {
 			workFlowStartAndLeftWorkCountMenu();
+			getInstitutionContractCount();
 
 			$('.loadingButton').on('click', function (e) {
 				if (e.ctrlKey || e.metaKey) {
@@ -235,5 +239,29 @@
 				}
 			});
 		}
+
+		function getInstitutionContractCount() {
+			$.ajax({
+				async: true,
+				dataType: 'json',
+				url: `@Url.Page("./Index", "InstitutionContractCount")`,
+				headers: { "RequestVerificationToken": antiForgeryTokenLayout },
+				type: 'GET',
+				success: function (response) {
+					if (response.success) {
+						if (response.dataInstitutionContractCount === 0) {
+							$('#InstitutionContractCount').hide();
+						} else {
+							$('#InstitutionContractCount').show();
+							var contractCount = response.dataInstitutionContractCount > 99 ? "+99" : response.dataInstitutionContractCount;
+							$('#InstitutionContractCount span').text(contractCount);
+						}
+					}
+				},
+				error: function (xhr, status, error) {
+					console.error(xhr.responseText);
+				}
+			});
+		}
 	</script>
 }

ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml.cs

@@ -1,5 +1,6 @@
 using _0_Framework.Application;
 using Company.Domain.WorkshopAccountAgg;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.RollCallService;
 using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.Mvc;
@@ -18,13 +19,15 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
         private readonly IAuthHelper _authHelper;
         private readonly IWorkshopAccountRepository _workshopAccountRepository;
 	    public int EmployeeDocumentsAwaitingSubmitCount;
+	    private readonly IInstitutionContractApplication _institutionContractApplication;
         private readonly long _roleId;
 
-        public IndexModel(IAdminWorkFlowApplication adminWorkFlowApplication, IAuthHelper authHelper, IWorkshopAccountRepository workshopAccountRepository)
+        public IndexModel(IAdminWorkFlowApplication adminWorkFlowApplication, IAuthHelper authHelper, IWorkshopAccountRepository workshopAccountRepository, IInstitutionContractApplication institutionContractApplication)
         {
             _adminWorkFlowApplication = adminWorkFlowApplication;
             _authHelper = authHelper;
             _workshopAccountRepository = workshopAccountRepository;
+            _institutionContractApplication = institutionContractApplication;
             _roleId = authHelper.CurrentAccountInfo().RoleId;
 
         }
@@ -49,5 +52,27 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 				dataLeftWorkCount = resultLeftWorkCount,
 			});
 		}
+
+		public async Task<IActionResult> OnGetInstitutionContractCount()
+		{
+			try
+			{
+				var institutionContractCount = (await _institutionContractApplication.RegistrationWorkflowMainList()).Count;
+
+				return new JsonResult(new
+				{
+					success = true,
+					dataInstitutionContractCount = institutionContractCount
+				});
+			}
+			catch (Exception ex)
+			{
+				return new JsonResult(new
+				{
+					success = false,
+					message = ex.Message
+				});
+			}
+		}
     }
 }

ServiceHost/Areas/AdminNew/Pages/Index.cshtml.cs

@@ -99,7 +99,9 @@ namespace ServiceHost.Areas.AdminNew.Pages
         {
 	        var currentAccountId = _authHelper.CurrentAccountId();
 	        var accountWorkshops = _workshopAccountRepository.GetList(currentAccountId).Select(x => x.WorkshopId).ToList();
-	        int workFlowCount = await _adminWorkFlowApplication.GetWorkFlowCountsForAdmin(accountWorkshops,currentAccountId, _roleId);
+	        var permissions = _authHelper.GetPermissions();
+	        
+	        int workFlowCount = await _adminWorkFlowApplication.GetWorkFlowCountsForAdmin(accountWorkshops,currentAccountId, _roleId,permissions);
 
 
 	        return new JsonResult(new

ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml

@@ -655,6 +655,13 @@
                                     </svg>
                                     لیست تراکنش های درگاه پرداخت
                                 </a></li>
+                            <li permission="307" style=";white-space: nowrap">
+                                <a class="clik10 " href="https://admin@(AppSetting.Value.Domain)/account-number-database" style="width: 7px;margin: 0 6px;">
+                                    <svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <circle cx="6.5" cy="6.5" r="6.5" fill="white"/>
+                                    </svg>
+                                    اطلاعات بانکی طرف حساب
+                                </a></li>
                         </ul>
 
 

ServiceHost/Controllers/GeneralController.cs

@@ -150,7 +150,7 @@ public class GeneralController : GeneralBaseController
                 payResponse.cardnumber, payResponse.issuerbank, payResponse.rrn.ToString(),
                 payResponse.digitalreceipt);
 
-            if (financialInvoice.Items?.Any(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract) ?? false)
+            if (financialInvoice.Items?.Any(x => x.Type is FinancialInvoiceItemType.BuyInstitutionContract or FinancialInvoiceItemType.BuyInstitutionContractInstallment) ?? false)
             {
                 var financialItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
@@ -158,6 +158,16 @@ public class GeneralController : GeneralBaseController
                 {
                     await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId);
                 }
+                var financialInstallmentItems = financialInvoice.Items
+                    .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
+
+                foreach (var editFinancialInvoiceItem in financialInstallmentItems)
+                {
+                    var institutionContractId =
+                        await _institutionContractApplication.GetIdByInstallmentId(
+                            editFinancialInvoiceItem.Id);
+                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId);
+                }
             }
 
             if (!setSuccessResult.IsSuccedded)

ServiceHost/appsettings.Development.json

@@ -17,6 +17,9 @@
     //local
     "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
     
+    //server 
+    //"MesbahDb": "Data Source=185.208.175.186;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
+
     //dad-mehr
     //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
 

WorkFlow/Application/WorkFlow.Application.Contracts/AdminWorkFlow/IAdminWorkFlowApplication.cs

@@ -67,7 +67,7 @@ public interface IAdminWorkFlowApplication
     #endregion
 
     Task<int> GetEmployeeDocumentWorkFlowCountsForAdmin(List<long> workshopIds, long roleId);
-    Task<int> GetWorkFlowCountsForAdmin(List<long> workshopIds, long accountId, long roleId);
+    Task<int> GetWorkFlowCountsForAdmin(List<long> workshopIds, long accountId, long roleId, List<int> permissions);
     Task<int> GetWorkFlowCountForChecker();
 
 
@@ -93,7 +93,7 @@ public interface IAdminWorkFlowApplication
 
     #endregion
 
-
+    Task<int> GetInstitutionContractWorkflowCount();
 }
 
 /// <summary>

WorkFlow/Application/WorkFlow.Application/AdminWorkFlowApplication.cs

@@ -3,6 +3,7 @@ using CompanyManagment.App.Contracts.Employee;
 using WorkFlow.Application.Contracts.AdminWorkFlow;
 using WorkFlow.Infrastructure.ACL.Employee;
 using WorkFlow.Infrastructure.ACL.EmployeeDocuments;
+using WorkFlow.Infrastructure.ACL.InstitutionContract;
 using WorkFlow.Infrastructure.ACL.Workshop;
 
 namespace WorkFlow.Application
@@ -12,65 +13,76 @@ namespace WorkFlow.Application
         private readonly IWorkFlowEmployeeDocumentsACL _workFlowEmployeeDocumentsACL;
         private readonly IWorkFlowWorkshopACL _workFlowWorkshopACL;
         private readonly IWorkFlowEmployeeACL _workFlowEmployeeACL;
+        private readonly IWorkFlowInstitutionContractACL _workFlowInstitutionContractACL;
 
 
-        public AdminWorkFlowApplication(IWorkFlowEmployeeDocumentsACL workFlowEmployeeDocumentsACL, IWorkFlowWorkshopACL workFlowWorkshopACL, IWorkFlowEmployeeACL workFlowEmployeeACL)
+        public AdminWorkFlowApplication(IWorkFlowEmployeeDocumentsACL workFlowEmployeeDocumentsACL,
+            IWorkFlowWorkshopACL workFlowWorkshopACL, IWorkFlowEmployeeACL workFlowEmployeeACL,
+            IWorkFlowInstitutionContractACL workFlowInstitutionContractACL)
         {
             _workFlowEmployeeDocumentsACL = workFlowEmployeeDocumentsACL;
             _workFlowWorkshopACL = workFlowWorkshopACL;
             _workFlowEmployeeACL = workFlowEmployeeACL;
+            _workFlowInstitutionContractACL = workFlowInstitutionContractACL;
         }
 
         #region Pooya
 
-        public List<WorkshopWithDocumentsViewModelForWorkFlow> GetWorkshopDocumentsAwaitingReviewForChecker(List<long> workshops)
+        public List<WorkshopWithDocumentsViewModelForWorkFlow> GetWorkshopDocumentsAwaitingReviewForChecker(
+            List<long> workshops)
         {
             return _workFlowEmployeeDocumentsACL.GetWorkshopDocumentsAwaitingReviewForChecker(workshops);
         }
 
 
-
+        public async Task<int> GetEmployeeDocumentWorkFlowCountsForAdmin(List<long> workshopIds, long roleId)
-        public async Task<int> GetEmployeeDocumentWorkFlowCountsForAdmin(List<long> workshopIds,long roleId)
         {
             var count = 0;
-            count += await _workFlowEmployeeDocumentsACL.GetWorkshopDocumentRejectedForAdmin(workshopIds,roleId);
+            count += await _workFlowEmployeeDocumentsACL.GetWorkshopDocumentRejectedForAdmin(workshopIds, roleId);
 
-            count+= await _workFlowEmployeeDocumentsACL.GetCreatedEmployeesWorkshopDocumentForAdmin(workshopIds,roleId);
+            count += await _workFlowEmployeeDocumentsACL.GetCreatedEmployeesWorkshopDocumentForAdmin(workshopIds,
+                roleId);
 
             //count+= await _workFlowEmployeeDocumentsACL.GetClientRejectedDocumentWorkshopsForAdmin(workshopIds, roleId);
 
             return count;
         }
 
-        public async Task<int> GetWorkFlowCountsForAdmin(List<long> workshopIds, long accountId,long roleId)
+        public async Task<int> GetWorkFlowCountsForAdmin(List<long> workshopIds, long accountId, long roleId,
+            List<int> permissions)
         {
             var employeeDocumentWorkFlowCounts = await GetEmployeeDocumentWorkFlowCountsForAdmin(workshopIds, roleId);
             var startWork = await GetWorkshopsForEmployeeStartWorkCount(accountId);
             var leftWork = await GetWorkshopsForLeftWorkTempCount(accountId);
+            int institutionContract = 0;
+            if (permissions.Any(x => x == 1004))
+            {
+                institutionContract = await GetInstitutionContractWorkflowCount();
+            }
 
-            return employeeDocumentWorkFlowCounts + startWork + leftWork;
+            return employeeDocumentWorkFlowCounts + startWork + leftWork +institutionContract;
         }
 
         public async Task<int> GetWorkFlowCountForChecker()
         {
             return await _workFlowEmployeeDocumentsACL.GetCheckerWorkFlowCount();
-
         }
 
 
-
+        public List<WorkshopWithDocumentsViewModelForWorkFlow> GetWorkshopsWithDocumentsAwaitingUploadForAdmin(
-        public List<WorkshopWithDocumentsViewModelForWorkFlow> GetWorkshopsWithDocumentsAwaitingUploadForAdmin(List<long> workshops)
+            List<long> workshops)
         {
             return _workFlowEmployeeDocumentsACL.GetWorkshopsWithDocumentsAwaitingUploadForAdmin(workshops);
         }
 
-
         #endregion
 
         #region Mahan
 
         #region شروع به کار پرسنل افزوده شده
-        public async Task<ICollection<WorkshopWithStartedWorkWorkFlowViewModel>> GetWorkshopsForEmployeeStartWork(long accountId)
+
+        public async Task<ICollection<WorkshopWithStartedWorkWorkFlowViewModel>> GetWorkshopsForEmployeeStartWork(
+            long accountId)
         {
             return await _workFlowWorkshopACL.GetWorkshopsForEmployeeStartWork(accountId);
         }
@@ -81,14 +93,14 @@ namespace WorkFlow.Application
         }
 
 
-
+        public async Task<ICollection<ClientStartedWorkEmployeesWorkFlowViewModel>> GetClientEmployeesStartWork(
-
+            long workshopId)
-        public async Task<ICollection<ClientStartedWorkEmployeesWorkFlowViewModel>> GetClientEmployeesStartWork(long workshopId)
         {
             return await _workFlowEmployeeACL.GetClientEmployeesStartWork(workshopId);
         }
 
-        public async Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId, long workshopId)
+        public async Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(
+            long employeeId, long workshopId)
         {
             return await _workFlowEmployeeACL.GetEmployeeEditInEmployeeDocumentWorkFlow(employeeId, workshopId);
         }
@@ -103,16 +115,24 @@ namespace WorkFlow.Application
 
         #region ترک کار موقت
 
-        public async Task<ICollection<WorkshopWithLeftWorkWorkFlowViewModel>> GetWorkshopsForLeftWorkTemp(long accountId)
+        public async Task<ICollection<WorkshopWithLeftWorkWorkFlowViewModel>> GetWorkshopsForLeftWorkTemp(
+            long accountId)
         {
             return await _workFlowWorkshopACL.GetWorkshopsForLeftWorkTemp(accountId);
         }
+
         public async Task<int> GetWorkshopsForLeftWorkTempCount(long accountId)
         {
             return await _workFlowWorkshopACL.GetWorkshopsForLeftWorkTempCount(accountId);
         }
 
-        public async Task<ICollection<ClientLeftWorkEmployeesWorkFlowViewModel>> GetEmployeesForLeftWorkTemp(long workshopId)
+        public async Task<int> GetInstitutionContractWorkflowCount()
+        {
+            return await _workFlowInstitutionContractACL.GetInstitutionContractWorkflowCount();
+        }
+
+        public async Task<ICollection<ClientLeftWorkEmployeesWorkFlowViewModel>> GetEmployeesForLeftWorkTemp(
+            long workshopId)
         {
             return await _workFlowEmployeeACL.GetEmployeesForLeftWorkTemp(workshopId);
         }
@@ -121,7 +141,8 @@ namespace WorkFlow.Application
 
         #region آپلود مدارک پرسنل
 
-        public async Task<ICollection<WorkshopWithDocumentsViewModelForWorkFlow>> GetWorkshopDocumentCreatedEmployeeForAdmin(List<long> workshops, long roleId)
+        public async Task<ICollection<WorkshopWithDocumentsViewModelForWorkFlow>>
+            GetWorkshopDocumentCreatedEmployeeForAdmin(List<long> workshops, long roleId)
         {
             return await _workFlowEmployeeDocumentsACL.GetWorkshopDocumentCreatedEmployeeForAdmin(workshops, roleId);
         }
@@ -130,6 +151,4 @@ namespace WorkFlow.Application
 
         #endregion
     }
-
-
 }

WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/Employee/IWorkFlowEmployeeACL.cs

@@ -58,4 +58,5 @@ public class WorkFlowEmployeeACL : IWorkFlowEmployeeACL
     {
         return await _employeeApplication.EditEmployeeInEmployeeDocumentWorkFlow(command);
     }
+    
 }

WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/InstitutionContract/IWorkFlowInstitutionContractACL.cs

@@ -0,0 +1,23 @@
+using CompanyManagment.App.Contracts.InstitutionContract;
+
+namespace WorkFlow.Infrastructure.ACL.InstitutionContract;
+
+public interface IWorkFlowInstitutionContractACL
+{
+    Task<int> GetInstitutionContractWorkflowCount();
+}
+
+public class WorkFlowInstitutionContractACL : IWorkFlowInstitutionContractACL
+{
+    private readonly IInstitutionContractApplication _institutionContractApplication;
+    public WorkFlowInstitutionContractACL(IInstitutionContractApplication institutionContractApplication)
+    {
+        _institutionContractApplication = institutionContractApplication;
+    }
+
+    public async Task<int> GetInstitutionContractWorkflowCount()
+    {
+        var list = await _institutionContractApplication.RegistrationWorkflowMainList();
+        return list.Count;
+    }
+}

WorkFlow/Infrastructure/WorkFlow.Infrastructure.Config/WorkFlowBootstrapper.cs

@@ -9,6 +9,7 @@ using WorkFlow.Infrastructure.ACL.Checkout;
 using WorkFlow.Infrastructure.ACL.CustomizedWorkshopSettings;
 using WorkFlow.Infrastructure.ACL.Employee;
 using WorkFlow.Infrastructure.ACL.EmployeeDocuments;
+using WorkFlow.Infrastructure.ACL.InstitutionContract;
 using WorkFlow.Infrastructure.ACL.RollCall;
 using WorkFlow.Infrastructure.ACL.Workshop;
 using WorkFlow.Infrastructure.EfCore;
@@ -33,8 +34,7 @@ namespace WorkFlow.Infrastructure.Config
             services.AddTransient<IWorkFlowRollCallACL, WorkFlowRollCallACL>();
             services.AddTransient<IWorkFlowCustomizedWorkshopSettingsACL, WorkFlowCustomizedWorkshopSettingsACL>();
             services.AddTransient<IWorkFlowEmployeeACL, WorkFlowEmployeeACL>();
-
+            services.AddTransient<IWorkFlowInstitutionContractACL, WorkFlowInstitutionContractACL>();
-
             services.AddTransient<IWorkFlowWorkshopACL, WorkFlowWorkshopACL>();