refactor: clean up whitespace and improve query filtering in PlanPercentageRepository

# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -13,13 +14,15 @@ public class JobSchedulerRegistrator
     private readonly IInstitutionContractRepository _institutionContractRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
+    private readonly ISmsService _smsService;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
+        _smsService = smsService;
     }
 
     public void Register()
@@ -91,8 +94,8 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-          
+
             }
            
         }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -0,0 +1,10 @@
+using GozareshgirProgramManager.Application.Interfaces;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+public class NullBoardNotificationPublisher:IBoardNotificationPublisher
+{
+    public Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, TaskSectionStatus newStatus, Guid sectionId)
+    {
+        throw new NotImplementedException();
+    }
+}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -8,6 +8,7 @@ using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
 using GozareshgirProgramManager.Application._Bootstrapper;
+using GozareshgirProgramManager.Application.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
 using GozareshgirProgramManager.Infrastructure;
 using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
@@ -31,7 +32,7 @@ builder.Services.AddTransient<ISmsService, SmsService>();
 builder.Services.AddTransient<IUidService, UidService>();
 builder.Services.AddTransient<IFileUploader, FileUploader>();
 builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-
+builder.Services.AddScoped<IBoardNotificationPublisher, NullBoardNotificationPublisher>();
 #region MongoDb
 
 var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,6 +98,11 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
+    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
+        : ContractAmount;
+    
+    public double ContractAmountTax => ContractAmount*0.10;
+
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
@@ -159,6 +164,10 @@ public class InstitutionContract : EntityBase
 
     public List<InstitutionContractAmendment> Amendments { get; private set; }
 
+    public InstitutionContractSigningType? SigningType { get; private set; }
+
+    public bool IsOldContract => LawId== 0;
+
     public InstitutionContract()
     {
         ContactInfoList = [];
@@ -262,6 +271,10 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+    public void SetSigningType(InstitutionContractSigningType signingType)
+    {
+        SigningType = signingType;
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,13 +10,15 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
+        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -37,4 +37,10 @@ public class InstitutionContractWorkshopGroup : EntityBase
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
+
+    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
+    {
+        CurrentWorkshops.Add(currentWorkshop);
+        LastModifiedDate = DateTime.Now;
+    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -31,7 +31,7 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
         WorkshopCreated = true;
         WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
             Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,7 +1,9 @@
-using _0_Framework.Domain;
+using _0_Framework.Application;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.InstitutionPlanAgg;
 
@@ -26,4 +28,18 @@ public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
+
+    /// <summary>
+    /// دریافت دیتای مودال ایجاد
+    /// </summary>
+    /// <returns></returns>
+    Task<CreateServiceAmountDto> GetCreateModalData();
+
+    /// <summary>
+    /// دریافت لیست مبالغ سرویس ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<PagedResult<InstitutionPlanListDto>> GetList(
+        InstitutionPlanSearchModel searchModel);
 }

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,7 +316,10 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-
+    public void AddContractingPartyId(long contractingPartyId)
+    {
+        ContractingPartyId = contractingPartyId;
+    }
     public void Active(string archiveCode)
     {
         this.IsActive = true;

CompanyManagment.App.Contracts/InstitutionContract/ContractSigningType.cs

@@ -0,0 +1,17 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public enum InstitutionContractSigningType
+{ 
+    /// <summary>
+    /// قدیمی
+    /// </summary>
+    Legacy = 0,
+    /// <summary>
+    /// الکترونیکی با کد یکبار مصرف
+    /// </summary>
+    OtpBased = 1,
+    /// <summary>
+    /// به صورت فیزیکی
+    /// </summary>
+    Physical = 2
+}

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -260,154 +259,13 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
     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; }
+    /// <param name="institutionContractId"></param>
-    /// <summary>
+    /// <returns></returns>
-    /// ارزش افزوده
+    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
-    /// </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
-{
-    public InstitutionContratVerificationParty FirstParty { get; set; }
-    public InstitutionContratVerificationParty SecondParty { get; set; }
-    public string ContractNo { get; set; }
-    public string CreationDate { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
-    public string TotalPrice { get; set; }
-    public string TaxPrice { get; set; }
-    public string PaymentPrice { get; set; }
-    public string VerifyCode { get; set; }
-    public string VerifyDate { get; set; }
-    public string VerifyTime { get; set; }
-    public string VerifierFullName { get; set; }
-    public string VerifierPhoneNumber { get; set; }
-    public LawViewModel LawViewModel { get; set; }
-    public string Obligation { get; set; }
-}
-
-public class InsertAmendmentTempWorkshopResponse
-{
-    public Guid WorkshopTempId { get; set; }
-    public string Amount { get; set; }
-}
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
-
-    public Guid TempId { get; set; }
-
-}
-
-public class InstitutionContractSelectListViewModel : SelectListViewModel;
-
-public class InstitutionContractExtensionInquiryResponse
-{
-    public long Id { get; set; }
-    public string FName { get; set; }
-    public string LName { get; set; }
-    public string DateOfBirthFa { get; set; }
-    public string FatherName { get; set; }
-    public string IdNumberSerial { get; set; }
-    public string IdNumber { get; set; }
-    public string Address { get; set; }
-    public string Phone { get; set; }
-    public string City { get; set; }
-    public string State { get; set; }
-    public long RepresentativeId { get; set; }
-    public string NationalCode { get; set; }
-}
-
-
-
-public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-
-public class InstitutionContractExtensionPaymentOneTime
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InsertAmendmentTempWorkshopResponse
+{
+    public Guid WorkshopTempId { get; set; }
+    public string Amount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractAmendmentWorkshopsResponse.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractAmendmentWorkshopsResponse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
+
+    public Guid TempId { get; set; }
+
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractDiscountResponse.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+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; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResponse.cs

@@ -0,0 +1,18 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionInquiryResponse
+{
+    public long Id { get; set; }
+    public string FName { get; set; }
+    public string LName { get; set; }
+    public string DateOfBirthFa { get; set; }
+    public string FatherName { get; set; }
+    public string IdNumberSerial { get; set; }
+    public string IdNumber { get; set; }
+    public string Address { get; set; }
+    public string Phone { get; set; }
+    public string City { get; set; }
+    public string State { get; set; }
+    public long RepresentativeId { get; set; }
+    public string NationalCode { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentOneTime.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+public class InstitutionContractExtensionPaymentOneTime
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.Law;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractPrintViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string CreationDate { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public string OneMonthPrice { get; set; }
+    public string VerifyCode { get; set; }
+    public string VerifyDate { get; set; }
+    public string VerifyTime { get; set; }
+    public string VerifierFullName { get; set; }
+    public string VerifierPhoneNumber { get; set; }
+    public LawViewModel LawViewModel { get; set; }
+    public string Obligation { get; set; }
+    public string OneMonthWithoutTax { get; set; }
+    public string OneMonthTax { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForCreateRequest.cs

@@ -0,0 +1,10 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+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; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSelectListViewModel.cs

@@ -0,0 +1,5 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractSelectListViewModel : SelectListViewModel;

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractSetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountRequest.cs

@@ -0,0 +1,10 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+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; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -76,5 +76,7 @@ public class InstitutionContractViewModel
     public bool IsInstallment { get; set; }
     public InstitutionContractVerificationStatus VerificationStatus { get; set; }
 
+    public InstitutionContractSigningType? SigningType { get; set; }
+
     public List<InstitutionContractInstallmentViewModel> InstallmentList { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

@@ -0,0 +1,51 @@
+namespace CompanyManagment.App.Contracts.InstitutionPlan;
+
+public class CreateServiceAmountDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string ContractAndCheckoutPercentStr { get; set; }
+
+    /// <summary>
+    /// بیمه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string InsurancePercentStr { get; set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string RollCallPercentStr { get; set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string CustomizeCheckoutPercentStr { get; set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string ContractAndCheckoutInPersonPercentStr { get; set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// درصد از مزد روزانه
+    /// string
+    /// </summary>
+    public string InsuranceInPersonPercentStr { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionPlan/IInstitutionPlanApplication.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using _0_Framework.Application;
-using _0_Framework.Application;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.InstitutionPlan;
 
@@ -34,4 +35,27 @@ public interface IInstitutionPlanApplication
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
+
+
+    /// <summary>
+    /// دریافت دیتای درصد سرویس برای مودال ایجاد
+    /// </summary>
+    /// <returns></returns>
+    Task<CreateServiceAmountDto> GetCreateModalData();
+
+    /// <summary>
+    /// ایجاد درصد سرویس
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command);
+
+
+    /// <summary>
+    /// دریافت لیست مبالغ سرویس ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<PagedResult<InstitutionPlanListDto>> GetList(
+        InstitutionPlanSearchModel searchModel);
 }

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanListDto.cs

@@ -0,0 +1,84 @@
+namespace CompanyManagment.App.Contracts.InstitutionPlan;
+
+public class InstitutionPlanListDto
+{
+
+
+    /// <summary>
+    /// تعداد پرسنل
+    /// </summary>
+    public int CountPerson { get; set; }
+
+    /// <summary>
+    /// مبلغ قرارداد و تصفیه 
+    /// </summary>
+    public string ContractAndCheckout { get; set; }
+
+    /// <summary>
+    /// مبلغ بیمه
+    /// </summary>
+    public string Insurance { get; set; }
+
+    /// <summary>
+    /// مبلغ حضورغباب
+    /// </summary>
+    public string RollCall { get; set; }
+
+    /// <summary>
+    /// مبلغ فیش غیر رسمی
+    /// </summary>
+    public string CustomizeCheckout { get; set; }
+
+    /// <summary>
+    /// مبلغ خدمات حضوری قرداد و تصفیه
+    /// </summary>
+    public string ContractAndCheckoutInPerson { get; set; }
+
+    /// <summary>
+    /// مبلغ خدمات حضوری بیمه
+    /// </summary>
+    public string InsuranceInPerson { get; set; }
+
+
+
+
+    #region Total
+
+
+    /// <summary>
+    /// مبلغ کل خدمات حضوری
+    /// </summary>
+    public string InPersonSumAmountStr { get; set; }
+
+    /// <summary>
+    /// مبلغ کل خدمات آنلاین
+    /// </summary>
+    public string OnlineOnlySumAmountStr { get; set; }
+
+    /// <summary>
+    /// مبلغ کل خدمات حضوری و آنلاین
+    /// </summary>
+    public string OnlineAndInPersonSumAmountStr { get; set; }
+
+    /// <summary>
+    /// مبلغ کل خدمات حضوری و آنلاین
+    /// double
+    /// </summary>
+    public double OnlineAndInPersonSumAmountDouble { get; set; }
+
+
+    /// <summary>
+    /// مبلغ کل خدمات حضوری
+    /// double
+    /// </summary>
+    public double InPersonSumAmountDouble { get; set; }
+
+    /// <summary>
+    /// مبلغ کل خدمات آنلاین
+    /// double
+    /// </summary>
+    public double OnlineOnlySumAmountDouble { get; set; }
+
+
+    #endregion
+}

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanSearchModel.cs

@@ -0,0 +1,11 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.InstitutionPlan;
+
+public class InstitutionPlanSearchModel : PaginationRequest
+{
+    /// <summary>
+    /// تعدلد پرسنل برای جستجو
+    /// </summary>
+    public int CountPeron { get; set; }
+}

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1537,7 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public async Task<OperationResult> SetPendingWorkflow(long entityId)
+    public async Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
     {
         var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
@@ -1551,6 +1551,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
         }
 
+        var initialCreatedWorkshops = institutionContract.WorkshopGroup.InitialWorkshops
+            .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
+        
+        var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
+        foreach (var createdWorkshop in initialCreatedWorkshops)
+        {
+            if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
+            {
+                continue;
+            }
+
+            var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
+                createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
+                createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
+                createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
+                createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
+                createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
+                createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
+            institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
+            
+        }
+        
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
         {
             institutionContract.Verified();
@@ -1559,7 +1581,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             institutionContract.SetPendingWorkflow();
         }
-
+        
+        institutionContract.SetSigningType(signingType);
+        
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1569,6 +1593,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		return await _institutionContractRepository.GetIdByInstallmentId(installmentId);
 	}
 
+    public async Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId)
+    {
+        var op = new OperationResult();
+        
+        var institutionContract =await _institutionContractRepository
+            .GetIncludeWorkshopDetailsAsync(institutionContractId);
+        
+        if (institutionContract == null)
+            return op.Failed("قرارداد مالی یافت نشد");
+        
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
+            return op.Failed("قرارداد مالی قبلا تایید شده است");
+
+        var transaction = await _institutionContractRepository.BeginTransactionAsync();
+        await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
+        
+        
+        await transaction.CommitAsync();
+        await _institutionContractRepository.SaveChangesAsync();
+        return op.Succcedded();
+    }
+
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
         string state)

CompanyManagment.Application/InstitutionPlanApplication.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.InstitutionPlanAgg;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -84,4 +85,73 @@ public class InstitutionPlanApplication : IInstitutionPlanApplication
     {
         return _planPercentageRepository.GetInstitutionPlanForWorkshop(command);
     }
+
+
+    #region ForApi
+
+    public async Task<CreateServiceAmountDto> GetCreateModalData()
+    {
+        return await _planPercentageRepository.GetCreateModalData();
+    }
+
+
+    public async Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command)
+    {
+        var op = new OperationResult();
+        if (string.IsNullOrWhiteSpace(command.ContractAndCheckoutInPersonPercentStr) || command.ContractAndCheckoutInPersonPercentStr == "0" ||
+            string.IsNullOrWhiteSpace(command.ContractAndCheckoutPercentStr) || (command.ContractAndCheckoutPercentStr == "0" ||
+            string.IsNullOrWhiteSpace(command.CustomizeCheckoutPercentStr) || command.CustomizeCheckoutPercentStr == "0" ||
+            string.IsNullOrWhiteSpace(command.InsuranceInPersonPercentStr) || command.InsuranceInPersonPercentStr == "0" ||
+            string.IsNullOrWhiteSpace(command.InsurancePercentStr) || command.InsurancePercentStr == "0" ||
+            string.IsNullOrWhiteSpace(command.RollCallPercentStr) || command.RollCallPercentStr == "0"))
+            return op.Failed("هیچ یک از فیلدها نمیتوانند صفر باشند");
+
+        int contractAndCheckoutInPersonPercent = 0;
+        int contractAndCheckoutPercent = 0;
+        int customizeCheckoutPercent = 0;
+        int insuranceInPersonPercent = 0;
+        int insurancePercent = 0;
+        int rollCallPercent = 0;
+
+        try
+        {
+            contractAndCheckoutInPersonPercent = Convert.ToInt32(command.ContractAndCheckoutInPersonPercentStr);
+            contractAndCheckoutPercent = Convert.ToInt32(command.ContractAndCheckoutPercentStr);
+            customizeCheckoutPercent = Convert.ToInt32(command.CustomizeCheckoutPercentStr);
+            insuranceInPersonPercent = Convert.ToInt32(command.InsuranceInPersonPercentStr);
+            insurancePercent = Convert.ToInt32(command.InsurancePercentStr);
+            rollCallPercent = Convert.ToInt32(command.RollCallPercentStr);
+        }
+        catch (Exception e)
+        {
+            return op.Failed("لطفا عدد معتبر وارد کنید");
+
+        }
+
+        var firstPlan =await _planPercentageRepository.GetCreateModalData();
+        if (firstPlan != null)
+        {
+            var planPercentage = _planPercentageRepository.Get(firstPlan.Id);
+            planPercentage.Edit(contractAndCheckoutPercent, insurancePercent, rollCallPercent, customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
+            _planPercentageRepository.SaveChanges();
+        }
+        else
+        {
+            var create = new PlanPercentage(contractAndCheckoutPercent, insurancePercent, rollCallPercent,
+                customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
+            await _planPercentageRepository.CreateAsync(create);
+            await _planPercentageRepository.SaveChangesAsync();
+        }
+
+
+
+        return op.Succcedded();
+    }
+
+    public async Task<PagedResult<InstitutionPlanListDto>> GetList(InstitutionPlanSearchModel searchModel)
+    {
+        return await _planPercentageRepository.GetList(searchModel);
+    }
+
+    #endregion
 }

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -34,6 +34,10 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
         builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
 
         builder.Property(x => x.VerificationStatus).HasConversion<string>().HasMaxLength(122);
+        
+        builder.Property(x=>x.SigningType).HasConversion<string>()
+            .HasMaxLength(25)
+            .IsRequired(false);
 
         builder.HasMany(x => x.Installments)
             .WithOne(x => x.InstitutionContract)
@@ -45,5 +49,10 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
         builder.HasMany(x => x.Amendments).WithOne(x => x.InstitutionContract)
             .HasForeignKey(x => x.InstitutionContractId);
+
+
+        builder.Ignore(x => x.ContractAmountWithTax);
+        builder.Ignore(x => x.ContractAmountTax);
+        builder.Ignore(x => x.ContractAmountTax);
     }
 }

CompanyManagment.EFCore/Migrations/20251220143403_addsigningTypeforinstitutioncontract.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addsigningTypeforinstitutioncontract : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SigningType",
+                table: "InstitutionContracts",
+                type: "nvarchar(25)",
+                maxLength: 25,
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SigningType",
+                table: "InstitutionContracts");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -3462,6 +3462,10 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("nvarchar(1)");
 
+                    b.Property<string>("SigningType")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
                     b.Property<string>("State")
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -4,9 +4,7 @@ using _0_Framework.Application.Sms;
 using _0_Framework.Exceptions;
 using _0_Framework.InfraStructure;
 using Company.Domain.ContarctingPartyAgg;
-using Company.Domain.ContractingPartyAccountAgg;
 using Company.Domain.empolyerAgg;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -17,7 +15,6 @@ using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.SmsResultAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employer;
-using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 using CompanyManagment.App.Contracts.Hubs;
@@ -26,30 +23,17 @@ using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
-using CompanyManagment.App.Contracts.WorkshopPlan;
-using CompanyManagment.EFCore.Migrations;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using MongoDB.Driver;
-using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Diagnostics.Metrics;
-using System.Drawing;
 using System.Globalization;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using ContractingPartyAccount = Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 using String = System.String;
@@ -1375,7 +1359,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
                 return new GetInstitutionContractListItemsViewModel()
                 {
-                    ContractAmount = x.contract.ContractAmount,
+                    ContractAmount = x.contract.ContractAmountWithTax,
                     Balance = statement?.FinancialTransactionList.Sum(ft => ft.Deptor - ft.Creditor) ?? 0,
                     WorkshopsCount = workshops.Count(),
                     ContractStartFa = x.contract.ContractStartGr.ToFarsi(),
@@ -1395,9 +1379,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
+                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
                 };
             }).ToList()
         };
@@ -3216,6 +3198,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 PaymentPrice = institution.TotalAmount.ToMoney(),
                 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,
@@ -4379,6 +4364,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             {
                 var sendResult = await _smsService.SendInstitutionCreationVerificationLink(item.Number, item.FullName,
                     item.InstitutionId, item.ContractingPartyId, item.InstitutionContractId, typeOfSms);
+                Thread.Sleep(1000);
             }
 
             Console.WriteLine("executed at : " + persianNow + " - " + hour + ":" + minute);
@@ -4430,12 +4416,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TypeOfContract = x.TypeOfContract,
                 IsInstallment = x.IsInstallment,
                 VerificationStatus = x.VerificationStatus,
+                SigningType = x.SigningType,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
                     { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
-                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0)
+                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
             .ToListAsync();
 
         #endregion
@@ -4453,13 +4440,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
         #region GetDectivedContractOnCurrentMonth
-
+       
         if (futureContracts.Any())
         {
             List<long> futureContractIds = futureContracts.Select(x => x.ContractingPartyId).ToList();
             List<InstitutionContractViewModel> deatcivedContract = await _context.InstitutionContractSet
                 .Where(x => x.IsActiveString == "false" && futureContractIds.Contains(x.ContractingPartyId) &&
-                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0)
+                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
                 .Select(x => new InstitutionContractViewModel
                 {
                     Id = x.id,
@@ -4474,6 +4461,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     TypeOfContract = x.TypeOfContract,
                     IsInstallment = x.IsInstallment,
                     VerificationStatus = x.VerificationStatus,
+                    SigningType = x.SigningType,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
                         { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
@@ -4484,6 +4472,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 institutionContracts.AddRange(deatcivedContract);
         }
 
+        // قرارداد هایی که پطور یکجا پرداخت شده اند
+        var paidInFull = institutionContracts.Where(x =>
+            x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
+
+        //حذف قراداد هایی که یکجا پرداخت شده اند از لیست ایجاد سند ماهانه
+        institutionContracts = institutionContracts.Except(paidInFull).ToList();
 
         #region RollCallServicCompute
 
@@ -4531,8 +4525,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                         if (!alreadyCreated)
                         {
-                            if (item.IsInstallment &&
+                            if (item.IsInstallment)
-                                item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                             {
                                 var instalment = item.InstallmentList
                                     .FirstOrDefault(x =>
@@ -4566,8 +4559,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                         await _financialStatmentRepository.SaveChangesAsync();
 
 
-                        if (item.IsInstallment &&
+                        if (item.IsInstallment)
-                            item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                         {
                             var instalment = item.InstallmentList
                                 .FirstOrDefault(x =>
@@ -4594,12 +4586,17 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
                     #region RollCallServicCompute
-
+                    //ایجاد سند مالی حضورغیاب
-                    if (item.VerificationStatus != InstitutionContractVerificationStatus.Verified &&
+                    //قرارداد هایی که جدید نیستند و اقساط ندارند
-                        !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
+                    //کارگاه های استثناء : کباب مهدی 30520 و نمونه پروتئین 30739 
+                    if (item.SigningType != InstitutionContractSigningType.OtpBased && item.SigningType != InstitutionContractSigningType.Physical
+                        && !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
                     {
                         try
                         {
+                            //TODO
+                            //@refactor Need
+
                             var employers = await _context.Employers
                                 .Where(x => x.ContractingPartyId == item.ContractingPartyId)
                                 .Select(x => x.id).ToListAsync();
@@ -4773,6 +4770,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => x.Installments.Any(i => i.Id == installmentId))
             .Select(x => x.id).FirstOrDefaultAsync();
     }
+    
 
     #endregion
 

CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs

@@ -1,12 +1,14 @@
-using System;
+using _0_Framework.Application;
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.InstitutionPlanAgg;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -44,6 +46,7 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
         }).FirstOrDefault();
     }
 
+
     public List<InstitutionPlanViewModel> GetInstitutionPlanList(int pageIndex, int countPeron)
     {
         var planPercentage = _context.PlanPercentages.FirstOrDefault();
@@ -303,4 +306,112 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
 
         return new InstitutionPlanViewModel();
     }
+
+
+    #region ForApi
+
+    public async Task<CreateServiceAmountDto> GetCreateModalData()
+    {
+        return await _context.PlanPercentages.Select(x => new CreateServiceAmountDto()
+        {
+            Id = x.id,
+            ContractAndCheckoutInPersonPercentStr = $"{x.ContractAndCheckoutInPersonPercent}",
+            CustomizeCheckoutPercentStr = $"{x.CustomizeCheckoutPercent}",
+            ContractAndCheckoutPercentStr = $"{x.ContractAndCheckoutPercent}",
+            InsuranceInPersonPercentStr = $"{x.InsuranceInPersonPercent}",
+            InsurancePercentStr = $"{x.InsurancePercent}",
+            RollCallPercentStr = $"{x.RollCallPercent}",
+        }).FirstOrDefaultAsync();
+    }
+
+
+    public async Task<PagedResult<InstitutionPlanListDto>> GetList(
+        InstitutionPlanSearchModel searchModel)
+    {
+        var planPercentage = await _context.PlanPercentages.FirstOrDefaultAsync();
+        
+        if (planPercentage == null)
+            return new PagedResult<InstitutionPlanListDto>();
+        
+        var dailyWageYearlySalery = await _context.YearlySalaries.Include(i => i.YearlySalaryItemsList).FirstOrDefaultAsync(x =>
+            x.StartDate.Date <= DateTime.Now.Date && x.EndDate >= DateTime.Now.Date);
+        if (dailyWageYearlySalery == null)
+            return new PagedResult<InstitutionPlanListDto>();
+
+        var dailyWage = dailyWageYearlySalery.YearlySalaryItemsList.Where(x => x.ItemName == "مزد روزانه")
+            .Select(x => x.ItemValue).FirstOrDefault();
+
+        var plans = _context.InstitutionPlans.AsQueryable();
+        
+        if (searchModel.CountPeron > 0)
+            plans = plans.Where(x => x.CountPerson == searchModel.CountPeron);
+        
+        var count = await plans.CountAsync();
+        
+        var planQueryFilter =await plans.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
+        var planResult =  planQueryFilter.Select(plan =>
+            new InstitutionPlanViewModel
+            {
+                CountPerson = plan.CountPerson,
+
+                ContractAndCheckoutDouble =
+                    ((dailyWage * planPercentage.ContractAndCheckoutPercent / 100) * plan.CountPerson *
+                     plan.IncreasePercentage),
+
+                InsuranceDouble = (((dailyWage * planPercentage.InsurancePercent) / 100) * plan.CountPerson *
+                                   plan.IncreasePercentage),
+
+                RollCallDouble = (((dailyWage * planPercentage.RollCallPercent) / 100) * plan.CountPerson *
+                                  plan.IncreasePercentage),
+
+                CustomizeCheckoutDouble = (((dailyWage * planPercentage.CustomizeCheckoutPercent) / 100) *
+                                           plan.CountPerson *
+                                           plan.IncreasePercentage),
+
+                ContractAndCheckoutInPersonDouble =
+                    (((dailyWage * planPercentage.ContractAndCheckoutInPersonPercent) / 100) * plan.CountPerson *
+                     plan.IncreasePercentage),
+
+                InsuranceInPersonDouble = (((dailyWage * planPercentage.InsuranceInPersonPercent) / 100) *
+                                           plan.CountPerson *
+                                           plan.IncreasePercentage)
+            }).ToList();
+
+        var finalResult = planResult.Select(plan => new InstitutionPlanListDto()
+        {
+            CountPerson = plan.CountPerson,
+
+            ContractAndCheckout = plan.ContractAndCheckoutDouble.ToMoney(),
+
+            Insurance = plan.InsuranceDouble.ToMoney(),
+
+            RollCall = plan.RollCallDouble.ToMoney(),
+
+            CustomizeCheckout = plan.CustomizeCheckoutDouble.ToMoney(),
+
+            ContractAndCheckoutInPerson = plan.ContractAndCheckoutInPersonDouble.ToMoney(),
+
+            InsuranceInPerson = plan.InsuranceInPersonDouble.ToMoney(),
+
+            InPersonSumAmountStr =
+                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.ContractAndCheckoutInPersonDouble +
+                 plan.InsuranceInPersonDouble).ToMoney(),
+
+            OnlineAndInPersonSumAmountStr = (plan.ContractAndCheckoutDouble + plan.InsuranceDouble +
+                                             plan.ContractAndCheckoutInPersonDouble + plan.InsuranceInPersonDouble +
+                                             plan.RollCallDouble + plan.CustomizeCheckoutDouble).ToMoney(),
+
+            OnlineOnlySumAmountStr =
+                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.RollCallDouble +
+                 plan.CustomizeCheckoutDouble).ToMoney(),
+        }).ToList();
+
+        return new PagedResult<InstitutionPlanListDto>()
+        {
+            TotalCount = count,
+            List = finalResult
+        };
+
+    }
+    #endregion
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -126,7 +126,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("SkillId");
 
-                    b.ToTable("PhaseSections");
+                    b.ToTable("PhaseSections", (string)null);
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
@@ -238,7 +238,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("SkillId");
 
-                    b.ToTable("ProjectSections");
+                    b.ToTable("ProjectSections", (string)null);
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>

ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs

@@ -0,0 +1,63 @@
+using _0_Framework.Application;
+using AccountManagement.Application.Contracts.Ticket;
+using CompanyManagment.App.Contracts.InstitutionPlan;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers;
+
+public class ServiceAmountsManagement : AdminBaseController
+{
+    private readonly IInstitutionPlanApplication _institutionPlanApplication;
+    private readonly IAuthHelper _authHelper;
+
+    public ServiceAmountsManagement(IInstitutionPlanApplication institutionPlanApplication, IAuthHelper authHelper)
+    {
+        _institutionPlanApplication = institutionPlanApplication;
+        _authHelper = authHelper;
+    }
+
+
+    /// <summary>
+    /// دریافت دیتای مودال ایجاد
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("GetCreateModalData")]
+    public async Task<ActionResult<CreateServiceAmountDto>> GetCreateModalData()
+    {
+        if(!_authHelper.HasPermission(315))
+            return Forbid();
+        var data = await _institutionPlanApplication.GetCreateModalData();
+
+        return data;
+    }
+
+    /// <summary>
+    /// ذخیره درصدها
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPost("CreateServicePercentage")]
+    public async Task<ActionResult<OperationResult>> CreateServicePercentage([FromBody] CreateServiceAmountDto command)
+    {
+
+        if (!_authHelper.HasPermission(315))
+            return Forbid();
+
+        var result = await _institutionPlanApplication.CreateInstitutionPlanPercentage(command);
+
+        return result;
+    }
+
+    /// <summary>
+    /// دریافت لیست مبالغ سرویس ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    [HttpGet("GetList")]
+    public async Task<ActionResult<PagedResult<InstitutionPlanListDto>>> GetList(InstitutionPlanSearchModel searchModel)
+    {
+        return await _institutionPlanApplication.GetList(searchModel);
+    }
+}

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -807,6 +807,13 @@ public class institutionContractController : AdminBaseController
         var res =await _institutionContractApplication.PrintOneAsync(id);
         return res;
     }
+
+    [HttpPost("mannual-verify/{id}")]
+    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
+    {
+        var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
+        return res;
+    }
 }
 
 

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/DeployLog.cshtml

@@ -0,0 +1,15 @@
+@page
+
+
+<h4>Deploy Log</h4>
+
+<pre style="
+    background:#111;
+    color:#0f0;
+    padding:15px;
+    max-height:600px;
+    overflow:auto;
+    font-size:13px;
+    border-radius:6px;">
+
+</pre>

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

@@ -2,6 +2,14 @@
 @model ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel
 @{
     ViewData["Title"] = "File Upload";
+    <style>
+        .lineDiv {
+            width: 100%;
+            height: 2px;
+            background-image: linear-gradient(to right, #ffffff, #e5e5e5, #cbcbcb, #b2b2b2, #9a9a9a, #9a9a9a, #9a9a9a, #9a9a9a, #b2b2b2, #cbcbcb, #e5e5e5, #ffffff);
+            margin: 10px;
+        }
+    </style>
 }
 
 <h1>Upload APK File</h1>
@@ -60,16 +68,85 @@
 </form>
 
 
-<form style="margin:50px" asp-page-handler="PaymentGateWay" id="11" method="post">
+<form style="margin:30px" asp-page-handler="PaymentGateWay" id="11" method="post">
 
     <button type="submit">درگاه پرداخت تستی  </button>
 </form>
+<div class="lineDiv"></div>
+<div class="row m-t-20">
+    <div class="col-4"></div>
+    <div class="col-2">
+        <form asp-page-handler="UploadFrontEnd" id="12" method="post">
+            <button type="submit"
+                    class="btn btn-danger"
+                    onclick="return confirm('آیا از انتشار نسخه جدید فرانت مطمئن هستید؟');">
+                🚀 Deploy Next UI
+            </button>
+        </form>
+    </div>
+    <div class="col-2">
+        <button type="button" class="btn btn-outline-secondary"
+                data-bs-toggle="modal"
+                data-bs-target="#logModal">
+            مشاهده لاگ Deploy
+        </button>
+    </div>
+    <div class="col-4"></div>
+</div>
+<div class="lineDiv"></div>
+
+
+
+
+<div class="modal fade" id="logModal" tabindex="-1">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <h5 class="modal-title">Deploy Log</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+
+            <div class="modal-body">
+                <pre id="logContent"
+                     style="background: #111;
+                            color: #0f0;
+                            padding: 15px;
+                            font-size: 13px;
+                            text-align: left;
+                            direction: ltr;">
+
+                </pre>
+
+            </div>
+
+        </div>
+    </div>
+</div>
+
+<form style="margin:20px" asp-page-handler="ContractingPartyToWorkshop" id="13" method="post">
+
+    <button class="btn btn-outline-secondary" type="submit">  افزودن آی دی طرف حساب به کارگاه </button>
+</form>
+
+
 
 
 @if (ViewData["message"] != null)
 {
     <p>@ViewData["message"]</p>
 }
+<script>
+    document.getElementById('logModal')
+        .addEventListener('show.bs.modal', function () {
+
+            fetch('?handler=Log')
+                .then(r => r.text())
+                .then(t => {
+                    document.getElementById('logContent').textContent = t;
+                });
+        });
+</script>
 
 @* <script>
 

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

@@ -1,36 +1,40 @@
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using _0_Framework.Application.FaceEmbedding;
+using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountMangement.Infrastructure.EFCore;
 using Company.Domain.AndroidApkVersionAgg;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
+using Company.Domain.InstitutionContractAgg;
+using Company.Domain.InstitutionPlanAgg;
+using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RewardAgg;
 using Company.Domain.RollCallAgg.DomainService;
+using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.PaymentTransaction;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.EFCore;
+using Hangfire;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.EntityFrameworkCore;
-using System.Net.Http;
-using System.Security.Cryptography.Xml;
-using System.Text.Json.Serialization;
-using _0_Framework.Application.PaymentGateway;
-using Company.Domain.InstitutionContractAgg;
-using Company.Domain.InstitutionPlanAgg;
-using Company.Domain.PaymentTransactionAgg;
-using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.Extensions.Options;
 using Parbad;
 using Parbad.AspNetCore;
 using Parbad.Gateway.Sepehr;
 using System.ComponentModel.DataAnnotations;
-using _0_Framework.Application.Enums;
+using System.Diagnostics;
-using _0_Framework.Application.FaceEmbedding;
+using System.Net.Http;
-using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
+using System.Security.Cryptography.Xml;
+using System.Text;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Authentication;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -47,6 +51,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IOnlinePayment _onlinePayment;
         private readonly IFaceEmbeddingService _faceEmbeddingService;
+        private readonly IAuthHelper _authHelper;
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -61,13 +66,18 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         [Display(Name = "کد ورژن")]
         public string VersionCode { get; set; }
 
+        /// <summary>
+        /// لاگ آپلود فرانت
+        /// </summary>
+        public string LogContent { get; set; }
+
         [BindProperty] public ApkType SelectedApkType { get; set; }
         [BindProperty] public bool IsForce { get; set; }
 
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -77,6 +87,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _clientRegistrationApplication = clientRegistrationApplication;
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
+            _authHelper = authHelper;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -140,11 +151,34 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         public async Task<IActionResult> OnPostShiftDateNew()
         {
             //await UpdateInstitutionContract();
-            await UpdateFaceEmbeddingNames();
+            //await UpdateFaceEmbeddingNames();
+            await SetInstitutionContractSigningType();
             ViewData["message"] = "تومام یک";
             return Page();
         }
 
+        private async System.Threading.Tasks.Task SetInstitutionContractSigningType()
+        {
+            var query = _context.InstitutionContractSet
+                .Where(x=>x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify);
+            
+            
+            var otpSigned = query.Where(x=>x.VerifierFullName != null && x.LawId != 0).ToList();
+            foreach (var institutionContract in otpSigned)
+            {
+                institutionContract.SetSigningType(InstitutionContractSigningType.OtpBased);
+            }
+            var lagacySigned = query.Where(x=>x.VerifierFullName == null && x.LawId == 0).ToList();
+            foreach (var institutionContract in lagacySigned)
+            {
+                institutionContract.SetSigningType(InstitutionContractSigningType.Legacy);
+            }
+
+            await _context.SaveChangesAsync();
+
+
+        }
+
         public async Task<IActionResult> OnPostShiftDateNew2()
         {
             //var startRollCall = new DateTime(2025, 3, 21);
@@ -292,6 +326,105 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //TranslateCode(result?.ErrorCode);
             return Page();
         }
+        [DisableConcurrentExecution(timeoutInSeconds: 120)]
+        public async Task<IActionResult> OnPostUploadFrontEnd(CancellationToken cancellationToken)
+        {
+            var validAccountId = _authHelper.CurrentAccountId();
+            if (validAccountId == 2 || validAccountId == 322)
+            {
+                var batPath = @"C:\next-ui\deploy-next-ui.bat";
+
+                var psi = new ProcessStartInfo
+                {
+                    FileName = batPath,
+                    UseShellExecute = true,   // خیلی مهم
+                    Verb = "runas",           // اجرای Administrator
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
+                };
+
+                Process.Start(psi);
+
+                TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
+                return RedirectToPage();
+            }
+            return Forbid();
+
+        }
+
+        /// <summary>
+        /// افزودن آی دی طرف حساب  به  کارگاه
+        /// </summary>
+        /// <returns></returns>
+        [DisableConcurrentExecution(timeoutInSeconds: 120)]
+        public async Task<IActionResult> OnPostContractingPartyToWorkshop()
+        {
+            var workshops = await _context.Workshops.Where(x => x.ContractingPartyId == 0).ToListAsync();
+
+            var worskhopEmployeer = await _context.WorkshopEmployers.Include(x => x.Employer).ToListAsync();
+
+            var contractingParties = await _context.PersonalContractingParties.ToListAsync();
+
+            foreach (var workshop in workshops)
+            {
+                var employers = worskhopEmployeer.Where(x => x.WorkshopId == workshop.id);
+                var contractingPartyIdList = new List<long>();
+                foreach (var employer in employers)
+                {
+                    if (contractingParties.Any(x => x.id == employer.Employer.ContractingPartyId))
+                    {
+                        contractingPartyIdList.Add(employer.Employer.ContractingPartyId);
+                    }
+
+                }
+
+                if (contractingPartyIdList.Count > 0)
+                {
+
+
+                    if (contractingPartyIdList.Count == 1)
+                    {
+                        workshop.AddContractingPartyId(contractingPartyIdList[0]);
+                        await _context.SaveChangesAsync();
+                    }
+                    else
+                    {
+                        var idDistinct = contractingPartyIdList.Distinct().ToList();
+                        if (idDistinct.Count == 1)
+                        {
+                            workshop.AddContractingPartyId(contractingPartyIdList[0]);
+                            await _context.SaveChangesAsync();
+                        }
+                    }
+                }
+            }
+
+
+            ViewData["message"] = "آی دی های طرف حساب اضافه شد";
+            return Page();
+
+        }
+
+        /// <summary>
+        /// دریافت لاگ آپلود فرانت
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult OnGetLog()
+        {
+            var validAccountId = _authHelper.CurrentAccountId();
+            if (validAccountId == 2 || validAccountId == 322)
+            {
+                var logPath = @"C:\next-ui\log.txt";
+                if (!System.IO.File.Exists(logPath))
+                    return Content("Log file not found.");
+
+                var content = System.IO.File.ReadAllText(logPath, Encoding.UTF8);
+                return Content(content);
+            }
+            return Content("شما مجاز به دیدن لاگ نیستید");
+
+        }
+
 
         public async System.Threading.Tasks.Task OnGetCallback(string? transid, string? cardnumber,
             string? tracking_number, string status)
@@ -840,8 +973,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     contract => contract.ContractingPartyId,
                     contractingParty => contractingParty.id,
                     (contract, contractingParty) => new { contract, contractingParty });
-        
+
-        
+
             var remoteContractsQuery = query
                 .Where(x => x.contractingParty.Employers
                     .Any(e => e.WorkshopEmployers
@@ -902,7 +1035,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value);
+                        x.WorkshopId.Value,x.id);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;

ServiceHost/Controllers/GeneralController.cs

@@ -164,7 +164,7 @@ public class GeneralController : GeneralBaseController
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
                 foreach (var editFinancialInvoiceItem in financialItems)
                 {
-                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId);
+                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId,InstitutionContractSigningType.OtpBased);
                 }
                 var financialInstallmentItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
@@ -174,7 +174,7 @@ public class GeneralController : GeneralBaseController
                     var institutionContractId =
                         await _institutionContractApplication.GetIdByInstallmentId(
                             editFinancialInvoiceItem.EntityId);
-                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId);
+                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.OtpBased);
                 }
             }
 

ServiceHost/Conventions/ParameterBindingConvention.cs

@@ -70,7 +70,8 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
+                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }
@@ -80,7 +81,8 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
+                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }