Merge branch 'Main'

# Conflicts:
#	CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

.github/workflows/dotnet-developPublish.yml

@@ -37,7 +37,7 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName=".\deployuser",password="R2rNpdnetP3j>q5b18",authType="Basic" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
           -allowUntrusted `
           -enableRule:AppOffline
 

0_Framework/0_Framework.csproj

@@ -21,4 +21,19 @@
 
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Application\UID\UidService.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Application\AuthorizedPerson\AuthorizedPersonApplication.cs" />
+    <Compile Remove="Application\AuthorizedPerson\IAuthorizedPersonApplication.cs" />
+    <Compile Remove="Domain\AuthorizedPersonAgg\IAuthorizedPersonRepository.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Domain\AuthorizedPersonAgg\" />
+    <Folder Include="InfraStructure\AuthorizedPerson\" />
+  </ItemGroup>
+
 </Project>

0_Framework/Application/AppSettingConfiguration.cs

@@ -3,4 +3,6 @@
 public class AppSettingConfiguration
 {
     public string Domain { get; set; }
+    public string ClientDomain =>"client"+Domain;
+    public string AdminDomain =>"admin"+Domain;
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -26,6 +26,10 @@ public interface ISmsService
     #region Mahan
 
     Task<double> GetCreditAmount();
+    
+    public Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId);
+    
+    public Task<bool> SendInstitutionVerificationCode(string number, string code);
 
     #endregion
 

0_Framework/Application/Sms/OtpResultViewModel.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application.Sms;
+
+public class OtpResultViewModel
+{
+    public int ExpireTimeSec { get; set; }
+    public int ReSendTimeSec { get; set; }
+}

0_Framework/Application/Sms/SmsService.cs

@@ -331,7 +331,28 @@ public class SmsService : ISmsService
         }
        
     }
+    public async Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId)
+    {
+       var guidStr=institutionId.ToString();
+       var firstPart = guidStr.Substring(0, 15);
+       var secondPart = guidStr.Substring(15);
+        var verificationSendResult =await SmsIr.VerifySendAsync(number, 527519, new VerifySendParameter[]
+        {
+            new("FULLNAME", fullName),
+            new("CODE1",firstPart),
+            new("CODE2",secondPart)
+        });
+        return verificationSendResult.Status == 0;
+    }
 
+    public async Task<bool> SendInstitutionVerificationCode(string number, string code)
+    {
+        var verificationSendResult =await  SmsIr.VerifySendAsync(number, 965348, new VerifySendParameter[]
+        {
+            new("VERIFYCODE", code)
+        });
+        return verificationSendResult.Status == 0;
+    }
 
     #endregion
 }

0_Framework/Application/UID/UidService.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.UID;
-
-public class UidService : IUidService
-{
-	private readonly HttpClient _httpClient;
-	private const string BaseUrl = "https://json-api.uid.ir/api/inquiry/";
-
-	public UidService()
-	{
-		_httpClient = new HttpClient()
-		{
-			BaseAddress = new Uri(BaseUrl)
-		};
-	}
-
-	public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
-	{
-		var request = new PersonalInfoRequest
-		{
-			BirthDate = birthDate,
-			NationalId = nationalCode,
-			RequestContext = new UidRequestContext()
-		};
-		var json = JsonConvert.SerializeObject(request);
-		var contentType = new StringContent(json, Encoding.UTF8, "application/json");
-
-		try
-		{
-			var requestResult = await _httpClient.PostAsync("person/v2", contentType);
-			if (!requestResult.IsSuccessStatusCode)
-				return null;
-			var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
-			if (responseResult.BasicInformation != null)
-			{
-				responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
-				responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
-				responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
-			}
-
-			return responseResult;
-		}
-		catch
-		{
-
-			return new PersonalInfoResponse(new UidBasicInformation(),
-				new IdentificationInformation(default, default, default, default, default), new RegistrationStatus(),
-				new ResponseContext(new UidStatus(14, "")));
-		}
-		
-	}
-
-
-	public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
-	{
-		var request = new PersonalInfoRequest
-		{
-			MobileNumber = phoneNumber,
-			NationalId = nationalCode,
-			RequestContext = new UidRequestContext()
-		};
-		var json = JsonConvert.SerializeObject(request);
-		var contentType = new StringContent(json, Encoding.UTF8, "application/json");
-
-		var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
-		if (!requestResult.IsSuccessStatusCode)
-			return null;
-
-		var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-		return responseResult;
-	}
-}

0_Framework/Exceptions/BadRequestException.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace _0_Framework.Exceptions;
 
@@ -14,5 +15,13 @@ public class BadRequestException:Exception
         Details = details;
     }
 
+    public BadRequestException(string message,  Dictionary<string, object?> extra) :
+        base(message)
+    {
+        Extra = extra;
+    }
+
     public string Details { get; }
+    public  Dictionary<string,object> Extra { get; set; }
+    
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Diagnostics;
@@ -24,37 +25,42 @@ public class CustomExceptionHandler : IExceptionHandler
             "Error Message: {exceptionMessage}, Time of occurrence {time}",
             exception.Message, DateTime.UtcNow);
 
-        (string Detail, string Title, int StatusCode) details = exception switch
+        (string Detail, string Title, int StatusCode, Dictionary<string, object>? Extra) details = exception switch
         {
             InternalServerException =>
             (
                 exception.Message,
                 exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError
+                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
+                null
             ),
-            BadRequestException =>
+            BadRequestException bre =>
             (
                 exception.Message,
                 exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status400BadRequest
+                context.Response.StatusCode = StatusCodes.Status400BadRequest,
+                bre.Extra
             ),
             NotFoundException =>
             (
                 exception.Message,
                 exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status404NotFound
+                context.Response.StatusCode = StatusCodes.Status404NotFound,
+                null
             ),
             UnAuthorizeException =>
             (
                 exception.Message,
                 exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status401Unauthorized
+                context.Response.StatusCode = StatusCodes.Status401Unauthorized,
+                null
             ),
             _ =>
             (
                 exception.Message,
                 exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError
+                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
+                null
             )
         };
 
@@ -63,9 +69,12 @@ public class CustomExceptionHandler : IExceptionHandler
             Title = details.Title,
             Detail = details.Detail,
             Status = details.StatusCode,
-            Instance = context.Request.Path
+            Instance = context.Request.Path,
+            Extensions = details.Extra ?? new Dictionary<string, object>()
         };
+        
 
+        
         problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
 
         await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);

0_Framework/InfraStructure/Mongo/MongoDbConfig.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.InfraStructure.Mongo;
+
+public class MongoDbConfig
+{
+    public string ConnectionString { get; set; } = null!;
+
+    public string DatabaseName { get; set; } = null!;
+}

0_Framework/InfraStructure/QueryableExtensions.cs

@@ -5,14 +5,14 @@ namespace _0_Framework.InfraStructure;
 
 public static class QueryableExtensions
 {
-    public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize)
+    public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize = 30)
     {
         if (page <= 0) page = 1;
         if (pageSize <= 0) pageSize = 10;
 
         return query.Skip((page - 1) * pageSize).Take(pageSize);
     }
-    public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize)
+    public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize = 30)
     {
         if (page <= 0) page = 1;
         if (pageSize <= 0) pageSize = 10;

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -64,4 +64,6 @@ public interface IAccountApplication
     /// <param name="userName"></param>
     /// <returns></returns>
     public bool CheckExistClientAccount(string userName);
+    List<AccountViewModel> GetAdminAccountsNew();
+
 }

AccountManagement.Application/AccountApplication.cs

@@ -799,4 +799,8 @@ public class AccountApplication : IAccountApplication
         return _accountRepository.CheckExistClientAccount(userName);
     }
 
+    public List<AccountViewModel> GetAdminAccountsNew()
+    {
+        return _accountRepository.GetAdminAccountsNew();
+    }
 }

Company.Domain/AuthorizedPersonAgg/AuthorizedPerson.cs

@@ -0,0 +1,51 @@
+using System;
+using _0_Framework.Domain;
+
+namespace Company.Domain.AuthorizedPersonAgg;
+
+public class AuthorizedPerson : EntityBase
+{
+    public string NationalCode { get; private set; }
+    public string FirstName { get; private set; }
+    public string LastName { get; private set; }
+    public string FatherName { get; private set; }
+    public string BirthDate { get; private set; }
+    public string Gender { get; private set; }
+    public string DeathStatus { get; private set; }
+    public string ShenasnameSeri { get; private set; }
+    public string ShenasnameSerial { get; private set; }
+    public string ShenasnamehNumber { get; private set; }
+    public bool IsVerified { get; private set; }
+    public DateTime? VerificationDate { get; private set; }
+
+    public AuthorizedPerson(string nationalCode, string firstName, string lastName, string fatherName, 
+        string birthDate, string gender, string deathStatus, string shenasnameSeri, 
+        string shenasnameSerial, string shenasnamehNumber)
+    {
+        NationalCode = nationalCode;
+        FirstName = firstName;
+        LastName = lastName;
+        FatherName = fatherName;
+        BirthDate = birthDate;
+        Gender = gender;
+        DeathStatus = deathStatus;
+        ShenasnameSeri = shenasnameSeri;
+        ShenasnameSerial = shenasnameSerial;
+        ShenasnamehNumber = shenasnamehNumber;
+        IsVerified = true;
+        VerificationDate = DateTime.Now;
+    }
+
+    public void UpdatePersonalInfo(string firstName, string lastName, string fatherName, 
+        string gender, string deathStatus)
+    {
+        FirstName = firstName;
+        LastName = lastName;
+        FatherName = fatherName;
+        Gender = gender;
+        DeathStatus = deathStatus;
+        VerificationDate = DateTime.Now;
+    }
+
+    protected AuthorizedPerson() { }
+}

Company.Domain/AuthorizedPersonAgg/IAuthorizedPersonRepository.cs

@@ -0,0 +1,9 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.AuthorizedPersonAgg;
+
+public interface IAuthorizedPersonRepository : IRepository<long, AuthorizedPerson>
+{
+    AuthorizedPerson GetByNationalCode(string nationalCode);
+    bool ExistsByNationalCode(string nationalCode);
+}

Company.Domain/Company.Domain.csproj

@@ -18,4 +18,8 @@
     <Folder Include="CheckoutAgg\ValueObjects\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MongoDB.Bson" Version="3.5.0" />
+  </ItemGroup>
+
 </Project>

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -15,7 +15,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     EditPersonalContractingParty GetDetailsToEdit(long id);
     string GetFullName(long id);
     List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2);
-    int GetLastArchiveCode();
+    int GetLastNewArchiveCode();
 	#region Mahan
 
 	List<string> SearchByName(string name);
@@ -74,4 +74,6 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
     Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
 
+    Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
+    Task<PersonalContractingParty> GetByRegisterId(string registerId);
 }

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -73,12 +73,27 @@ public class PersonalContractingParty : EntityBase
     /// آیا از طریق ای پی ای احراز هویت شده است
     /// </summary>
     public bool IsAuthenticated { get; private set; }
-
-
+    
     /// <summary>
     /// جنسیت
     /// </summary>
     public Gender Gender { get; private set; }
+
+    /// <summary>
+    /// سمت و صاحب امضاء اوراق (فقط برای طرف حقوقی)
+    /// </summary>
+    public string LegalPosition { get; private set; }
+
+    /// <summary>
+    /// نام مدیر عامل (فقط برای طرف حقوقی)
+    /// </summary>
+    public string CeoFName { get; private set; }
+    
+    /// <summary>
+    /// نام خانوادگی مدیر عامل (فقط برای طرف حقوقی)
+    /// </summary>
+    public string CeoLName { get; private set; }
+    
     #endregion
 
 
@@ -94,7 +109,8 @@ public class PersonalContractingParty : EntityBase
     public PersonalContractingParty(string fName, string lName, string nationalcode, string idNumber,
         /*string legalName,*/ string registerId, string nationalId, string isLegal,
         string phone, string agentPhone, string address,long representativeId,
-        string representativeFullName, int archiveCode, string state,string city, string zone, string sureName)
+        string representativeFullName, int archiveCode, string state,string city,
+        string zone, string sureName,string ceoFName,string ceoLName,string legalPosition=null)
     {
 
         FName = fName;
@@ -120,8 +136,9 @@ public class PersonalContractingParty : EntityBase
         IsActiveString = "true";
         IsBlock = "false";
         BlockTimes = 0;
-                
-
+        LegalPosition = legalPosition;
+        CeoFName = ceoFName;
+        CeoLName = ceoLName;
     }
 
 
@@ -151,7 +168,7 @@ public class PersonalContractingParty : EntityBase
     }
 
     public void EditLegal(string lName, string registerId, string nationalId, string phone, string agentPhone, string address, long representativeId, string representativeFullName, int archiveCode, 
-        string state, string city, string zone, string sureName)
+        string state, string city, string zone, string sureName,string legalPosition = null)
     {
 
         LName = lName;
@@ -168,6 +185,8 @@ public class PersonalContractingParty : EntityBase
         State = state;
         City = city;
         Zone = zone;
+        if (legalPosition != null)
+            LegalPosition = legalPosition;
 
 
     }
@@ -203,7 +222,8 @@ public class PersonalContractingParty : EntityBase
         IsAuthenticated = true;
     }
 
-    public void Authentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender)
+    public void Authentication(string fName, string lName, string fatherName,string idNumber,
+        string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender,string phone)
     {
         this.FName = fName;
         this.LName = lName;
@@ -214,6 +234,22 @@ public class PersonalContractingParty : EntityBase
         this.IdNumber = idNumber;
         this.Gender = gender;
         this.IsAuthenticated = true;
+        Phone = phone;
+    }
+
+    public void LegalAuthentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri,
+        string idNumberSerial, string dateOfBirth, Gender gender,string phone)
+    {
+        CeoFName = fName;
+        CeoLName = lName;
+        this.FatherName = fatherName;
+        this.IdNumberSeri = idNumberSeri;
+        this.IdNumberSerial = idNumberSerial;
+        this.DateOfBirth = !string.IsNullOrWhiteSpace(dateOfBirth) ? dateOfBirth.ToGeorgianDateTime() : null;
+        this.IdNumber = idNumber;
+        this.Gender = gender;
+        this.IsAuthenticated = true;
+        Phone = phone;
     }
 
     public void RegisterComplete(string fatherName, string idNumberSeri, string idNumberSerial, DateTime dateOfBirth, Gender gender)

Company.Domain/FinancialStatmentAgg/FinancialStatment.cs

@@ -17,6 +17,7 @@ public class FinancialStatment : EntityBase
         ContractingPartyId = contractingPartyId;
         ContractingPartyName = contractingPartyName;
         PublicId = Guid.NewGuid();
+        FinancialTransactionList = [];
     }
 
     public FinancialStatment()
@@ -37,4 +38,12 @@ public class FinancialStatment : EntityBase
     {
         PublicId = Guid.NewGuid();
     }
+    
+    public void AddFinancialTransaction(FinancialTransaction financialTransaction)
+    {
+        if (financialTransaction == null)
+            throw new ArgumentNullException(nameof(financialTransaction));
+        FinancialTransactionList.Add(financialTransaction);
+    }
+    
 }

Company.Domain/FinancialStatmentAgg/IFinancialStatmentRepository.cs

@@ -23,4 +23,5 @@ public interface IFinancialStatmentRepository : IRepository<long, FinancialStatm
     Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
     Task<double> GetClientDebtAmount(long accountId);
     Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
+    Task<FinancialStatment> GetByContractingPartyId(long contractingPartyId);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -47,4 +47,16 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList(InstitutionContractListSearchModel searchModel);
     Task<GetInstitutionContractListStatsViewModel> GetListStats(InstitutionContractListSearchModel searchModel);
+    Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
+    Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
+    Task<InstitutionContractWorkshopInitial> GetInstitutionWorkshopInitialDetails(long institutionWorkshopInitialId);
+    Task<InstitutionContract> GetIncludeWorkshopDetailsAsync(long institutionContractId);
+    void UpdateStatusIfNeeded(long institutionContractId);
+    Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
+    Task<InstitutionContract> GetByPublicIdAsync(Guid id);
+    Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
+    Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
+    Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
+    Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request);
+    Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -1,17 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Security.Cryptography;
 using _0_Framework.Domain;
 using Company.Domain.InstitutionContractContactInfoAgg;
+using CompanyManagment.App.Contracts.InstitutionContract;
 
 namespace Company.Domain.InstitutionContractAgg;
 
 public class InstitutionContract : EntityBase
 {
-    public InstitutionContract(string contractNo, long representativeId, string representativeName, long contractingPartyId, 
+    public InstitutionContract(string contractNo, long representativeId, string representativeName,
+        long contractingPartyId,
         string contractingPartyName, DateTime contractDateGr, string contractDateFa, string state, string city,
         string address, DateTime contractStartGr, string contractStartFa, DateTime contractEndGr,
         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)
+        double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description,
+        string officialCompany, string typeOfcontract, string hasValueAddedTax, double valueAddedTax,
+        List<InstitutionContractWorkshopInitial> workshopDetails)
     {
         ContractNo = contractNo;
         RepresentativeId = representativeId;
@@ -43,67 +49,121 @@ public class InstitutionContract : EntityBase
         TypeOfContract = typeOfcontract;
         HasValueAddedTax = hasValueAddedTax;
         ValueAddedTax = valueAddedTax;
+        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
+        ContactInfoList = [];
+        Installments = [];
+        WorkshopGroup = new InstitutionContractWorkshopGroup(id, workshopDetails);
+        PublicId = Guid.NewGuid();
     }
 
     public string ContractNo { get; private set; }
 
     public long RepresentativeId { get; private set; }
+
     public string RepresentativeName { get; private set; }
+
     public long ContractingPartyId { get; private set; }
+
     public string ContractingPartyName { get; private set; }
+
     public DateTime ContractDateGr { get; private set; }
+
     public string ContractDateFa { get; private set; }
+
     public string State { get; private set; }
+
     public string City { get; private set; }
+
     public string Address { get; private set; }
+
     //public long ContactInfoId { get; private set; }
     public DateTime ContractStartGr { get; private set; }
+
     public string ContractStartFa { get; private set; }
+
     public DateTime ContractEndGr { get; private set; }
+
     public string ContractEndFa { get; private set; }
-        
+
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
-        
+
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
     //وجه التزام
     public double Obligation { get; private set; }
+
     // مبلغ کل قرارداد
     public double TotalAmount { get; private set; }
+
     public string WorkshopManualCount { get; private set; }
+
     public string EmployeeManualCount { get; private set; }
+
     public string IsActiveString { get; private set; }
+
     public int ExtensionNo { get; private set; }
+
     public string Description { get; private set; }
+
     public string Signature { get; private set; }
+
     public string OfficialCompany { get; private set; }
+
     public string TypeOfContract { get; private set; }
-    public string HasValueAddedTax { get; set; }
-    public double ValueAddedTax { get; set; }
+
+    public string HasValueAddedTax { get; private set; }
+
+    public double ValueAddedTax { get; private set; }
+    
+    public Guid PublicId { get; private set; }
+
+    public string VerifyCode { get; private set; }
+    public DateTime VerifyCodeCreation { get; private set; }
+    
+    [NotMapped]
+    public bool VerifyCodeExpired => VerifyCodeCreation.Add(ExpireTime) <= DateTime.Now;
+
+    [NotMapped]
+    public bool CanResendVerifyCode => VerifyCodeCreation.Add(ReSendTime) <= DateTime.Now;
+    
+    [NotMapped] public TimeSpan ExpireTime => TimeSpan.FromMinutes(5);
+    
+    
+    
+    [NotMapped] public TimeSpan ReSendTime => TimeSpan.FromMinutes(2);
+    
+    public bool IsInstallment { get; set; }
+    
+    public InstitutionContractVerificationStatus VerificationStatus { get; private set; }
+
+    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
 
     public List<InstitutionContractContactInfo> ContactInfoList { get; set; }
 
+    public List<InstitutionContractInstallment> Installments { get; set; }
+
+    public List<InstitutionContractAmendment> Amendments { get; private set; }
+
     public InstitutionContract()
     {
-
-        ContactInfoList = new List<InstitutionContractContactInfo>();
+        ContactInfoList = [];
+        Installments = [];
     }
 
     public void Edit(DateTime contractDateGr, string contractDateFa, string state, string city, string address,
         DateTime contractStartGr, string contractStartFa, DateTime contractEndGr, string contractEndFa,
         double contractAmount, double dailyCompenseation, double obligation, double totalAmount,
-        string workshopManualCount, string employeeManualCount, string description, string officialCompany, 
+        string workshopManualCount, string employeeManualCount, string description, string officialCompany,
         string typeOfcontract, double valueAddedTax, string hasValueAddedTax)
     {
-          
         ContractDateGr = contractDateGr;
         ContractDateFa = contractDateFa;
         State = state;
         City = city;
         Address = address;
-    
+
         ContractStartGr = contractStartGr;
         ContractStartFa = contractStartFa;
         ContractEndGr = contractEndGr;
@@ -124,13 +184,11 @@ public class InstitutionContract : EntityBase
 
     public void Active()
     {
-
         this.IsActiveString = "true";
     }
 
     public void DeActive()
     {
-
         this.IsActiveString = "false";
     }
 
@@ -148,4 +206,132 @@ public class InstitutionContract : EntityBase
     {
         this.Signature = "0";
     }
+
+    public void Verified()
+    {
+        VerificationStatus = InstitutionContractVerificationStatus.Verified;
+    }
+
+    public void SetPendingWorkflow()
+    {
+        VerificationStatus = InstitutionContractVerificationStatus.PendingWorkflow;
+    }
+
+    public void SetInstallments(List<InstitutionContractInstallment> installments)
+    {
+        Installments = installments;
+        IsInstallment = true;
+    }
+
+
+    public void SetVerifyCode(string code)
+    {
+        VerifyCode = code;
+        VerifyCodeCreation = DateTime.Now;
+    }
+
+    public void SetWorkshopGroup(InstitutionContractWorkshopGroup workshopGroup)
+    {
+        WorkshopGroup = workshopGroup;
+    }
+
+    public void SetAmount(double totalAmount, double tax, double oneMonthPayment)
+    {
+        ContractAmount = oneMonthPayment;
+        TotalAmount = totalAmount;
+        ValueAddedTax = tax;
+        HasValueAddedTax = tax > 0 ? "true" : "false";
+    }
+
+    public void ClearGroup()
+    {
+        WorkshopGroup = null;
+    }
+}
+
+public class InstitutionContractAmendment : EntityBase
+{
+    public long InstitutionContractId { get; set; }
+    public InstitutionContract InstitutionContract { get; set; }
+    public List<InstitutionContractInstallment> Installments { get; set; }
+    public double Amount { get; set; }
+    public bool HasInstallment { get; set; }
+    public string VerifyCode { get; set; }
+    public DateTime VerificationCreation { get; set; }
+    public List<InstitutionContractAmendmentChange> AmendmentChanges { get; set; }
+}
+
+public class InstitutionContractAmendmentChange : EntityBase
+{
+    public long InstitutionContractAmendmentId { get; private set; }
+    public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
+    public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
+    public DateTime ChangeDateGr { get; private set; }
+
+    /// <summary>
+    /// پلن حضور و غیاب
+    /// </summary>
+    public bool? HasRollCallPlan { get; private set; }
+
+    /// <summary>
+    /// پلن فیش غیر رسمی
+    /// </summary>
+    public bool? HasCustomizeCheckoutPlan { get; private set; }
+
+    /// <summary>
+    /// پلن قرارداد و تصفیه
+    /// </summary>
+    public bool? HasContractPlan { get; private set; }
+
+    /// <summary>
+    /// پلن قرارداد و تصفیه حضوری
+    /// </summary>
+    public bool? HasContractPlanInPerson { get; private set; }
+
+    /// <summary>
+    /// پلن بیمه
+    /// </summary>
+    public bool? HasInsurancePlan { get; private set; }
+
+    /// <summary>
+    /// پلن بیمه حضوری
+    /// </summary>
+    public bool? HasInsurancePlanInPerson { get; private set; }
+
+    /// <summary>
+    /// تعداد پرسنل
+    /// </summary>
+    public int? PersonnelCount { get; private set; }
+
+    /// <summary>
+    /// تعداد کارگاه
+    /// </summary>
+    public long? WorkshopDetailsId { get; private set; }
+    
+    
+}
+
+public enum InstitutionContractAmendmentChangeType
+{
+    PersonCount,
+    Services,
+    WorkshopCreated
+}
+
+public enum InstitutionContractVerificationStatus
+{
+    /// <summary>
+    /// در انتظار تایید
+    /// </summary>
+    PendingForVerify = 0,
+
+    /// <summary>
+    ///  در انتظار کارپوشه
+    /// </summary>
+    PendingWorkflow = 1,
+
+    /// <summary>
+    /// تایید شده
+    /// </summary>
+    Verified = 2
 }

Company.Domain/InstitutionContractAgg/InstitutionContractInstallment.cs

@@ -0,0 +1,28 @@
+using System;
+using _0_Framework.Application;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public class InstitutionContractInstallment
+{
+    public InstitutionContractInstallment(DateTime installmentDateGr, double amount,
+        string description)
+    {
+        InstallmentDateGr = installmentDateGr;
+        InstallmentDateFa = installmentDateGr.ToFarsi();
+        Amount = amount;
+        Description = description;
+    }
+
+    public long Id { get; private set; }
+    public DateTime InstallmentDateGr { get; private set; }
+    public string InstallmentDateFa { get; private set; }
+    public double Amount { get; private set; }
+    public string Description { get; private set; }
+    
+    public long InstitutionContractId { get; private set; }
+    public long? InstitutionContractAmendmentId { get; private set; }
+    
+    public InstitutionContract InstitutionContract { get; private set; }
+    public InstitutionContractAmendment InstitutionContractAmendment { get; set; }
+}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopBase.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Domain;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public class InstitutionContractWorkshopBase:EntityBase
+{
+    protected InstitutionContractWorkshopBase(){}
+    public InstitutionContractWorkshopBase(string workshopName, bool hasRollCallPlan,bool hasRollCallPlanInPerson,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
+        int personnelCount, double price )
+    {
+        WorkshopName = workshopName;
+        Services = new WorkshopServices(hasInsurancePlan, hasInsurancePlanInPerson,
+            hasContractPlan, hasContractPlanInPerson, hasRollCallPlan, hasRollCallPlanInPerson,hasCustomizeCheckoutPlan);
+        PersonnelCount = personnelCount;
+        Price = price;
+        Employers = [];
+    }
+    /// <summary>
+    /// شناسه کارگاه
+    /// </summary>
+    public long? WorkshopId { get; protected set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; private set; }
+
+    public WorkshopServices Services { get; set; }  = new (false, false, 
+        false, false, false, 
+        false, false);
+    public int PersonnelCount { get; private set; }
+
+
+
+    /// <summary>
+    /// شناسه قرارداد نهاد مرتبط
+    /// </summary>
+    public long InstitutionContractId { get; private set; }
+    
+
+    public double Price { get; private set; }
+
+    
+    public List<InstitutionContractWorkshopDetailEmployer> Employers { get; private set; } = new();
+
+    public void SetEmployers(List<long> employerIds)
+    {
+        Employers.Clear();
+        foreach (var employerId in employerIds)
+        {
+            Employers.Add(new InstitutionContractWorkshopDetailEmployer(employerId));
+        }
+    }
+    public void AddEmployer(long employerId)
+    {
+        if (Employers.Exists(x => x.EmployerId == employerId))
+            return;
+
+        Employers.Add(new InstitutionContractWorkshopDetailEmployer(employerId));
+    }
+    
+    // ⚡️ Equality Implementation
+    public override bool Equals(object? obj)
+    {
+        if (obj is not InstitutionContractWorkshopBase other)
+            return false;
+
+        return WorkshopName == other.WorkshopName &&
+               PersonnelCount == other.PersonnelCount &&
+               Price == other.Price &&
+               Services == other.Services;
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(WorkshopName, PersonnelCount, Price, Services);
+    }
+    
+    
+
+}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework_b.Domain;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
+{
+    private InstitutionContractWorkshopCurrent(){}
+    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, 
+        hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
+        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
+    {
+        InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
+        WorkshopGroup = workshopGroup;
+        WorkshopId = workshopId;
+    }
+    public long InstitutionContractWorkshopGroupId { get; private set; }
+    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
+    public long InitialWorkshopId { get; private set; }
+    public InstitutionContractWorkshopInitial WorkshopInitial { get; private set; }
+    
+    
+}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using _0_Framework_b.Domain;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public class InstitutionContractWorkshopGroup : EntityBase
+{
+    private InstitutionContractWorkshopGroup()
+    {
+    }
+
+    public long InstitutionContractId { get; private set; }
+    public InstitutionContract InstitutionContract { get; set; }
+    public List<InstitutionContractWorkshopInitial> InitialWorkshops { get; private set; }
+    public List<InstitutionContractWorkshopCurrent> CurrentWorkshops { get; private set; }
+    public DateTime LastModifiedDate { get; private set; }
+    
+    [NotMapped]
+    public bool HasChanges =>
+        !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
+            .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
+
+    public InstitutionContractWorkshopGroup(long institutionContractId,
+        List<InstitutionContractWorkshopInitial> initialDetails)
+    {
+        InstitutionContractId = institutionContractId;
+        var initialWorkshops = initialDetails.ToList();
+        InitialWorkshops = initialWorkshops.ToList();
+        LastModifiedDate = DateTime.Now;
+    }
+
+    public void UpdateCurrentWorkshops(List<InstitutionContractWorkshopCurrent> updatedDetails)
+    {
+        CurrentWorkshops = updatedDetails.ToList();
+        LastModifiedDate = DateTime.Now;
+    }
+}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Linq;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.InstitutionContract;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
+{
+    private InstitutionContractWorkshopInitial(){}
+    public InstitutionContractWorkshopInitial(string workshopName, bool hasRollCallPlan, 
+        bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
+        bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
+        int personnelCount, double price) : base(workshopName, hasRollCallPlan,
+        hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
+        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
+    {
+        WorkshopCreated = false;
+    }
+
+    public long InstitutionContractWorkshopGroupId { get; private set; }
+    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
+    public bool WorkshopCreated { get; private set; }
+    
+    public InstitutionContractWorkshopCurrent? WorkshopCurrent { get; private set; }
+    public long? InstitutionContractWorkshopCurrentId { get; private set; }
+    
+    public void SetWorkshopId(long workshopId)
+    {
+        WorkshopId = workshopId;
+        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);
+        WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
+    }
+
+    public static InstitutionContractWorkshopInitial CreateManual(string workshopName, bool hasRollCallPlan, 
+        bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
+        bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
+        int personnelCount, double price, long workshopId,List<long> employerIds)
+    {
+
+        var entity = new InstitutionContractWorkshopInitial(workshopName, hasRollCallPlan,
+            hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
+            hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price);
+        entity.WorkshopCreated = true;
+        entity.WorkshopId = workshopId;
+        entity.SetEmployers(employerIds);
+        return entity;
+    }
+
+    public void SetWorkshopGroup(InstitutionContractWorkshopGroup entityWorkshopGroup)
+    {
+        InstitutionContractWorkshopGroupId = entityWorkshopGroup.id;
+        WorkshopGroup = entityWorkshopGroup;
+    }
+}
+
+public class InstitutionContractWorkshopDetailEmployer : EntityBase
+{
+    public long EmployerId { get; private set; }
+    
+    public InstitutionContractWorkshopDetailEmployer(long employerId)
+    {
+        EmployerId = employerId;
+    }
+    
+    private InstitutionContractWorkshopDetailEmployer() { }
+}

Company.Domain/InstitutionContractAgg/WorkshopServices.cs

@@ -0,0 +1,23 @@
+namespace Company.Domain.InstitutionContractAgg;
+public record WorkshopServices
+{
+    public WorkshopServices(bool insurance, bool insuranceInPerson, bool contract, bool contractInPerson, bool rollCall, bool rollCallInPerson, bool customizeCheckout)
+    {
+        Insurance = insurance;
+        InsuranceInPerson = insuranceInPerson;
+        Contract = contract;
+        ContractInPerson = contractInPerson;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        RollCallInPerson = rollCallInPerson;
+    }
+
+    public bool Insurance { get; private set; }
+    public bool InsuranceInPerson { get; private set; }
+    public bool Contract { get; private set; }
+    public bool  ContractInPerson { get; private set; }
+    public bool RollCall { get; private set; }
+
+    public bool RollCallInPerson { get; private set; }
+    public bool CustomizeCheckout { get; private set; }
+} 

Company.Domain/InstitutionContractInsertTempAgg/IInstitutionContractExtenstionTempRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+
+namespace Company.Domain.InstitutionContractInsertTempAgg;
+
+public interface IInstitutionContractExtenstionTempRepository
+{
+    Task Create(InstitutionContractExtensionTemp institutionContract);
+
+    Task<InstitutionContractExtensionTemp> GetPreviousExtenstionData(long contractingPartyId);
+    Task Remove(Guid id);
+}

Company.Domain/InstitutionContractInsertTempAgg/InstitutionContractExtensionTemp.cs

@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractInsertTempAgg;
+
+public class InstitutionContractExtensionTemp
+{
+    public InstitutionContractExtensionTemp(long previousContractingPartyId)
+    {
+        Id = Guid.NewGuid();
+        PreviousId = previousContractingPartyId;
+    }
+    
+    [BsonId] // Specifies this field as the _id in MongoDB
+    [BsonRepresentation(BsonType.String)] // Ensures the GUID is stored as a string
+    public Guid Id { get; set; }
+    public long PreviousId { get; set; }
+    public string Address { get; set; }
+    public string City { get; set; }
+    public string Province { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+
+    public List<InstitutionContractExtensionTempWorkshop> Workshops { get; set; }
+
+    public InstitutionContractExtensionPlanDetail OneMonth { get; set; }
+    public InstitutionContractExtensionPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
+    public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
+    public InstitutionContractExtensionPaymentMonthly MonthlyPayment { get; set; }
+    public InstitutionContractExtensionPaymentOneTime OneTimePayment { get; set; }
+
+    public bool HasContractInPerson { get; set; }
+
+    public InstitutionContractDuration? Duration { get; set; }
+    
+    public void SetContractingPartyInfos(string address, string city, string province, List<EditContactInfo> contactInfos)
+    {
+        Address = address;
+        City = city;
+        Province = province;
+        ContactInfos = contactInfos;
+    }
+
+    public void SetWorkshopsAndPlanAmounts(List<InstitutionContractExtensionTempWorkshop> workshops,
+        InstitutionContractExtensionPlanDetail oneMonth,
+        InstitutionContractExtensionPlanDetail threeMonth, InstitutionContractExtensionPlanDetail sixMonth,
+        InstitutionContractExtensionPlanDetail twelveMonth, bool hasContractInPerson)
+    {
+        Workshops = workshops;
+        OneMonth = oneMonth;
+        ThreeMonths = threeMonth;
+        SixMonths = sixMonth;
+        TwelveMonths = twelveMonth;
+        HasContractInPerson = hasContractInPerson;
+    }
+
+    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractExtensionPaymentMonthly monthly,
+        InstitutionContractExtensionPaymentOneTime oneTime)
+    {
+        Duration = duration;
+        MonthlyPayment = monthly;
+        OneTimePayment = oneTime;
+    }
+    
+}
+
+public class InstitutionContractExtenstionTempPlan
+{
+    public InstitutionContractExtenstionTempPlan(string contractStart, string contractEnd, 
+        string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment,
+        string totalPayment, string dailyCompensation, string obligation)
+    {
+        ContractStart = contractStart;
+        ContractEnd = contractEnd;
+        OneMonthPaymentDiscounted = oneMonthPaymentDiscounted;
+        OneMonthDiscount = oneMonthDiscount;
+        OneMonthOriginalPayment = oneMonthOriginalPayment;
+        TotalPayment = totalPayment;
+        DailyCompensation = dailyCompensation;
+        Obligation = obligation;
+    }
+
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public string OneMonthPaymentDiscounted { get; set; }
+    public string OneMonthDiscount { get; set; }
+    public string OneMonthOriginalPayment { get; set; }
+    public string TotalPayment { get; set; }
+    public string DailyCompensation { get; set; }
+    public string Obligation { get; set; }
+}
+
+public class InstitutionContractExtensionTempWorkshop
+{
+    public InstitutionContractExtensionTempWorkshop(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson, 
+        bool insurance, bool insuranceInPerson,
+        bool rollCall,bool rollCallInPerson, bool customizeCheckout,double price,long workshopId)
+    {
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractAndCheckout = contractAndCheckout;
+        Insurance = insurance;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
+        InsuranceInPerson = insuranceInPerson;
+        RollCallInPerson = rollCallInPerson;
+        Price = price;
+        WorkshopId = workshopId;
+    }
+
+    public long WorkshopId { get; set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; private set; }
+
+    /// <summary>
+    /// تعداد پرسنل 
+    /// </summary>
+    public int CountPerson { get; private  set; }
+    
+    
+    #region ServiceSelection
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckout { get; private  set; }
+
+    /// <summary>
+    /// بیمه
+    /// </summary>
+    public bool Insurance { get; private  set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// </summary>
+    public bool RollCall { get; private  set; }
+
+    public bool RollCallInPerson { get; set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// </summary>
+    public bool CustomizeCheckout { get;private  set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckoutInPerson { get; private  set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// </summary>
+    public bool InsuranceInPerson { get; private  set; }
+
+    public double Price{ get; set; }
+
+    #endregion    
+}
+
+

Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs

@@ -25,5 +25,6 @@ public interface IInsuranceJobRepositpry:IRepository<long, InsuranceJob>
     OperationResult EditInsuranceJob(EditInsuranceJob command);
 
 
+    Task<List<InsuranceJobSelectListViewModel>> GetSelectList();
 }
 

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -67,6 +67,8 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
 
 	#endregion
+
+	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
 }
 
 

Company.Domain/LawAgg/ILawRepository.cs

@@ -0,0 +1,15 @@
+using _0_Framework.Domain;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.Law;
+
+namespace Company.Domain.LawAgg
+{
+    public interface ILawRepository : IRepository<long, Law>
+    {
+        Task<Law> GetWithItems(long id);
+        Task<List<Law>> GetActive();
+        Task<LawViewModel> GetByType(LawType type);
+        Task<List<LawViewModel>> GetList(LawSearchModel searchModel);
+    }
+}

Company.Domain/LawAgg/Law.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Law;
+using System.Text.Json;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Company.Domain.LawAgg
+{
+    public class Law : EntityBase
+    {
+        private Law(){}
+        public string Title { get; private set; }
+        public bool IsActive { get; private set; }
+        public  List<LawItem> Items { get; private set; }
+        public LawType Type { get; private set; }
+        public string HeadTitle { get; private set; }
+        public string NotificationsJson { get; private set; }
+
+        [NotMapped]
+        public List<string> Notifications
+        {
+            get => string.IsNullOrEmpty(NotificationsJson)
+                ? new List<string>()
+                : JsonSerializer.Deserialize<List<string>>(NotificationsJson);
+            set => NotificationsJson = JsonSerializer.Serialize(value);
+        }
+
+        public Law(string title, LawType lawType, List<string> notifications, string headTitle )
+        {
+            Title = title;
+            IsActive = true;
+            Items = new List<LawItem>();
+            Type = lawType;
+            Notifications = notifications ?? new List<string>();
+            HeadTitle = headTitle;
+        }
+
+        public void Edit(string title)
+        {
+            Title = title;
+        }
+
+        public void AddItem(string header, string details, int orderNumber)
+        {
+            Items.Add(new LawItem(header, details, orderNumber));
+        }
+
+
+        public void SetItem(List<LawItem> items)
+        {
+            Items = items ?? new List<LawItem>();
+        }
+        public void RemoveItem(int orderNumber)
+        {
+            var item = Items.Find(x => x.OrderNumber == orderNumber);
+            if (item != null)
+                Items.Remove(item);
+        }
+
+        public void Activate()
+        {
+            IsActive = true;
+        }
+
+        public void Deactivate()
+        {
+            IsActive = false;
+        }
+    }
+
+    public class LawItem
+    {
+        public long Id { get; set; }
+        public string Header { get; private set; }
+        public string Details { get; private set; }
+        public int OrderNumber { get; private set; }
+        public long LawId { get; set; }
+
+        protected LawItem() { }
+
+        public LawItem(string header, string details, int orderNumber)
+        {
+            Header = header;
+            Details = details;
+            OrderNumber = orderNumber;
+        }
+    }
+}

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -22,7 +22,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     bool CheckContractExist(DateTime myDate,long employeeId, long workshopId);
 
-    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId);
+    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId,bool isInvalid);
     LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId);
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);

Company.Domain/LeaveAgg/Leave.cs

@@ -8,7 +8,9 @@ public class Leave: EntityBase
 {
     public Leave(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, bool hasShiftDuration)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName,
+        bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, 
+        bool hasShiftDuration,bool isInvalid)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -25,6 +27,7 @@ public class Leave: EntityBase
         Month = month;
         ShiftDuration = shiftDuration;
         HasShiftDuration = hasShiftDuration;
+        IsInvalid = isInvalid;
     }
 
     public DateTime StartLeave { get; private set; }
@@ -43,6 +46,10 @@ public class Leave: EntityBase
 
     public TimeSpan ShiftDuration { get; private set; }
     public bool HasShiftDuration { get; private set; }
+    /// <summary>
+    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
+    /// </summary>
+    public bool IsInvalid { get; private set; }
 
     public void Edit(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,

Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs

@@ -21,6 +21,8 @@ public class ContractingPartyTemp : EntityBase
         IdNumberSerial = idNumberSerial;
         Gender = gender;
         DateOfBirth = dateOfBirth;
+        PublicId = Guid.NewGuid();
+        Status = ContractingPartyTempStatus.InComplete;
     }
 
     /// <summary>
@@ -91,10 +93,34 @@ public class ContractingPartyTemp : EntityBase
     /// </summary>
     public string Address { get; private set; }
 
+    public ContractingPartyTempStatus Status { get; set; }
+
+    public string VerifyCode { get; set; }
+    public DateTime VerifyCodeSentDateTime { get; set; }
+
+    public Guid PublicId { get; set; }
+
     public void UpdateAddress(string state, string city, string address)
     {
         this.State = state;
         this.City = city;
         this.Address = address;
     }
+    
+    public void SetCompleted()
+    {
+        Status = ContractingPartyTempStatus.Completed;
+    }
+    
+    public void SetVerifyCode(string verifyCode)
+    {
+        VerifyCode = verifyCode;
+        VerifyCodeSentDateTime = DateTime.Now;
+    }
+}
+
+public enum ContractingPartyTempStatus
+{
+    InComplete,
+    Completed
 }

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractContactInfoTempRepository.cs

@@ -0,0 +1,7 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public interface IInstitutionContractContactInfoTempRepository : IRepository<long, InstitutionContractContactInfoTemp>
+{
+}

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractTempRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework_b.Domain;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
 namespace Company.Domain.TemporaryClientRegistrationAgg;
@@ -17,10 +18,5 @@ public interface IInstitutionContractTempRepository : IRepository<long, Institut
     /// <returns></returns>
     Task<InstitutionContractTempViewModel> GetInstitutionContractTemp(long id,long contractingPartyTempId);
 
-    /// <summary>
-    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
-    /// جهت نمایش در کارپوشه
-    /// </summary>
-    /// <returns></returns>
-    Task<List<RegistrationWorkflowMainList>> GetAllCompletedRegistration();
+
 }

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractContactInfoTemp.cs

@@ -0,0 +1,25 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public class InstitutionContractContactInfoTemp : EntityBase
+{
+    public InstitutionContractContactInfoTemp(string phoneType, string position, string phoneNumber,
+        string fullName, long institutionContractTempId, bool sendSms)
+    {
+        PhoneType = phoneType;
+        Position = position;
+        PhoneNumber = phoneNumber;
+        FullName = fullName;
+        InstitutionContractTempId = institutionContractTempId;
+        SendSms = sendSms;
+    }
+
+    public string PhoneType { get; private set; }
+    public long InstitutionContractTempId { get; private set; }
+    public string Position { get; private set; }
+    public string PhoneNumber { get; private set; }
+    public string FullName { get; private set; }
+    public bool SendSms { get; private set; }
+    public InstitutionContractTemp InstitutionContractTemp { get; set; }
+}

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -1,13 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application.UID;
 using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
 namespace Company.Domain.TemporaryClientRegistrationAgg;
 
 public class InstitutionContractTemp : EntityBase
 {
-    public InstitutionContractTemp(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    public InstitutionContractTemp(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
     {
         ContractingPartyTempId = contractingPartyTempId;
         PaymentModel = paymentModel;
@@ -22,6 +24,7 @@ public class InstitutionContractTemp : EntityBase
         MessageId = messageId;
         SendVerifyCodeTime = sendVerifyCodeTime;
         VerifyCodeEndTime = verifyCodeEndTime;
+        PublicId = Guid.NewGuid();
     }
 
     /// <summary>
@@ -87,7 +90,7 @@ public class InstitutionContractTemp : EntityBase
     /// -
     /// Completed ثبت نام تکمیل شده
     /// </summary>
-    public string RegistrationStatus { get; private set; }
+    public InstitutionContractTempStatus RegistrationStatus { get; private set; }
 
     /// <summary>
     /// آی دی پیامک ارسال شده
@@ -104,8 +107,16 @@ public class InstitutionContractTemp : EntityBase
     /// </summary>
     public DateTime? VerifyCodeEndTime{ get; private set; }
 
+    /// <summary>
+    /// آیدی عمومی
+    /// برای نمایش در آدرس
+    /// </summary>
+    public Guid PublicId { get; set; }
 
-    public void Edit(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    public List<InstitutionContractContactInfoTemp> ContactInfoList { get; set; }
+
+
+    public void Edit(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
     {
         ContractingPartyTempId = contractingPartyTempId;
         PaymentModel = paymentModel;
@@ -122,7 +133,7 @@ public class InstitutionContractTemp : EntityBase
         VerifyCodeEndTime = verifyCodeEndTime;
     }
 
-    public void Update(string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    public void Update(string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
     {
         VerifyCode = verifyCode;
         RegistrationStatus = registrationStatus;
@@ -131,9 +142,10 @@ public class InstitutionContractTemp : EntityBase
         VerifyCodeEndTime = verifyCodeEndTime;
     }
 
-    public void ChangeRegistrationStatus(string registrationStatus)
+    public void ChangeRegistrationStatus(InstitutionContractTempStatus registrationStatus)
     {
         RegistrationStatus = registrationStatus;
     }
 
-}
+}
+

Company.Domain/WorkshopAgg/Workshop.cs

@@ -76,14 +76,13 @@ public class Workshop : EntityBase
 
         ClientEmployeeWorkshopList = new List<ClientEmployeeWorkshop>();
     }
-
-
-
+    
     public Workshop(string workshopName,string workshopSureName, string insuranceCode, string typeOfOwnership, string archiveCode, string agentName, string agentPhone, 
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
         string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide,
         bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
-        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout,
+        IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout,long contractingPartyId)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -134,6 +133,7 @@ public class Workshop : EntityBase
         CutContractEndOfYear = cutContractEndOfYear;
         RotatingShiftCompute = rotatingShiftCompute;
         IsStaticCheckout = isStaticCheckout;
+        ContractingPartyId = contractingPartyId;
     }
 
 
@@ -233,6 +233,8 @@ public class Workshop : EntityBase
     /// </summary>
     public bool IsStaticCheckout { get; private set; }
 
+    public long ContractingPartyId { get; private set; }
+    
     public Workshop()
     {
         RollCallServicesList = new List<RollCallService>();
@@ -344,4 +346,10 @@ public class Workshop : EntityBase
         this.IsActiveString = "false";
         ArchiveCode = "b-" + archiveCode;
     }
+}
+
+public enum WorkshopRegistrationStatus
+{
+    NotRegistered = 0,
+    Registered = 1
 }

CompanyManagement.Infrastructure.Mongo/CompanyManagement.Infrastructure.Mongo.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Company.Domain\Company.Domain.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
+    </ItemGroup>
+
+</Project>

CompanyManagement.Infrastructure.Mongo/InstitutionContractInsertTempRepo/InstitutionContractExtenstionTempRepository.cs

@@ -0,0 +1,32 @@
+using Company.Domain.InstitutionContractInsertTempAgg;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
+
+public class InstitutionContractExtenstionTempRepository:IInstitutionContractExtenstionTempRepository
+{
+    private readonly IMongoCollection<InstitutionContractExtensionTemp> _institutionExtenstionTemp;
+
+    public InstitutionContractExtenstionTempRepository(IMongoDatabase database)
+    {
+        _institutionExtenstionTemp = database.GetCollection<InstitutionContractExtensionTemp>("InstitutionContractExtenstionTemp");
+    }
+
+    public async Task Create(InstitutionContractExtensionTemp institutionContract)
+    {
+        await _institutionExtenstionTemp.InsertOneAsync(institutionContract);
+    }
+
+    public async Task<InstitutionContractExtensionTemp> GetPreviousExtenstionData(long contractingPartyId)
+    {
+        var entity = await _institutionExtenstionTemp
+            .Find(x => x.PreviousId == contractingPartyId)
+            .FirstOrDefaultAsync();
+        return entity;
+    }
+
+    public async Task Remove(Guid id)
+    {
+        await _institutionExtenstionTemp.DeleteOneAsync(x=>x.Id == id);
+    }
+}

CompanyManagment.App.Contracts/AuthorizedPerson/AuthorizedPersonViewModel.cs

@@ -0,0 +1,19 @@
+namespace CompanyManagment.App.Contracts.AuthorizedPerson;
+
+public class AuthorizedPersonViewModel
+{
+    public long Id { get; set; }
+    public string NationalCode { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string FatherName { get; set; }
+    public string BirthDate { get; set; }
+    public string Gender { get; set; }
+    public string DeathStatus { get; set; }
+    public string ShenasnameSeri { get; set; }
+    public string ShenasnameSerial { get; set; }
+    public string ShenasnamehNumber { get; set; }
+    public bool IsVerified { get; set; }
+    public string VerificationDate { get; set; }
+    public string CreationDate { get; set; }
+}

CompanyManagment.App.Contracts/AuthorizedPerson/CreateAuthorizedPerson.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.AuthorizedPerson;
+
+public class CreateAuthorizedPerson
+{
+    public string NationalCode { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string FatherName { get; set; }
+    public string BirthDate { get; set; }
+    public string Gender { get; set; }
+    public string DeathStatus { get; set; }
+    public string ShenasnameSeri { get; set; }
+    public string ShenasnameSerial { get; set; }
+    public string ShenasnamehNumber { get; set; }
+}

CompanyManagment.App.Contracts/AuthorizedPerson/IAuthorizedPersonApplication.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.AuthorizedPerson;
+
+public interface IAuthorizedPersonApplication
+{
+    OperationResult Create(CreateAuthorizedPerson command);
+    OperationResult CreateFromUidResponse(CreateAuthorizedPerson command);
+    AuthorizedPersonViewModel GetByNationalCode(string nationalCode);
+    List<AuthorizedPersonViewModel> Search(string nationalCode = null, string firstName = null, string lastName = null);
+    bool ExistsByNationalCode(string nationalCode);
+}

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -1,6 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Transactions;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Employee;
 
@@ -125,4 +128,282 @@ public interface IEmployerApplication
 
 	#endregion
 
-}
+	Task<OperationResult> CreateWorkflowRegistration(CreateEmployerWorkflowRegistration command);
+    /// <summary>
+    /// ویرایش کارفرما در گردش کار ثبت نام
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditWorkflowRegistration(EditEmployerWorkflowRegistration command);
+    
+    /// <summary>
+    /// حذف کارفرما از گردش کار ثبت نام
+    /// </summary>
+    /// <param name="employerId">شناسه کارفرما</param>
+    /// <param name="institutionWorkshopDetailsId">شناسه جزئیات کارگاه موسسه</param>
+    /// <returns></returns>
+    Task<OperationResult> DeleteWorkflowRegistration(long employerId, long institutionWorkshopDetailsId);
+    
+    Task<OperationResult<AuthenticateUserViewModel>> AuthenticateEmployer(string nationalCode, string dateOfBirth, string mobile);
+}
+
+public class AuthenticateUserViewModel
+{
+	/// <summary>
+	/// نام
+	/// </summary>
+	public string FName { get; set; }
+	/// <summary>
+	/// نام خانوادگی
+	/// </summary>
+	public string LName { get; set; }
+
+	/// <summary>
+	/// نام پدر
+	/// </summary>
+	public string FatherName { get; set; }
+
+	/// <summary>
+	/// جنسیت
+	/// </summary>
+	public Gender Gender { get; set; }
+
+	/// <summary>
+	/// کد ملی
+	/// </summary>
+	public string NationalCode { get; set; }
+	
+
+	public string DateOfBirth { get; set; }
+
+	/// <summary>
+	/// سری شناسنامه
+	/// </summary>
+	public string IdNumberSeri { get; set; }
+
+	/// <summary>
+	/// سریال شناسنامه
+	/// </summary>
+	public string IdNumberSerial { get; set; }
+
+
+	/// <summary>
+	/// شماره شناسنامه
+	/// </summary>
+	public string IdNumber { get; set; }
+
+
+
+	/// <summary>
+	/// شماره همراه
+	/// </summary>
+	public string Phone { get; set; }
+
+
+}
+
+/// <summary>
+/// کلاس ثبت کارفرما در گردش کار - شامل اطلاعات کارفرمای حقیقی و حقوقی
+/// </summary>
+public class CreateEmployerWorkflowRegistration
+{
+	/// <summary>
+	/// اطلاعات کارفرمای حقیقی
+	/// </summary>
+	public CreateRealEmployerWorkflowRegistration RealEmployer { get; set; }
+	
+	/// <summary>
+	/// اطلاعات کارفرمای حقوقی
+	/// </summary>
+	public CreateLegalEmployerWorkflowRegistration LegalEmployer { get; set; }
+	
+	/// <summary>
+	/// نوع حقوقی
+	/// </summary>
+	public LegalType LegalType { get; set; }
+	
+	/// <summary>
+	/// شناسه جزئیات کارگاه موسسه
+	/// </summary>
+	public long InstitutionWorkshopInitialId { get; set; }
+	
+	/// <summary>
+	/// شناسه قرارداد موسسه
+	/// </summary>
+	public long InstitutionContractId { get; set; }
+	
+	/// <summary>
+	/// شناسه طرف قرارداد
+	/// </summary>
+	public long ContractingPartyId { get; set; }
+	
+}
+
+/// <summary>
+/// کلاس ثبت کارفرمای حقوقی در گردش کار - شامل اطلاعات شرکت و مدیرعامل
+/// </summary>
+public class CreateLegalEmployerWorkflowRegistration
+{
+	/// <summary>
+	/// نام شرکت
+	/// </summary>
+	public string CompanyName { get; set; }
+	
+	/// <summary>
+	/// شماره ثبت
+	/// </summary>
+	public string RegisterId { get; set; }
+	
+	/// <summary>
+	/// شناسه ملی شرکت
+	/// </summary>
+	public string NationalId { get; set; }
+	
+	/// <summary>
+	/// جنسیت
+	/// </summary>
+	public Gender Gender { get; set; }
+	
+	/// <summary>
+	/// وضعیت احراز هویت
+	/// </summary>
+	public bool IsAuth { get; set; }
+	
+	/// <summary>
+	/// کد ملی مدیرعامل
+	/// </summary>
+	public string CeoNationalCode { get; set; }
+	
+	/// <summary>
+	/// شماره شناسنامه مدیرعامل
+	/// </summary>
+	public string CeoIdNumber { get; set; }
+	
+	/// <summary>
+	/// نام مدیرعامل
+	/// </summary>
+	public string CeoFName { get; set; }
+	
+	/// <summary>
+	/// نام خانوادگی مدیرعامل
+	/// </summary>
+	public string CeoLName { get; set; }
+	
+	/// <summary>
+	/// نام پدر مدیرعامل
+	/// </summary>
+	public string CeoFatherName { get; set; }
+	
+	/// <summary>
+	/// تاریخ تولد مدیرعامل
+	/// </summary>
+	public string CeoDateOfBirth { get; set; }
+	
+	/// <summary>
+	/// محل صدور شناسنامه مدیرعامل
+	/// </summary>
+	public string CeoPlaceOfIssue { get; set; }
+	
+	/// <summary>
+	/// تاریخ صدور شناسنامه مدیرعامل
+	/// </summary>
+	public string CeoDateOfIssue { get; set; }
+	
+	/// <summary>
+	/// شماره موبایل
+	/// </summary>
+	public string PhoneNumber { get; set; }
+	
+	/// <summary>
+	/// شماره تلفن ثابت
+	/// </summary>
+	public string TelephoneNumber { get; set; }
+	
+	/// <summary>
+	/// اطلاعات سیستم دولتی
+	/// </summary>
+	public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+	
+}
+
+/// <summary>
+/// کلاس ثبت کارفرمای حقیقی در گردش کار - شامل اطلاعات شخصی کارفرما
+/// </summary>
+public class CreateRealEmployerWorkflowRegistration
+{
+	/// <summary>
+	/// جنسیت
+	/// </summary>
+	public Gender Gender { get; set; }
+	
+	/// <summary>
+	/// وضعیت احراز هویت
+	/// </summary>
+	public bool IsAuth { get; set; }
+	
+	/// <summary>
+	/// کد ملی
+	/// </summary>
+	public string NationalCode { get; set; }
+	
+	/// <summary>
+	/// شماره شناسنامه
+	/// </summary>
+	public string IdNumber { get; set; }
+	
+	/// <summary>
+	/// نام
+	/// </summary>
+	public string FName { get; set; }
+	
+	/// <summary>
+	/// نام خانوادگی
+	/// </summary>
+	public string LName { get; set; }
+	
+	/// <summary>
+	/// نام پدر
+	/// </summary>
+	public string FatherName { get; set; }
+	
+	/// <summary>
+	/// تاریخ تولد
+	/// </summary>
+	public string DateOfBirth { get; set; }
+	
+	/// <summary>
+	/// شماره موبایل
+	/// </summary>
+	public string PhoneNumber { get; set; }
+	
+	/// <summary>
+	/// محل صدور شناسنامه
+	/// </summary>
+	public string PlaceOfIssue { get; set; }
+	
+	/// <summary>
+	/// تاریخ صدور شناسنامه
+	/// </summary>
+	public string DateOfIssue { get; set; }
+	
+	/// <summary>
+	/// اطلاعات سیستم دولتی
+	/// </summary>
+	public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+	
+	/// <summary>
+	/// شماره تلفن
+	/// </summary>
+	public string Telephone { get; set; }
+}
+
+/// <summary>
+/// کلاس ویرایش کارفرما در گردش کار - شامل اطلاعات کارفرمای حقیقی و حقوقی
+/// </summary>
+public class EditEmployerWorkflowRegistration : CreateEmployerWorkflowRegistration
+{
+    /// <summary>
+    /// شناسه کارفرما
+    /// </summary>
+    public long EmployerId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/CreateInstitutionContractRequest.cs

@@ -1,29 +1,317 @@
 using System.Collections.Generic;
+using System.Security.AccessControl;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+using CompanyManagment.App.Contracts.Workshop;
 
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
+
+
+/// <summary>
+/// درخواست ایجاد قرارداد نهاد
+/// </summary>
 public class CreateInstitutionContractRequest
 {
-    public List<CreateContactInfo> ContactInfos { get; set; }
-    public long ContractingPartyId { get; set; }
+    /// <summary>
+    /// نوع حقوقی طرف قرارداد (حقیقی یا حقوقی)
+    /// </summary>
+    public LegalType ContractingPartyLegalType { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    /// <summary>
+    /// آیدی معرف
+    /// </summary>
     public long RepresentativeId { get; set; }
-    public string TypeOfContract { get; set; }
-    public string ContractDateFa { get; set; }
-    public string ContractStartFa { get; set; }
-    public string ContractEndFa { get; set; }
-    public string Address { get; set; }
-    public string State { get; set; }
+
+    /// <summary>
+    /// مدت زمان قرارداد
+    /// </summary>
+    public InstitutionContractDuration Duration { get; set; }
+
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string Province { get; set; }
+    
+    /// <summary>
+    /// شهر
+    /// </summary>
     public string City { get; set; }
-    public string OfficialCompany { get; set; }
-    public string HasValueAddedTax { get; set; }
-    public string ContractAmountString { get; set; }
-    public string DailyCompenseationString { get; set; }
-    public string ObligationString { get; set; }
-    public string TotalAmountString { get; set; }
-    public string ValueAddedTaxStr { get; set; }
-    public string WorkshopManualCount { get; set; }
-    public string EmployeeManualCount { get; set; }
+    
+    /// <summary>
+    /// آدرس
+    /// </summary>
+    public string Address { get; set; }
+    
+    /// <summary>
+    /// اطلاعات تماس
+    /// </summary>
+    public List<CreateContactInfo> ContactInfos { get; set; }
+    
+    /// <summary>
+    /// لیست کارگاه‌های مورد نظر برای قرارداد
+    /// </summary>
+    public List<CreateInstitutionContractWorkshopDetail> Workshops { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد (فارسی)
+    /// </summary>
+    public string ContractStartFa { get; set; }
+    
+    /// <summary>
+    /// مبلغ خسارت روزانه
+    /// </summary>
+    public double DailyCompensation { get; set; }
+    
+    /// <summary>
+    /// وجه التزام
+    /// </summary>
+    public double Obligation { get; set; }
+    
+    /// <summary>
+    /// توضیحات
+    /// </summary>
     public string Description { get; set; }
-    public int ExtensionNo { get; set; }
+
+    /// <summary>
+    /// مبلغ کل قرارداد
+    /// </summary>
+    public double TotalAmount { get; set; }
+
+    /// <summary>
+    /// آیا قرارداد اقساطی است؟
+    /// </summary>
+    public bool IsInstallment { get; set; }
+
+    /// <summary>
+    /// مالیات ارزش افزوده
+    /// </summary>
+    public double TaxAmount { get; set; }
+
+    public double OneMonthAmount { get; set; }
+}
+/// <summary>
+/// مدت زمان قرارداد نهاد
+/// </summary>
+public enum InstitutionContractDuration
+{
+    /// <summary>
+    /// یک ماهه
+    /// </summary>
+    OneMonth = 1,
+    
+    /// <summary>
+    /// سه ماهه
+    /// </summary>
+    ThreeMonths = 3,
+    
+    /// <summary>
+    /// شش ماهه
+    /// </summary>
+    SixMonths = 6,
+    
+    /// <summary>
+    /// دوازده ماهه
+    /// </summary>
+    TwelveMonths = 12
+}
+
+/// <summary>
+/// جزئیات کارگاه در درخواست ایجاد قرارداد نهاد
+/// </summary>
+public class CreateInstitutionContractWorkshopDetail
+{
+    /// <summary>
+    /// شناسه کارگاه (اختیاری - در صورت وجود کارگاه از قبل)
+    /// </summary>
+    public long? WorkshopId { get; set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; set; }
+
+    /// <summary>
+    /// پلن حضور و غیاب
+    /// </summary>
+    public bool HasRollCallPlan { get; set; }
+
+    /// <summary>
+    /// پلن فیش غیر رسمی
+    /// </summary>
+    public bool HasCustomizeCheckoutPlan { get; set; }
+
+    /// <summary>
+    /// پلن قرارداد و تصفیه
+    /// </summary>
+    public bool HasContractPlan { get; set; }
+    
+    /// <summary>
+    /// پلن قرارداد و تصفیه حضوری
+    /// </summary>
+    public bool HasContractPlanInPerson { get; set; }
+    
+    /// <summary>
+    /// پلن بیمه
+    /// </summary>
+    public bool HasInsurancePlan { get; set; }
+    /// <summary>
+    /// پلن بیمه حضوری
+    /// </summary>
+    public bool HasInsurancePlanInPerson { get; set; }
+
+    /// <summary>
+    /// تعداد پرسنل کارگاه
+    /// </summary>
+    public int PersonnelCount { get; set; }
+
+    /// <summary>
+    /// مبلغ
+    /// </summary>
+    public double Price { get; set; }
+}
+
+/// <summary>
+/// درخواست ایجاد طرف حقیقی در قرارداد نهاد
+/// </summary>
+public class CreateInstitutionContractRealPartyRequest
+{
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// جنسیت
+    /// </summary>
+    public Gender Gender { get; set; }
+    
+    
+}
+
+/// <summary>
+/// درخواست ایجاد طرف حقوقی در قرارداد نهاد
+/// </summary>
+public class CreateInstitutionContractLegalPartyRequest
+{
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    public string CompanyName { get; set; }
+    
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+    
+    /// <summary>
+    /// شناسه ملی شرکت
+    /// </summary>
+    public string NationalId { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن شرکت
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// کد ملی نماینده قانونی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد نماینده قانونی فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// نام نماینده قانونی
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی نماینده قانونی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر نماینده قانونی
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه نماینده قانونی
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت نماینده قانونی
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// سمت نماینده قانونی در شرکت
+    /// </summary>
+    public string Position { get; set; }
+
+    /// <summary>
+    /// جنسیت نماینده قانونی
+    /// </summary>
+    public Gender Gender { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/EditInstitutionContractRequest.cs

@@ -3,4 +3,5 @@ namespace CompanyManagment.App.Contracts.InstitutionContract;
 public class EditInstitutionContractRequest:CreateInstitutionContractRequest
 {
     public long Id { get; set; }
+    public long ContractingPartyId { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/ExtenstionInstitutionContractRequest.cs

@@ -0,0 +1,13 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// درخواست تمدید قرارداد مؤسسه
+/// شامل اطلاعات قرارداد قبلی برای فرآیند تمدید
+/// </summary>
+public class ExtenstionInstitutionContractRequest : EditInstitutionContractRequest
+{
+    /// <summary>
+    /// شناسه قرارداد قبلی که قرار است تمدید شود
+    /// </summary>
+    public long PreviousContractId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -77,10 +77,45 @@ public class GetInstitutionContractListItemsViewModel
     /// <summary>
     /// وضعیت قرارداد
     /// </summary>
-    public InstitutionContractStatus Status { get; set; }
+    public InstitutionContractListStatus ListStatus { get; set; }
 
     /// <summary>
     /// آیا منقضی شده است
     /// </summary>
     public bool IsExpired { get; set; }
+
+    public long ContractingPartyId { get; set; }
+
+    public List<InstitutionContractListWorkshop> Workshops { get; set; }
+}
+
+public class InstitutionContractListWorkshop
+{
+    public string WorkshopName { get; set; }
+    public int EmployeeCount { get; set; }
+    public WorkshopServicesViewModel WorkshopServices { get; set; }
+}
+
+public class WorkshopServicesViewModel
+{
+    public bool Insurance { get; set; }
+    public string InsuranceLabel => "ارسال لیست بیمه";
+
+    public bool InsuranceInPerson { get; set; }
+    public string InsuranceInPersonLabel => "خدمات حضوری";
+
+    public bool Contract { get; set; }
+    public string ContractLabel => "قرارداد و تصفیه حساب";
+
+    public bool ContractInPerson { get; set; }
+    public string ContractInPersonLabel => "خدمات حضوری";
+
+    public bool RollCall { get; set; }
+    public string RollCallLabel => "ساعت حضور و غیاب";
+
+    public bool RollCallInPerson { get; set; }
+    public string RollCallInPersonLabel => "خدمات مستقیم";
+
+    public bool CustomizeCheckout { get; set; }
+    public string CustomizeCheckoutLabel => "فیش غیر رسمی";
 }

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListStatsViewModel.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class GetInstitutionContractListStatsViewModel
+{
+    /// <summary>
+    /// مجموع بدهی قراردادهای مؤسسه
+    /// این ویژگی بدهی‌های قراردادهای مربوطه را تجمیع می‌کند و
+    /// یک معیار واحد برای اندازه‌گیری تعهدات مالی ارائه می‌دهد
+    /// </summary>
+    public double TotalDebt { get; set; }
+
+    /// <summary>
+    /// مجموع ارزش پولی مرتبط با قراردادهای مؤسسه
+    /// این ویژگی مبلغ کل قراردادهای مربوطه را برای
+    /// گزارش‌گیری و تجزیه و تحلیل مالی تجمیع می‌کند
+    /// </summary>
+    public double TotalAmount { get; set; }
+
+    /// <summary>
+    /// مجموعه‌ای از تعداد قراردادهای مؤسسه دسته‌بندی شده بر اساس وضعیت
+    /// این ویژگی تعداد قراردادها را برای هر وضعیت تعریف شده در
+    /// شمارش InstitutionContractStatus ارائه می‌دهد که امکان تجزیه و تحلیل و نظارت بر توزیع قراردادها را فراهم می‌کند
+    /// </summary>
+    public List<InstitutionContractStatusCount> Counts { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsViewModel.cs

@@ -0,0 +1,31 @@
+using _0_Framework.Application.Enums;
+
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class GetInstitutionVerificationDetailsViewModel
+{
+    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 List<InstitutionContractInstallmentViewModel> Installments { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContratVerificationParty
+{
+    public string CompanyNameOrFullName { get; set; }
+    public string NationalCodeOrNationalId { get; set; }
+    public string CeoName { get; set; }
+    public string Address { get; set; }
+    public string PostalCode { get; set; }
+    public string PhoneNumber { get; set; }
+    public LegalType LegalType { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs

@@ -0,0 +1,9 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class GetInstitutionVerificationDetailsWorkshopsViewModel
+{
+    public string Name { get; set; }
+    public int PersonnelCount { get; set; }
+    public WorkshopServicesViewModel Services { get; set; }
+    public string Price { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -1,62 +1,162 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
+using CompanyManagment.App.Contracts.WorkshopPlan;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
+/// <summary>
+/// رابط اپلیکیشن قراردادهای مؤسسه
+/// مدیریت عملیات مربوط به قراردادهای مالی مؤسسات
+/// </summary>
 public interface IInstitutionContractApplication
 {
+    /// <summary>
+    /// ایجاد قرارداد جدید
+    /// </summary>
+    /// <param name="command">اطلاعات قرارداد جدید</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Create(CreateInstitutionContract command);
+    
+    /// <summary>
+    /// تمدید قرارداد موجود
+    /// </summary>
+    /// <param name="command">اطلاعات قرارداد برای تمدید</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Extension(CreateInstitutionContract command);
+    
+    /// <summary>
+    /// ویرایش قرارداد موجود
+    /// </summary>
+    /// <param name="command">اطلاعات جدید قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Edit(EditInstitutionContract command);
+    
+    /// <summary>
+    /// دریافت جزئیات قرارداد برای ویرایش
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>اطلاعات قرارداد</returns>
     EditInstitutionContract GetDetails(long id);
 
+    /// <summary>
+    /// جستجو در قراردادها
+    /// </summary>
+    /// <param name="searchModel">مدل جستجو</param>
+    /// <returns>لیست قراردادها</returns>
     List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
+    
+    /// <summary>
+    /// جستجوی جدید در قراردادها
+    /// </summary>
+    /// <param name="searchModel">مدل جستجو</param>
+    /// <returns>لیست قراردادها</returns>
     List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
 
     /// <summary>
-    /// دریافت اطلاعات قزداد های مالی فعال 
+    /// دریافت اطلاعات قرارداد های مالی فعال 
     ///دارای کارگاه
     /// جهت ست کردن سرویس ها از طریق اکسل
     /// </summary>
     /// <returns></returns>
     List<InstitutionContractViewModel> GetInstitutionContractToSetServicesExcelImport();
 
+    /// <summary>
+    /// چاپ مجموعه قراردادها
+    /// </summary>
+    /// <param name="id">لیست شناسه قراردادها</param>
+    /// <returns>لیست قراردادها برای چاپ</returns>
     List<InstitutionContractViewModel> PrintAll(List<long> id);
+    
+    /// <summary>
+    /// چاپ یک قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>اطلاعات قرارداد برای چاپ</returns>
     InstitutionContractViewModel PrintOne(long id);
 
+    /// <summary>
+    /// فعال کردن قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Active(long id);
 
-
+    /// <summary>
+    /// غیرفعال کردن قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActive(long id);
 
-
+    /// <summary>
+    /// غیرفعال کردن قرارداد (حالت آبی)
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActiveBlue(long id);
 
-
+    /// <summary>
+    /// غیرفعال کردن تمام اتصالات قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActiveAllConnections(long id);
 
-
+    /// <summary>
+    /// فعال کردن مجدد تمام اتصالات قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult ReActiveAllConnections(long id);
 
+    /// <summary>
+    /// فعال کردن مجدد تمام قراردادها بعد از ایجاد قرارداد جدید
+    /// </summary>
+    /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
     void ReActiveAllAfterCreateNew(long contractingPartyId);
 
-    
+    /// <summary>
+    /// حذف قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
     void RemoveContract(long id);
 
-
+    /// <summary>
+    /// امضای قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Sign(long id);
 
-
+    /// <summary>
+    /// لغو امضای قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult UnSign(long id);
+    
+    /// <summary>
+    /// ایجاد حساب کاربری برای طرف قرارداد
+    /// </summary>
+    /// <param name="contractingPartyid">شناسه طرف قرارداد</param>
+    /// <param name="accountId">شناسه حساب کاربری</param>
     void CreateContractingPartyAccount(long contractingPartyid, long accountId);
 
+    /// <summary>
+    /// محاسبه مبلغ قرارداد بر اساس تعداد افراد
+    /// </summary>
+    /// <param name="countPerson">تعداد افراد</param>
+    /// <returns>مبلغ قرارداد</returns>
     double GetcontractAmount(int countPerson);
 
     #region Api
@@ -82,52 +182,92 @@ public interface IInstitutionContractApplication
     /// <param name="command"></param>
     /// <returns></returns>
     Task<OperationResult> CreateAsync(CreateInstitutionContractRequest command);
+
     /// <summary>
     /// ویرایش
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
     Task<OperationResult> EditAsync(EditInstitutionContractRequest command);
-    /// <summary>
-    /// تمدید قرارداد
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> ExtensionَAsync(CreateInstitutionContractRequest command);
     
+    
+    /// <summary>
+    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
+    /// جهت نمایش در کارپوشه
+    /// </summary>
+    /// <returns></returns>
+    Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
+    /// <summary>
+    /// دریافت آیتم های کارپوشه ثبت نام
+    /// </summary>
+    /// <param name="institutionContractId"></param>
+    /// <returns></returns>
+    Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
+    
+    
+
     #endregion
+    
+    Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
+    Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id);
+    Task<OperationResult> VerifyOtp(Guid publicId, string code);
+    Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId);
+    Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
+    Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
+    Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
+    Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(
+        InstitutionContractExtensionPaymentRequest request);
+    
+    Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
 }
 
-public class GetInstitutionContractListStatsViewModel
+public class InstitutionContractExtensionInquiryResponse
 {
-    /// <summary>
-    /// Represents the total outstanding debt of institution contracts.
-    /// This property aggregates the liabilities of the respective contracts and provides
-    /// a single metric to measure financial obligations.
-    /// </summary>
-    public double TotalDebt { get; set; }
-
-    /// <summary>
-    /// Represents the total monetary value associated with institution contracts.
-    /// This property consolidates the aggregate amount from relevant contracts
-    /// for financial reporting and analysis.
-    /// </summary>
-    public double TotalAmount { get; set; }
-
-    /// <summary>
-    /// Represents a collection of counts for institution contracts categorized by their status.
-    /// This property provides the count of contracts for each status defined in the
-    /// InstitutionContractStatus enumeration, enabling analysis and monitoring of contract distribution.
-    /// </summary>
-    public List<InstitutionContractStatusCount> Counts { get; set; } 
+    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 InstitutionContractStatusCount
+public class InstitutionContractExtensionCompleteRequest
 {
-    public InstitutionContractStatus Status { get; set; }
-    public int Count { get; set; }
+    public Guid TemporaryId { get; set; }
+    public bool IsInstallment { get; set; }
 }
-public class ExtenstionInstitutionContractRequest:EditInstitutionContractRequest
+
+public class InstitutionContractExtensionPaymentResponse
 {
-    public long PreviousContractId { get; set; }
+    public InstitutionContractExtensionPaymentOneTime OneTime { get; set; }
+    public InstitutionContractExtensionPaymentMonthly Monthly { 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/InstitutionContractExtensionInquiryRequest.cs

@@ -0,0 +1,9 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionInquiryRequest
+{
+    public long ContractingPartyId { get; set; }
+    public string NationalCode { get; set; }
+    public string BirthDate { get; set; }
+    public string Mobile { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResult.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Application.Enums;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionInquiryResult
+{
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    public LegalType LegalType { get; set; }
+    public Guid TemporaryId { get; set; }
+    public string Address { get; set; }
+    public string City { get; set; }
+    public string Province { get; set; }
+    public List<EditContactInfo> ContactInfoViewModels { get; set; }
+    public long RepresentativeId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanRequest.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionPlanRequest
+{
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
+    public string TotalAmount { get; set; }
+    public Guid TempId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanResponse.cs

@@ -0,0 +1,20 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionPlanResponse
+{
+    public InstitutionContractExtensionPlanDetail OneMonth { get; set; }
+    public InstitutionContractExtensionPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
+    public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
+}
+public class InstitutionContractExtensionPlanDetail
+{
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public string OneMonthPaymentDiscounted { get; set; }
+    public string OneMonthDiscount { get; set; }
+    public string OneMonthOriginalPayment { get; set; }
+    public string TotalPayment { get; set; }
+    public string DailyCompenseation { get; set; }
+    public string Obligation { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionWorkshopsRequest.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionWorkshopsRequest
+{
+    public Guid TempId { get; set; }
+    public string City {get; set;}
+    public string Province { get; set; }
+    public string Address { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionWorkshopsResponse.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractExtensionWorkshopsResponse
+{
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
+    public string TotalAmount { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractInstallmentViewModel.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// مدل نمایش اقساط قرارداد مؤسسه
+/// شامل اطلاعات مربوط به هر قسط از قرارداد
+/// </summary>
+public class InstitutionContractInstallmentViewModel
+{
+    /// <summary>
+    /// شناسه یکتای قسط
+    /// </summary>
+    public long Id { get; set; }
+    
+    /// <summary>
+    /// تاریخ میلادی قسط
+    /// </summary>
+    public DateTime InstallmentDateGr { get; set; }
+    
+    /// <summary>
+    /// تاریخ فارسی قسط
+    /// </summary>
+    public string InstallmentDateFa { get; set; }
+    
+    /// <summary>
+    /// مبلغ قسط
+    /// </summary>
+    public string Amount { get; set; }
+    
+    /// <summary>
+    /// عدد قسط فارسی
+    /// </summary>
+    public string InstallmentIndex { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد مؤسسه مربوط به این قسط
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractListSearchModel.cs

@@ -42,7 +42,7 @@ public class InstitutionContractListSearchModel :PaginationRequest
     /// <summary>
     /// تب
     /// </summary>
-    public InstitutionContractStatus? Status { get; set; }
+    public InstitutionContractListStatus? Status { get; set; }
 
     /// <summary>
     /// فعال / غیرفعال

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractListStatus.cs

@@ -1,6 +1,6 @@
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
-public enum InstitutionContractStatus
+public enum InstitutionContractListStatus
 {
     Active,
     Deactive,
@@ -9,4 +9,5 @@ public enum InstitutionContractStatus
     Free,
     PendingForRenewal,
     WithoutWorkshop,
+    PendingForVerify
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractStatusCount.cs

@@ -0,0 +1,18 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// شمارش وضعیت قراردادهای مؤسسه
+/// نمایش تعداد قراردادها برای هر وضعیت خاص
+/// </summary>
+public class InstitutionContractStatusCount
+{
+    /// <summary>
+    /// وضعیت لیست قرارداد
+    /// </summary>
+    public InstitutionContractListStatus ListStatus { get; set; }
+    
+    /// <summary>
+    /// تعداد قراردادها در این وضعیت
+    /// </summary>
+    public int Count { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractWorkshopDetailViewModel.cs

@@ -0,0 +1,6 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractWorkshopDetailViewModel
+{
+    public WorkshopServicesViewModel ServicesViewModel { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs

@@ -0,0 +1,92 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class RegistrationWorkflowMainListViewModel
+{
+    /// <summary>
+    /// شناسه قرارداد موسسه
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+
+    /// <summary>
+    /// نام کامل طرف حساب
+    /// </summary>
+    public string ContractingPartyFullName { get; set; }
+
+    /// <summary>
+    /// شماره همراه
+    /// </summary>
+    public string Phone { get; set; }
+    
+    /// <summary>
+    /// تعداد کارگاه‌های انجام شده
+    /// </summary>
+    public int DoneWorkshops { get; set; }
+
+    /// <summary>
+    /// تعداد کارگاه‌های انجام نشده
+    /// </summary>
+    public int UnDoneWorkshops { get; set; }
+
+    /// <summary>
+    /// تعداد کل کارگاه‌ها
+    /// </summary>
+    public int TotalWorkshops { get; set; }
+
+    /// <summary>
+    /// مبلغ
+    /// </summary>
+    public double Amount { get; set; }
+
+    public long ContractingPartyId { get; set; }
+}
+
+/// <summary>
+/// مدل نمایش آیتم‌های گردش کار ثبت نام
+/// </summary>
+public class RegistrationWorkflowItemsViewModel
+{
+    /// <summary>
+    /// لیست کارفرمایان
+    /// </summary>
+    public List<RegistrationWorkflowItemsEmployerViewModel> Employers { get; set; }
+    
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; set; }
+    
+    /// <summary>
+    /// تعداد پرسنل
+    /// </summary>
+    public int PersonnelCount { get; set; }
+    
+    /// <summary>
+    /// قیمت
+    /// </summary>
+    public double Price { get; set; }
+    
+    /// <summary>
+    /// وضعیت انجام شدن
+    /// </summary>
+    public bool IsDone { get; set; }
+
+    public long WorkshopDetailsId { get; set; }
+}
+
+/// <summary>
+/// مدل نمایش کارفرما در آیتم‌های گردش کار ثبت نام
+/// </summary>
+public class RegistrationWorkflowItemsEmployerViewModel
+{
+    /// <summary>
+    /// نام و نام خانوادگی
+    /// </summary>
+    public string FullName { get; set; }
+    
+    /// <summary>
+    /// شناسه
+    /// </summary>
+    public long Id { get; set; }
+}

CompanyManagment.App.Contracts/InsuranceJob/IInsuranceJobApplication.cs

@@ -21,4 +21,12 @@ public interface IInsuranceJobApplication
     List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);
 
     OperationResult Remove(long id);
+    Task<List<InsuranceJobSelectListViewModel>> GetSelectList();
+}
+
+public class InsuranceJobSelectListViewModel
+{
+    public long Id { get; set; }
+    public string InsuranceJobTitle { get; set; }
+    public string EconomicCode { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InsuranceList;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -47,4 +48,6 @@ public interface IInsuranceListApplication
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
 
 	#endregion
+
+    Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
 }

CompanyManagment.App.Contracts/Law/ILawApplication.cs

@@ -0,0 +1,37 @@
+using _0_Framework.Application;
+using System.Collections.Generic;
+using System.Security.AccessControl;
+using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.Workshop;
+
+namespace CompanyManagment.App.Contracts.Law
+{
+    public interface ILawApplication
+    {
+        OperationResult Create(CreateLaw command);
+        OperationResult Edit(EditLaw command);
+        OperationResult Activate(long id);
+        OperationResult Deactivate(long id);
+        OperationResult ActivateByType(LawType type);
+        OperationResult DeactivateByType(LawType type);
+        EditLaw GetDetails(long id);
+        Task<List<LawViewModel>> GetList(LawSearchModel searchModel);
+        Task<LawViewModel> GetLawWithItems(long id);
+        Task<LawViewModel> GetLawByType(LawType type);
+        OperationResult UpsertLaw(EditLaw command);
+    }
+
+    public class LawSearchModel
+    {
+        public string Title { get; set; }
+        public string Text { get; set; }
+    }
+
+    public enum LawType
+    {
+        /// <summary>
+        /// ثبت نام
+        /// </summary>
+        Register
+    }
+}

CompanyManagment.App.Contracts/Law/LawViewModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace CompanyManagment.App.Contracts.Law
+{
+    public class LawViewModel
+    {
+        public long Id { get; set; }
+        public string Title { get; set; }
+        public bool IsActive { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public List<LawItemViewModel> Items { get; set; }
+        public LawType Type { get; set; }
+        public string HeadTitle { get; set; }
+        public List<string> Notifications { get; set; }
+    }
+
+    public class LawItemViewModel
+    {
+        public string Header { get; set; }
+        public string Details { get; set; }
+        // public int OrderNumber { get; set; }
+    }
+
+    public class CreateLaw
+    {
+        public string Title { get; set; }
+        public List<LawItemViewModel> Items { get; set; }
+        public LawType Type { get; set; }
+        public string HeadTitle { get; set; }
+        public List<string> Notifications { get; set; }
+    }
+
+
+
+    public class EditLaw
+    {
+        public long Id { get; set; }
+        public string Title { get; set; }
+        public List<LawItemViewModel> Items { get; set; }
+        public LawType Type { get; set; }
+        public string HeadTitle { get; set; }
+        public List<string> Notifications { get; set; }
+
+    }
+}

CompanyManagment.App.Contracts/Leave/CreateLeave.cs

@@ -37,4 +37,5 @@ public class CreateLeave
     public List<CustomizeRotatingShiftsViewModel> RotatingShifts { get; set; }
     public bool HasRollCall { get; set; }
     public CustomizeRotatingShiftsViewModel SelectedShift { get; set; }
+    public bool IsInvallid { get; set; }
 }

CompanyManagment.App.Contracts/Leave/LeavePrintViewModel.cs

@@ -27,4 +27,5 @@ public class LeavePrintViewModel
     public string MonthGr {  get; set; }
     public int PrintCounter { get; set; }
     public List<EmprViewModel> EmployerList { get; set; }
+    public bool IsInvalid { get; set; }
 }

CompanyManagment.App.Contracts/Leave/LeaveSearchModel.cs

@@ -20,4 +20,5 @@ public class LeaveSearchModel
     public int Year { get; set; }
     public int Month { get; set; }
     public int PageIndex { get; set; }
+    public bool IsInvalid { get; set; }
 }

CompanyManagment.App.Contracts/Leave/LeaveViewModel.cs

@@ -27,4 +27,5 @@ public class LeaveViewModel
 
     public TimeSpan ShiftDuration { get; set; }
     public bool HasShiftDuration { get; set; }
+    public bool IsInvalid { get; set; }
 }

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs

@@ -57,4 +57,12 @@ public class ContractingPartyGetListViewModel
     /// </summary>
     public ActivationStatus Status { get; set; }
 
+
+    public string Address { get; set; }
+    public string PhoneNumber { get; set; }
+    public string NationalId { get; set; }
+    public string RepresentativeName { get; set; }
+    
+    
+
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/ContractingPartyTempViewModel.cs

@@ -8,4 +8,8 @@ public class ContractingPartyTempViewModel : CreateContractingPartyTemp
     /// </summary>
     public string DateOfBirthFa { get; set; }
 
+    public string Address { get; set; }
+    public string City { get; set; }
+    public long RepresentativeId { get; set; }
+
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateInstitutionContractTemp.cs

@@ -67,7 +67,7 @@ public class CreateInstitutionContractTemp
     /// -
     /// Completed ثبت نام تکمیل شده
     /// </summary>
-    public string RegistrationStatus { get; set; }
+    public InstitutionContractTempStatus RegistrationStatus { get; set; }
 
     /// <summary>
     /// آی دی پیامک ارسال شده

CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateWorkshopTemp.cs

@@ -16,20 +16,7 @@ public class CreateWorkshopTemp
     /// ای دی طرف حساب  
     /// </summary>
     public long ContractingPartyTempId { get; set; }
-
-    /// <summary>
-    /// جمع کل مبالغ سرویس ها برای کارگاه
-    /// Double
-    /// </summary>
-    public double WorkshopServicesAmount { get; set; }
-
-    /// <summary>
-    /// جمع کل مبالغ سرویس ها برای کارگاه
-    /// فارسی
-    /// </summary>
-    public string WorkshopServicesAmountStr { get; set; }
-
-
+    
     #region ServiceSelection
 
     /// <summary>
@@ -46,6 +33,7 @@ public class CreateWorkshopTemp
     /// حضورغباب
     /// </summary>
     public bool RollCall { get; set; }
+    public bool RollCallInPerson { get; set; }
 
     /// <summary>
     /// فیش غیر رسمی

CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

@@ -2,7 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionPlan;
+using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -16,7 +19,7 @@ public interface ITemporaryClientRegistrationApplication
     /// <param name="mobile"></param>
     /// <returns></returns>
     Task<OperationResult<ContractingPartyTempViewModel>> CreateContractingPartyTemp(string nationalCode, string dateOfBirth, string mobile);
-
+    
     /// <summary>
     /// تکمیل اطلاعات
     /// </summary>
@@ -52,11 +55,25 @@ public interface ITemporaryClientRegistrationApplication
     /// دریافت مبالغ بررسی و پرداخت
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
-    /// <param name="periodModel"></param>
+    /// <param name="duration"></param>
     /// <param name="paymentModel"></param>
     /// <returns></returns>
     Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId,
-        string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth");
+        InstitutionContractDuration duration  = InstitutionContractDuration.TwelveMonths, string paymentModel = "OneTime", string contractStartType = "currentMonth");
+
+    /// <summary>
+    /// دریافت مبالغ بررسی و پرداخت با لیست کارگاه ها
+    /// این متد برای زمانی است که کارگاه ها در مرحله ثبت نام موقت هستند
+    /// و هنوز در دیتابیس ثبت نشده اند
+    /// </summary>
+    /// <param name="totalPaymentMonth"></param>
+    /// <param name="duration"></param>
+    /// <param name="hasInPersonContract"></param>
+    /// <param name="contractingPartyTempId"></param>
+    /// <param name="paymentModel"></param>
+    /// <returns></returns>
+    Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(double totalPaymentMonth,
+        InstitutionContractDuration duration , bool hasInPersonContract);
 
     /// <summary>
     /// ایجاد یا ویرایش قرارداد موقت
@@ -94,10 +111,14 @@ public interface ITemporaryClientRegistrationApplication
     /// <returns></returns>
     Task<OperationResult> PayOffCompleted(long contractingPartyTempId);
 
+
+
+
     /// <summary>
-    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
-    /// جهت نمایش در کارپوشه
+    /// ارسال لینک تایید قوانین و مقررات به طرف حساب
     /// </summary>
+    /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    Task<List<RegistrationWorkflowMainList>> RegistrationWorkflowMainList();
-}
+    Task<OperationResult> SendAgreementLink(long contractingPartyTempId);
+}
+

CompanyManagment.App.Contracts/TemporaryClientRegistration/InstitutionContractTempViewModel.cs

@@ -3,4 +3,14 @@
 public class InstitutionContractTempViewModel : CreateInstitutionContractTemp
 {
     public long Id { get; set; }
+}
+
+public enum InstitutionContractTempStatus
+{
+    BeforeSendVerifyCode,
+    VerifyCodeSent,
+    PendingToCompletion,
+    ReceivedCodeFromClient,
+    Completed
+    
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/RegistrationWorkflowMainList.cs

@@ -1,21 +0,0 @@
-namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-public class RegistrationWorkflowMainList
-{
-    /// <summary>
-    /// آی دی طرف حساب ثبت شده موقت
-    /// </summary>
-    public long ContractingPartyTempId { get; set; }
-
-
-    /// <summary>
-    /// نام کامل طرف حساب
-    /// </summary>
-    public string ContractingPartyFullName { get; set; }
-
-    /// <summary>
-    /// شماره همراه
-    /// </summary>
-    public string Phone { get; set; }
-
-}

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

@@ -1,30 +1,22 @@
 using System;
 using System.Collections.Generic;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.Workshop;
 
 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
 public class ReviewAndPaymentViewModel
 {
-    /// <summary>
-    /// جمع کل 
-    /// double
-    /// </summary>
-    public double SumOfWorkshopsPaymentDouble { get; set; }
 
     /// <summary>
-    /// جمع کل 
-    /// string
+    /// تخفیف
     /// </summary>
-    public string SumOfWorkshopsPaymentPaymentStr { get; set; }
-
-
-
+    public string Discount { get; set; }
 
     /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// Double
+    /// مقدار جمع مبلغ کارگاه ها
     /// </summary>
-    public double OneTimeWithoutTaxPaymentDouble { get; set; }
+    public string SumOfWorkshopsPayment { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت بدون مالیات
@@ -32,118 +24,46 @@ public class ReviewAndPaymentViewModel
     /// </summary>
     public string OneTimeWithoutTaxPaymentStr { get; set; }
 
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// Double
-    /// </summary>
-    public double OneTimeTotalPaymentDouble { get; set; }
-
     /// <summary>
     /// مبلغ پرداخت کامل
     /// string
     /// </summary>
     public string OneTimeTotalPaymentStr { get; set; }
 
-
-
     /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// Double
-    /// </summary>
-    public double MonthlyWithoutTaxPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت بدون مالیات
+    /// مبلغ پرداخت بدون مالیات ماهانه
     /// string
     /// </summary>
     public string MonthlyWithoutTaxPaymentStr { get; set; }
 
-
     /// <summary>
-    /// مبلغ پرداخت کامل
-    /// Double
-    /// </summary>
-    public double MonthlyTotalPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// string
+    /// مبلغ پرداخت کامل ماهانه
+    /// string 
     /// </summary>
     public string MonthlyTotalPaymentStr { get; set; }
-
-    /// <summary>
-    /// مالیات بر ارزش افزوده
-    /// Double
-    /// </summary>
-    public double ValueAddedTaxDouble { get; set; }
-
+    
     /// <summary>
     /// مالیات بر ارزش افزوده
     /// string
     /// </summary>
-    public string ValueAddedTaxSt { get; set; }
-
-
-
-
-    /// <summary>
-    /// بازه قرداد
-    /// با عدد مشخص میشود
-    /// مثلا یک ماه عدد 1
-    /// </summary>
-    public string PeriodModel { get; set; }
-
-    /// <summary>
-    /// OneTime پرداخت یکجا
-    ///  - 
-    /// Monthly پرداخت ماهانه 
-    /// </summary>
-    public string PaymentModel { get; set; }
-
-    /// <summary>
-    /// لیست کارگاه های ایجاد شده
-    /// </summary>
-    public List<WorkshopTempViewModel> WorkshopTempViewList { get; set; }
-
-    /// <summary>
-    /// آی دی طرف حساب
-    /// </summary>
-    public long ContractingPartTempId { get; set; }
+    public string MonthlyValueAddedTaxStr { get; set; }
+    
+    public string OneTimeValueAddedTaxStr { get; set; }
 
     /// <summary>
     /// لیست اقساط ماهیانه
     /// </summary>
     public List<MonthlyInstallment> MonthlyInstallments { get; set; }
 
+    /// <summary>
+    /// شروع قرارداد - شمسی
+    /// </summary>
+    public string ContractStartFa { get; set; }
 
     /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// شمسی
+    /// شروع قرارداد - میلادی
     /// </summary>
-    public string ContractStartCurrentMonthFa { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartCurrentMonthGr { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractStartNextMonthFa{ get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartNextMonthGr { get; set; }
+    public DateTime ContractStartGr { get; set; }
 
     /// <summary>
     /// تاریخ پایان قرارداد
@@ -158,4 +78,8 @@ public class ReviewAndPaymentViewModel
     /// شمسی
     /// </summary>
     public string ContractEndFa { get; set; }
+
+    public string DailyCompensation { get; set; }
+    public string Obligation { get; set; }
+    public string DiscountedAmountForOneMonth { get; set; }
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/WorkshopTempViewModel.cs

@@ -3,4 +3,18 @@
 public class WorkshopTempViewModel : CreateWorkshopTemp
 {   
     public long Id { get; set; }
+    
+    /// <summary>
+    /// جمع کل مبالغ سرویس ها برای کارگاه
+    /// Double
+    /// </summary>
+    public double WorkshopServicesAmount { get; set; }
+
+    /// <summary>
+    /// جمع کل مبالغ سرویس ها برای کارگاه
+    /// فارسی
+    /// </summary>
+    public string WorkshopServicesAmountStr { get; set; }
+
+    public long WorkshopId { get; set; }
 }

CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs

@@ -151,5 +151,6 @@ public class CreateWorkshop
     /// تصفیه حساب بصورت استاتیک محاصبه شود
     /// </summary>
     public bool IsStaticCheckout { get; set; }
+    
 
 }

CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using CompanyManagment.App.Contracts.Workshop.DTOs;
+using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.Workshop;
 
@@ -89,4 +90,175 @@ public interface IWorkshopApplication
 
 
     #endregion
+
+    Task<ActionResult<OperationResult>> CreateWorkshopWorkflowRegistration(CreateWorkshopWorkflowRegistration command);
+}
+
+public class CreateWorkshopWorkflowRegistration
+{
+	/// <summary>
+	/// شناسه جزئیات کارگاه قرارداد نهاد مرتبط
+	/// </summary>
+	public long InstitutionContractWorkshopInitialId { get; set; }
+	/// <summary>
+	/// نام کارگاه
+	/// </summary>
+	public string WorkshopName { get; set; }
+	/// <summary>
+	/// نام مستعار
+	/// </summary>
+	public string SureName { get; set; }
+	/// <summary>
+	/// نوع مالکیت
+	/// </summary>
+	public string TypeOfOwnership { get; set; }
+	/// <summary>
+	/// کد بایگانی
+	/// </summary>
+	public string ArchiveCode { get; set; }
+	/// <summary>
+	/// نام نماینده
+	/// </summary>
+	public string AgentName { get; set; }
+	/// <summary>
+	/// شناسه طرف قرارداد
+	/// </summary>
+	public long ContractingPartyId { get; set; }
+	/// <summary>
+	/// شهر
+	/// </summary>
+	public string City { get; set; }
+	/// <summary>
+	/// استان
+	/// </summary>
+	public string Province { get; set; }
+	/// <summary>
+	/// آدرس
+	/// </summary>
+	public string Address { get; set; }
+	/// <summary>
+	/// شناسه حساب کارشناس ارشد قرارداد
+	/// </summary>
+	public long SeniorContractAccountId { get; set; }
+	/// <summary>
+	/// شناسه حساب کارشناس قرارداد
+	/// </summary>
+	public long JuniorContractAccountId { get; set; }
+	/// <summary>
+	/// شناسه حساب کارشناس ارشد بیمه
+	/// </summary>
+	public long SeniorInsuranceAccountId { get; set; }
+	/// <summary>
+	/// شناسه حساب کارشناس بیمه
+	/// </summary>
+	public long JuniorInsuranceAccountId { get; set; }
+	/// <summary>
+	/// باز بودن در تعطیلات
+	/// </summary>
+	public bool WorkingInHoliday { get; set; }
+	/// <summary>
+	/// محاسبه نوبت کاری در فیش حقوقی
+	/// </summary>
+	public bool RotatingShiftCompute { get; set; }
+	
+	/// <summary>
+	/// ایجاد قرارداد
+	/// </summary>
+	public bool CreateContract { get; set; }
+	/// <summary>
+	/// امضاء قراداد
+	/// </summary>
+	public bool SignContract { get; set; }
+	/// <summary>
+	/// ایجات تصفیه حساب
+	/// </summary>
+	public bool CreateCheckout { get; set; }
+	/// <summary>
+	/// امضاء تصفیه حساب
+	/// </summary>
+	public bool SignCheckout { get; set; }
+	/// <summary>
+	/// تصفیه حساب بصورت استاتیک محاصبه شود
+	/// </summary>
+	public bool IsStaticCheckout { get; set; }
+	/// <summary>
+	/// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
+	/// این آیتم
+	/// True
+	/// است
+	/// </summary>
+	public IsActive CutContractEndOfYear { get; set; }
+	/// <summary>
+	/// سرویس تصفیه حساب سفارشی
+	/// </summary>
+	public string HasCustomizeCheckoutService { get; set; }
+
+	/// <summary>
+	/// محاسبه اضافه کار فیش حقوقی در لیست بیمه
+	/// </summary>
+	public bool InsuranceCheckoutOvertime { get;  set; }
+	/// <summary>
+	/// محاسبه حق اولاد در لیست بیمه
+	/// </summary>
+	public bool InsuranceCheckoutFamilyAllowance { get;  set; }
+	/// <summary>
+	/// حضور و غیاب رایگان ویژه
+	/// </summary>
+	public string HasRollCallFreeVip { get; set; }
+	/// <summary>
+	/// مدت قرارداد
+	/// </summary>
+    public string ContractTerm { get; set; }
+    /// <summary>
+    /// مخفی کردن کل پرداخت
+    /// </summary>
+    public bool TotalPaymentHide { get; set; }
+    /// <summary>
+    /// نوع ارسال بیمه
+    /// </summary>
+    public string TypeOfInsuranceSend { get; set; }
+	/// <summary>
+	/// کد بیمه
+	/// </summary>
+    public string InsuranceCode { get; set; }
+	
+	/// <summary>
+	/// مشمول دستمزد مقطوع
+	/// </summary>
+    public bool FixedSalary { get; set; }
+
+	/// <summary>
+	/// صنف
+	/// </summary>
+	public long InsuranceJobId { get; set; }
+
+	/// <summary>
+	/// جمعیت شهر
+	/// </summary>
+	public string Population { get; set; }
+
+	/// <summary>
+	/// شماره تماس نماینده کارگاه
+	/// </summary>
+	public string AgentPhone { get; set; }
+
+	public string TypeOfContract { get; set; }
+	/// <summary>
+	/// ردیف پیمان
+	/// </summary>
+	public string AgreementNumber { get; set; }
+
+	/// <summary>
+	/// نوع محاسبه طلب مرخصی
+	/// </summary>
+	public string ComputeOptions { get; set; }
+	
+	/// <summary>
+	/// نوع محسبه عیدی و پاداش
+	/// </summary>
+	public string BonusesOptions { get; set; }
+	/// <summary>
+	/// نوع محاسبه سنوات
+	/// </summary>
+	public string YearsOptions { get; set; }
 }

CompanyManagment.Application/AuthorizedPersonApplication.cs

@@ -0,0 +1,119 @@
+using System.Collections.Generic;
+using System.Linq;
+using _0_Framework.Application;
+using Company.Domain.AuthorizedPersonAgg;
+using CompanyManagment.App.Contracts.AuthorizedPerson;
+
+namespace CompanyManagment.Application;
+
+public class AuthorizedPersonApplication : IAuthorizedPersonApplication
+{
+    private readonly IAuthorizedPersonRepository _authorizedPersonRepository;
+
+    public AuthorizedPersonApplication(IAuthorizedPersonRepository authorizedPersonRepository)
+    {
+        _authorizedPersonRepository = authorizedPersonRepository;
+    }
+
+    public OperationResult Create(CreateAuthorizedPerson command)
+    {
+        var operation = new OperationResult();
+
+        if (_authorizedPersonRepository.ExistsByNationalCode(command.NationalCode))
+            return operation.Failed("شخص با این کد ملی قبلاً ثبت شده است");
+
+        var authorizedPerson = new AuthorizedPerson(
+            command.NationalCode, command.FirstName, command.LastName, 
+            command.FatherName, command.BirthDate, command.Gender, 
+            command.DeathStatus, command.ShenasnameSeri, 
+            command.ShenasnameSerial, command.ShenasnamehNumber);
+
+        _authorizedPersonRepository.Create(authorizedPerson);
+        _authorizedPersonRepository.SaveChanges();
+        
+        return operation.Succcedded();
+    }
+
+    public OperationResult CreateFromUidResponse(CreateAuthorizedPerson command)
+    {
+        var operation = new OperationResult();
+
+        var existingPerson = _authorizedPersonRepository.GetByNationalCode(command.NationalCode);
+        if (existingPerson != null)
+        {
+            existingPerson.UpdatePersonalInfo(command.FirstName, command.LastName, 
+                command.FatherName, command.Gender, command.DeathStatus);
+            _authorizedPersonRepository.SaveChanges();
+            return operation.Succcedded();
+        }
+
+        var authorizedPerson = new AuthorizedPerson(
+            command.NationalCode, command.FirstName, command.LastName, 
+            command.FatherName, command.BirthDate, command.Gender, 
+            command.DeathStatus, command.ShenasnameSeri, 
+            command.ShenasnameSerial, command.ShenasnamehNumber);
+
+        _authorizedPersonRepository.Create(authorizedPerson);
+        _authorizedPersonRepository.SaveChanges();
+        
+        return operation.Succcedded();
+    }
+
+    public AuthorizedPersonViewModel GetByNationalCode(string nationalCode)
+    {
+        var authorizedPerson = _authorizedPersonRepository.GetByNationalCode(nationalCode);
+        if (authorizedPerson == null) return null;
+
+        return new AuthorizedPersonViewModel
+        {
+            Id = authorizedPerson.id,
+            NationalCode = authorizedPerson.NationalCode,
+            FirstName = authorizedPerson.FirstName,
+            LastName = authorizedPerson.LastName,
+            FatherName = authorizedPerson.FatherName,
+            BirthDate = authorizedPerson.BirthDate,
+            Gender = authorizedPerson.Gender,
+            DeathStatus = authorizedPerson.DeathStatus,
+            ShenasnameSeri = authorizedPerson.ShenasnameSeri,
+            ShenasnameSerial = authorizedPerson.ShenasnameSerial,
+            ShenasnamehNumber = authorizedPerson.ShenasnamehNumber,
+            IsVerified = authorizedPerson.IsVerified,
+            VerificationDate = authorizedPerson.VerificationDate?.ToString("yyyy/MM/dd HH:mm"),
+            CreationDate = authorizedPerson.CreationDate.ToString("yyyy/MM/dd HH:mm")
+        };
+    }
+
+    public List<AuthorizedPersonViewModel> Search(string nationalCode = null, string firstName = null, string lastName = null)
+    {
+        var allPersons = _authorizedPersonRepository.Get();
+        
+        var filteredPersons = allPersons.Where(x =>
+            (string.IsNullOrEmpty(nationalCode) || x.NationalCode.Contains(nationalCode)) &&
+            (string.IsNullOrEmpty(firstName) || x.FirstName.Contains(firstName)) &&
+            (string.IsNullOrEmpty(lastName) || x.LastName.Contains(lastName)))
+            .Select(x => new AuthorizedPersonViewModel
+            {
+                Id = x.id,
+                NationalCode = x.NationalCode,
+                FirstName = x.FirstName,
+                LastName = x.LastName,
+                FatherName = x.FatherName,
+                BirthDate = x.BirthDate,
+                Gender = x.Gender,
+                DeathStatus = x.DeathStatus,
+                ShenasnameSeri = x.ShenasnameSeri,
+                ShenasnameSerial = x.ShenasnameSerial,
+                ShenasnamehNumber = x.ShenasnamehNumber,
+                IsVerified = x.IsVerified,
+                VerificationDate = x.VerificationDate?.ToString("yyyy/MM/dd HH:mm"),
+                CreationDate = x.CreationDate.ToString("yyyy/MM/dd HH:mm")
+            }).ToList();
+
+        return filteredPersons;
+    }
+
+    public bool ExistsByNationalCode(string nationalCode)
+    {
+        return _authorizedPersonRepository.ExistsByNationalCode(nationalCode);
+    }
+}

CompanyManagment.Application/CheckoutApplication.cs

@@ -164,18 +164,26 @@ public class CheckoutApplication : ICheckoutApplication
 
         if (!command.HasRollCall && command.ShiftWork != "4")
             mandatoryDays = totalDays - command.FridayStarttoEnd;
-        var monthlyWage = command.DailySalaryAffected * mandatoryDays;
+        var monthlyWage = command.DailySalaryAffected * totalDays;
 
         //پایه سنوات
-        var bacicYears = command.BaseYearAffected * mandatoryDays;
+        var bacicYears = command.BaseYearAffected * totalDays;
         #endregion
 
         //سنوات
         var years = command.YearsPay;
 		//عیدی و پاداش
 		var bunos = command.BonusesPay;
-	
-		var sumOfWorkingDays = $"{totalDays}";
+
+        //فاطمه احمدژاد === موقت عیدی و پاداش  و سنوات حساب نشه
+        if (command.EmployeeId == 45104 && command.WorkshopId == 315)
+        {
+            years = 0;
+
+            bunos = 0;
+        }
+
+        var sumOfWorkingDays = $"{totalDays}";
 		if (command.friday > 0)
 		{
 			var fridayPercent = dayliWage * 40 / 100;

CompanyManagment.Application/EmployeeAplication.cs

@@ -179,8 +179,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 else
                 {
 
-                    nationalCodValid = false;
-                    return opration.Failed("کد ملی وارد شده نا معتبر است");
+                   
+                   
+                        nationalCodValid = false;
+                        return opration.Failed("کد ملی وارد شده نا معتبر است");
+                    
+                    
+                   
                 }
             }
             catch (Exception)
@@ -313,8 +318,15 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 else
                 {
 
-                    nationalCodValid = false;
-                    return opration.Failed("کد ملی وارد شده نا معتبر است");
+                    if (command.Nationality == "ایرانی")
+                    {
+                        nationalCodValid = false;
+                        return opration.Failed("کد ملی وارد شده نا معتبر است");
+                    }
+                    else
+                    {
+                        nationalCodValid = true;
+                    }
                 }
             }
             catch (Exception)
@@ -1632,11 +1644,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (apiResult.ResponseContext.Status.Code == 3)
             {
-                return op.Failed("کد ملی نامعتبر است");
+                return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
             }
             if (apiResult.ResponseContext.Status.Code != 0)
             {
-                return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
+                return op.Failed("اطلاعات وارد شده نامعتبر میباشد");
             }
             var basicInfo = apiResult.BasicInformation;
             var identityInfo = apiResult.IdentificationInformation;

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -2,21 +2,35 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using _0_Framework.Application.Sms;
+using _0_Framework.Application.UID;
+using _0_Framework.Exceptions;
+using AccountManagement.Application.Contracts.Account;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.empolyerAgg;
+using Company.Domain.FinancialStatmentAgg;
+using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.RepresentativeAgg;
+using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.EFCore.Migrations;
+using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
 using ConnectedPersonnelViewModel = CompanyManagment.App.Contracts.Workshop.ConnectedPersonnelViewModel;
+using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 
 namespace CompanyManagment.Application;
 
@@ -30,13 +44,22 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IWorkshopRepository _workshopRepository;
     private readonly ILeftWorkRepository _leftWorkRepository;
     private readonly IWorkshopApplication _workshopApplication;
+    private readonly IContractingPartyTempRepository _contractingPartyTempRepository;
+    private readonly IFinancialStatmentRepository _financialStatmentRepository;
+    private readonly IContactInfoApplication _contactInfoApplication;
+    private readonly IAccountApplication _accountApplication;
+    private readonly ISmsService _smsService;
+    private readonly IUidService _uidService;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
         IPersonalContractingPartyRepository contractingPartyRepository,
         IRepresentativeRepository representativeRepository, IEmployerRepository employerRepository,
         IWorkshopRepository workshopRepository, ILeftWorkRepository leftWorkRepository,
-        IFinancialStatmentApplication financialStatmentApplication, IWorkshopApplication workshopApplication)
+        IFinancialStatmentApplication financialStatmentApplication, IWorkshopApplication workshopApplication,
+        IContractingPartyTempRepository contractingPartyTempRepository,
+        IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
+        IAccountApplication accountApplication, ISmsService smsService, IUidService uidService)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -46,6 +69,12 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _leftWorkRepository = leftWorkRepository;
         _financialStatmentApplication = financialStatmentApplication;
         _workshopApplication = workshopApplication;
+        _contractingPartyTempRepository = contractingPartyTempRepository;
+        _financialStatmentRepository = financialStatmentRepository;
+        _contactInfoApplication = contactInfoApplication;
+        _accountApplication = accountApplication;
+        _smsService = smsService;
+        _uidService = uidService;
     }
 
     public OperationResult Create(CreateInstitutionContract command)
@@ -180,7 +209,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.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax, command.ValueAddedTax, []);
 
         _institutionContractRepository.Create(createContract);
         _institutionContractRepository.SaveChanges();
@@ -289,7 +318,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.ValueAddedTax, []);
 
         _institutionContractRepository.Create(createContract);
         _institutionContractRepository.SaveChanges();
@@ -901,352 +930,562 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 
     public async Task<OperationResult> CreateAsync(CreateInstitutionContractRequest command)
     {
-        string contractingPartyName = String.Empty;
-        bool dateMessages = false;
-        string dateMaessageResult = String.Empty;
         var opration = new OperationResult();
-        if (_institutionContractRepository.Exists(x =>
-                x.ContractingPartyId == command.ContractingPartyId && x.RepresentativeId == command.RepresentativeId &&
-                x.TypeOfContract == command.TypeOfContract))
-            return opration.Failed(
-                "برای این معرف و طرف حساب قبلا قرارداد ایجاد شده است، شما میتوانید از تمدید استفاده کنید");
-
-        if (string.IsNullOrWhiteSpace(command.ContractDateFa))
-        {
-            dateMaessageResult = "تاریخ قراراداد اجباری است. ";
-            dateMessages = true;
-        }
-
-        if (string.IsNullOrWhiteSpace(command.ContractStartFa))
-        {
-            dateMaessageResult += "تاریخ شروع قراراداد اجباری  است. ";
-            dateMessages = true;
-        }
-
-        if (string.IsNullOrWhiteSpace(command.ContractEndFa))
-        {
-            dateMaessageResult += "تاریخ پایان قراراداد اجباری است. ";
-            dateMessages = true;
-        }
-
-        if (dateMessages)
-            return opration.Failed(dateMaessageResult);
-
-        if (command.RepresentativeId < 1 && command.ContractingPartyId > 1)
-        {
-            return opration.Failed("معرف را انتخاب کنید");
-        }
-        else if (command.ContractingPartyId < 1 && command.RepresentativeId > 1)
-        {
-            return opration.Failed("طرف حساب را انتخاب کنید");
-        }
-        else if (command.ContractingPartyId < 1 && command.RepresentativeId < 1)
-        {
-            return opration.Failed("معرف و طرف حساب را انتخاب کنید");
-        }
-
         var syear = command.ContractStartFa.Substring(0, 4);
         var smonth = command.ContractStartFa.Substring(5, 2);
         var sday = command.ContractStartFa.Substring(8, 2);
-        var contractingParty = _contractingPartyRepository.GetDetails(command.ContractingPartyId);
-        //شماره قرارداد
+
+        var transaction = await _contractingPartyRepository.BeginTransactionAsync();
+
+        if (command.ContractStartFa.TryToGeorgianDateTime(out var contractStartGr) == false)
+            return opration.Failed("تاریخ شروع قرارداد معتبر نیست");
+
+        contractStartGr.AddMonthsFa((int)command.Duration, out var contractEndGr);
+        contractEndGr = contractEndGr.ToFarsi().FindeEndOfMonth().ToGeorgianDateTime();
+
+        PersonalContractingParty existingContractingParty = null;
+        if (command.ContractingPartyLegalType == LegalType.Legal)
+        {
+            existingContractingParty =
+                await _contractingPartyRepository.GetByRegisterId(command.LegalParty.RegisterId);
+            if (_contractingPartyRepository.Exists(x =>
+                    x.LName == command.LegalParty.CompanyName && x.RegisterId == command.LegalParty.RegisterId))
+            {
+                if (_institutionContractRepository.Exists(x => x.ContractStartGr < contractEndGr
+                                                               && contractStartGr < x.ContractEndGr
+                                                               && x.ContractingPartyId == existingContractingParty.id
+                                                               && x.IsActiveString == "true"))
+                {
+                    throw new BadRequestException("امکان ایجاد قرارداد تکراری وجود ندارد");
+                }
+            }
+        }
+        else if (command.ContractingPartyLegalType == LegalType.Real)
+        {
+            existingContractingParty =
+                await _contractingPartyRepository.GetByNationalCode(command.RealParty.NationalCode);
+            if (_contractingPartyRepository.Exists(x =>
+                    x.LName == command.RealParty.LName && x.Nationalcode == command.RealParty.NationalCode))
+            {
+                if (_institutionContractRepository.Exists(x => x.ContractStartGr < contractEndGr
+                                                               && contractStartGr < x.ContractEndGr
+                                                               && x.ContractingPartyId == existingContractingParty.id
+                                                               && x.IsActiveString == "true"))
+                {
+                    throw new BadRequestException("امکان ایجاد قرارداد تکراری وجود ندارد");
+                }
+            }
+        }
+
+        PersonalContractingParty contractingParty;
+        if (existingContractingParty != null)
+        {
+            contractingParty = existingContractingParty;
+        }
+        else
+        {
+            OperationResult<PersonalContractingParty> contractingPartyResult = command.ContractingPartyLegalType switch
+            {
+                LegalType.Legal => await CreateLegalContractingPartyEntity(command.LegalParty, command.RepresentativeId,
+                    command.Address,
+                    command.City, command.Province),
+                LegalType.Real => await CreateRealContractingPartyEntity(command.RealParty, command.RepresentativeId,
+                    command.Address,
+                    command.City, command.Province),
+                _ => throw new BadRequestException("نوع طرف قرارداد مشخص نشده است")
+            };
+
+            if (!contractingPartyResult.IsSuccedded)
+                return opration.Failed(contractingPartyResult.Message);
+
+            contractingParty = contractingPartyResult.Data;
+        }
+
+        if (_institutionContractRepository.Exists(x =>
+                x.ContractingPartyId == contractingParty.id && x.RepresentativeId == command.RepresentativeId &&
+                x.TypeOfContract == "JobRelation"))
+            return opration.Failed(
+                "برای این معرف و طرف حساب قبلا قرارداد ایجاد شده است، شما میتوانید از تمدید استفاده کنید");
+
         var contractNo = $"{syear}{smonth}{sday}/{contractingParty.ArchiveCode}/0";
 
-        ///////////////////////
-        if (command.ContactInfos.Count == 0)
-            return opration.Failed("ورود شماره تماس برای ارسال پیامک الزامیست");
-        var accountContact = command.ContactInfos.Where(x =>
-            x.SendSmsString == "true" && x.Position == "طرف قرارداد" && x.PhoneType == "شماره همراه" &&
-            !string.IsNullOrWhiteSpace(x.PhoneNumber)).ToList();
-        if (accountContact.Count == 0)
-            return opration.Failed("ورود شماره همراه با سمت طرف قرارداد برای ساخت حساب کاربری الزامیست");
-        var accountContactCount = command.ContactInfos
-            .Where(x => x.PhoneType == "شماره همراه" && x.Position == "طرف قرارداد").ToList();
-        if (accountContactCount.Count > 1)
-            return opration.Failed("فقط یکی از شماره تلفن ها میتواند سمت طرف قرارداد داشته باشد");
+        var representative = _representativeRepository.Get(command.RepresentativeId);
+        if (representative == null)
+            return opration.Failed("معرف مورد نظر یافت نشد");
 
-        contractingPartyName = contractingParty.LName;
-        //نام معرف
-        var representative = _representativeRepository.GetDetails(command.RepresentativeId).FullName;
-
-        var contractStartGr = command.ContractStartFa.ToGeorgianDateTime();
-        var contractEndGr = command.ContractEndFa.ToGeorgianDateTime();
-
-        var contractDateGr = command.ContractDateFa.ToGeorgianDateTime();
-
-        if (command.Address != null && command.State == null)
+        if (command.IsInstallment &&
+            !command.Workshops.Any(x => x.HasContractPlanInPerson || x.HasInsurancePlanInPerson))
         {
-            return opration.Failed("لطفا استان و شهر را انتخاب کنید");
+            return opration.Failed("برای قراردادهای اقساطی حداقل یک کارگاه باید دارای طرح حضوری باشد");
         }
 
-        if ((command.Address != null && command.State != null) && command.City == "شهرستان")
+
+        var today = DateTime.Today;
+
+        var contractDateGr = today;
+        var contractDateFa = contractDateGr.ToFarsi();
+
+
+        var hasValueAddedTax = command.TaxAmount > 0 ? "true" : "false";
+
+        var contractingPartyFullName = contractingParty.FName + " " + contractingParty.LName;
+
+        var workshopDetails = command.Workshops.Select(x =>
+            new InstitutionContractWorkshopInitial(x.WorkshopName, x.HasRollCallPlan, false, x.HasCustomizeCheckoutPlan,
+                x.HasContractPlan, x.HasContractPlanInPerson, x.HasInsurancePlan, x.HasInsurancePlanInPerson,
+                x.PersonnelCount, x.Price)).ToList();
+
+
+        var entity = new InstitutionContract(contractNo, command.RepresentativeId, representative.FullName,
+            contractingParty.id,
+            contractingPartyFullName, contractDateGr, contractDateFa, command.Province, command.City, command.Address,
+            contractStartGr,
+            contractStartGr.ToFarsi(), contractEndGr, contractEndGr.ToFarsi(), command.OneMonthAmount,
+            command.DailyCompensation,
+            command.Obligation, command.TotalAmount, 0,
+            command.Workshops.Count.ToString(),
+            command.Workshops.Sum(x => x.PersonnelCount).ToString(), command.Description,
+            "NotOfficial", "JobRelation", hasValueAddedTax,
+            command.TaxAmount, workshopDetails);
+
+
+        FinancialStatment financialStatement;
+        if (_financialStatmentRepository.Exists(x => x.ContractingPartyId == contractingParty.id))
         {
-            return opration.Failed("لطفا شهر را انتخاب کنید");
+            financialStatement = await _financialStatmentRepository.GetByContractingPartyId(contractingParty.id);
+        }
+        else
+        {
+            financialStatement = new FinancialStatment(contractingParty.id, contractingPartyFullName);
+            await _financialStatmentRepository.CreateAsync(financialStatement);
         }
 
-        if (command.Address == null && command.State != null)
+        if (command.IsInstallment)
         {
-            return opration.Failed("لطفا آدرس را وارد کنید");
+            var installments =
+                CalculateInstallment(command.TotalAmount, (int)command.Duration, command.ContractStartFa, true);
+
+            // دریافت مبلغ اولین قسط
+            //این کار برای این هست که اولین قسط باید با تاریخ امروز باشد و باید به وضعیت مالی بدهی ایجاد شود که یوزر اولین بدهی را وارد کند
+            var firstInstallmentAmount = installments.First().Amount;
+
+            // حذف اولین قسط
+            installments.RemoveAt(0);
+
+            // ایجاد قسط جدید با تاریخ امروز 
+            var todayInstallment = new InstitutionContractInstallment(DateTime.Today, firstInstallmentAmount, "");
+
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
+
+            financialStatement.AddFinancialTransaction(financialTransaction);
+
+            // اضافه کردن قسط جدید به ابتدای لیست
+            installments.Insert(0, todayInstallment);
+
+            entity.SetInstallments(installments);
+        }
+        else
+        {
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "پرداخت کل سرویس", "debt", "بابت خدمات", command.TotalAmount, 0, 0);
+            financialStatement.AddFinancialTransaction(financialTransaction);
         }
 
-        if (string.IsNullOrWhiteSpace(command.OfficialCompany))
-            return opration.Failed("رسمی یا غیر رسمی بودن پرداخت را مشخص کنید");
-        if (command.OfficialCompany == "Official" && string.IsNullOrWhiteSpace(command.HasValueAddedTax))
-            return opration.Failed("وضعیت ارزش افزوده را مشخص کنید");
-        if (string.IsNullOrWhiteSpace(command.TypeOfContract))
-            return opration.Failed("عنوان قرارداد را انتخاب کنید");
 
-        if (string.IsNullOrWhiteSpace(command.ContractAmountString))
-            command.ContractAmountString = "0";
-        if (string.IsNullOrWhiteSpace(command.DailyCompenseationString))
-            command.DailyCompenseationString = "0";
-        if (string.IsNullOrWhiteSpace(command.ObligationString))
-            command.ObligationString = "0";
-        if (string.IsNullOrWhiteSpace(command.TotalAmountString))
-            command.TotalAmountString = "0";
-        
-        var valueAddedTax = string.IsNullOrWhiteSpace(command.ValueAddedTaxStr)
-            ? 0
-            : command.ValueAddedTaxStr.MoneyToDouble();
-        var contractAmountStr = command.ContractAmountString.ToDoubleMoney();
-        var contractAmount = Convert.ToDouble(contractAmountStr);
-        var DailyCompenseationStr = command.DailyCompenseationString.ToDoubleMoney();
-        var dailyCompenseation = Convert.ToDouble(DailyCompenseationStr);
-        var ObligationStr = command.ObligationString.ToDoubleMoney();
-        var obligation = Convert.ToDouble(ObligationStr);
-        var TotalAmountStr = command.TotalAmountString.ToDoubleMoney();
-        var totalAmount = Convert.ToDouble(TotalAmountStr);
-        //var hasValueAddedTax = "false";
-        //double valueAddedTax = 0;
-        //if (command.HasValueAddedTax == "true")
-        //{
-        //    hasValueAddedTax = "true";
-        //    valueAddedTax = command.ContractAmount * 0.1;
-        //    command.ContractAmount += valueAddedTax;
-        //}
+        await _institutionContractRepository.CreateAsync(entity);
+        await _institutionContractRepository.SaveChangesAsync();
 
-        var createContract = new InstitutionContract(contractNo, command.RepresentativeId, representative,
-            command.ContractingPartyId,
-            contractingPartyName, contractDateGr, command.ContractDateFa, command.State, command.City,
-            command.Address, contractStartGr,
-            command.ContractStartFa, contractEndGr, command.ContractEndFa, contractAmount,
-            dailyCompenseation, obligation,
-            totalAmount, 0, command.WorkshopManualCount, command.EmployeeManualCount, command.Description,
-            command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax, valueAddedTax);
+        var mainContactInfo = new CreateContactInfo
+        {
+            InstitutionContractId = entity.id,
+            PhoneType = "شماره همراه",
+            Position = "طرف قرارداد",
+            PhoneNumber = contractingParty.Phone,
+            FnameLname = contractingPartyFullName,
+            SendSms = true
+        };
+        _contactInfoApplication.Create(mainContactInfo);
 
-        _institutionContractRepository.Create(createContract);
-        _institutionContractRepository.SaveChanges();
-        return opration.Succcedded(createContract.id);
+        foreach (var contactInfo in command.ContactInfos)
+        {
+            if (contactInfo.PhoneNumber != null)
+            {
+                var contactinfo = new CreateContactInfo
+                {
+                    InstitutionContractId = entity.id,
+                    PhoneType = contactInfo.PhoneType,
+                    Position = contactInfo.Position,
+                    PhoneNumber = contactInfo.PhoneNumber,
+                    FnameLname = contactInfo.FnameLname,
+                    SendSms = contactInfo.SendSmsString == "true" ? true : false
+                };
+                _contactInfoApplication.Create(contactinfo);
+            }
+        }
+
+        var userPass = contractingParty.IsLegal == "حقیقی"
+            ? contractingParty.Nationalcode
+            : contractingParty.NationalId;
+        var createAcc = new RegisterAccount
+        {
+            Fullname = contractingParty.LName,
+            Username = userPass,
+            Password = userPass,
+            Mobile = contractingParty.Phone,
+            NationalCode = userPass
+        };
+        var res = _accountApplication.RegisterClient(createAcc);
+        if (res.IsSuccedded)
+            CreateContractingPartyAccount(contractingParty.id, res.SendId);
+
+        await _institutionContractRepository.SaveChangesAsync();
+
+        await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
+            entity.PublicId);
+
+
+        await transaction.CommitAsync();
+        return opration.Succcedded();
     }
 
     public async Task<OperationResult> EditAsync(EditInstitutionContractRequest command)
     {
-         bool dateMessages = false;
-        string dateMaessageResult = String.Empty;
-        var opration = new OperationResult();
-        var ContractEdit = _institutionContractRepository.Get(command.Id);
-        if (ContractEdit == null)
-            opration.Failed("رکورد مورد نظر وجود ندارد");
+        throw new NotImplementedException();
+    }
+    
 
-        var contractStartGr = command.ContractStartFa.ToGeorgianDateTime();
-        var contractEndGr = command.ContractEndFa.ToGeorgianDateTime();
-
-        var contractDateGr = command.ContractDateFa.ToGeorgianDateTime();
-
-        if (_institutionContractRepository.Exists(x =>
-                x.ContractingPartyId == ContractEdit.ContractingPartyId &&
-                ((contractStartGr >= x.ContractStartGr && contractStartGr <= x.ContractEndGr) ||
-                 (contractEndGr >= x.ContractStartGr && contractEndGr <= x.ContractEndGr)) && x.id != command.Id &&
-                x.TypeOfContract == command.TypeOfContract))
-            return opration.Failed("در بازه تاریخ وارد شده قرارداد دیگری وجود دارد");
-        //if (_institutionContractRepository.Exists(x =>
-        //    x.ContractingPartyId == ContractEdit.ContractingPartyId && (x.ContractStartGr <= contractDateGr || x.ContractDateGr <= contractDateGr) && x.id != command.Id))
-        //    return opration.Failed("تاریخ عقد قرارداد با قرارداد دیگری تداخل دارد");
-        if (string.IsNullOrWhiteSpace(command.ContractDateFa))
-        {
-            dateMaessageResult = "تاریخ قراراداد اجباری است. ";
-            dateMessages = true;
-        }
-
-        if (string.IsNullOrWhiteSpace(command.ContractStartFa))
-        {
-            dateMaessageResult += "تاریخ شروع قراراداد اجباری  است. ";
-            dateMessages = true;
-        }
-
-        if (string.IsNullOrWhiteSpace(command.ContractEndFa))
-        {
-            dateMaessageResult += "تاریخ پایان قراراداد اجباری است. ";
-            dateMessages = true;
-        }
-
-        if (dateMessages)
-            return opration.Failed(dateMaessageResult);
-        if (command.Address != null && command.State == null)
-        {
-            return opration.Failed("لطفا استان و شهر را انتخاب کنید");
-        }
-
-        if ((command.Address != null && command.State != null) && command.City == "شهرستان")
-        {
-            return opration.Failed("لطفا شهر را انتخاب کنید");
-        }
-
-        if (command.Address == null && command.State != null)
-        {
-            return opration.Failed("لطفا آدرس را وارد کنید");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.OfficialCompany))
-            return opration.Failed("رسمی یا غیر رسمی بودن پرداخت را مشخص کنید");
-        if (command.OfficialCompany == "Official" && string.IsNullOrWhiteSpace(command.HasValueAddedTax))
-            return opration.Failed("وضعیت ارزش افزوده را مشخص کنید");
-        if (string.IsNullOrWhiteSpace(command.TypeOfContract))
-            return opration.Failed("عنوان قرارداد را انتخاب کنید");
-
-        if (string.IsNullOrWhiteSpace(command.ContractAmountString))
-            command.ContractAmountString = "0";
-        if (string.IsNullOrWhiteSpace(command.DailyCompenseationString))
-            command.DailyCompenseationString = "0";
-        if (string.IsNullOrWhiteSpace(command.ObligationString))
-            command.ObligationString = "0";
-        if (string.IsNullOrWhiteSpace(command.TotalAmountString))
-            command.TotalAmountString = "0";
-
-        var valueAddedTax = command.ValueAddedTaxStr.MoneyToDouble();
-        var contractAmountStr = command.ContractAmountString.ToDoubleMoney();
-        var contractAmount = Convert.ToDouble(contractAmountStr);
-        var DailyCompenseationStr = command.DailyCompenseationString.ToDoubleMoney();
-        var dailyCompenseation = Convert.ToDouble(DailyCompenseationStr);
-        var ObligationStr = command.ObligationString.ToDoubleMoney();
-        var obligation = Convert.ToDouble(ObligationStr);
-        var TotalAmountStr = command.TotalAmountString.ToDoubleMoney();
-        var totalAmount = Convert.ToDouble(TotalAmountStr);
-
-        ContractEdit.Edit(contractDateGr, command.ContractDateFa, command.State, command.City, command.Address,
-            contractStartGr,
-            command.ContractStartFa, contractEndGr, command.ContractEndFa, contractAmount,
-            dailyCompenseation,
-            obligation, totalAmount, command.WorkshopManualCount, command.EmployeeManualCount,
-            command.Description, command.OfficialCompany, command.TypeOfContract, valueAddedTax,
-            command.HasValueAddedTax);
-        await _institutionContractRepository.SaveChangesAsync();
-        return opration.Succcedded(command.Id);
+    public Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList()
+    {
+        return _institutionContractRepository.RegistrationWorkflowMainList();
     }
 
-    public async Task<OperationResult> ExtensionَAsync(CreateInstitutionContractRequest command)
+    public Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId)
     {
-         bool dateMessages = false;
-        string dateMaessageResult = String.Empty;
-        var opration = new OperationResult();
+        return _institutionContractRepository.RegistrationWorkflowItems(institutionContractId);
+    }
 
-        command.ExtensionNo += 1;
-        if (_institutionContractRepository.Exists(x =>
-                x.ExtensionNo == command.ExtensionNo && x.ContractingPartyId == command.ContractingPartyId &&
-                x.TypeOfContract == command.TypeOfContract))
-            return opration.Failed("برای این قرارداد قبلا تمدید ایجاد شده است");
+    public async Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id)
+    {
+        return await _institutionContractRepository.GetVerificationDetails(id);
+    }
 
 
-        if (string.IsNullOrWhiteSpace(command.ContractDateFa))
+    public async Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id)
+    {
+        var institutionContract = await _institutionContractRepository.GetByPublicIdAsync(id);
+        if (institutionContract == null)
         {
-            dateMaessageResult = "تاریخ قراراداد اجباری است. ";
-            dateMessages = true;
+            throw new NotFoundException("رکورد مورد نظر یافت نشد");
         }
 
-        if (string.IsNullOrWhiteSpace(command.ContractStartFa))
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
+            throw new BadRequestException("این قرارداد مالی قبلا تایید شده است");
+
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify &&
+            institutionContract.VerifyCodeCreation != DateTime.MinValue)
         {
-            dateMaessageResult += "تاریخ شروع قراراداد اجباری  است. ";
-            dateMessages = true;
+            if (!institutionContract.CanResendVerifyCode)
+            {
+                throw new BadRequestException("کد تایید قبلی هنوز منقضی نشده است",
+                    new Dictionary<string, object>
+                    {
+                        {
+                            "expireTime", (int)institutionContract.ReSendTime.TotalSeconds -
+                                          (int)(DateTime.Now - institutionContract.VerifyCodeCreation).TotalSeconds
+                        }
+                    });
+            }
         }
 
-        if (string.IsNullOrWhiteSpace(command.ContractEndFa))
+        var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
+        if (contractingParty == null)
+            throw new NotFoundException("طرف قرارداد یافت نشد");
+
+        var code = new Random().Next(1000, 9999).ToString();
+        institutionContract.SetVerifyCode(code);
+
+        var transaction = await _institutionContractRepository.BeginTransactionAsync();
+        try
         {
-            dateMaessageResult += "تاریخ پایان قراراداد اجباری است. ";
-            dateMessages = true;
+            await _institutionContractRepository.SaveChangesAsync();
+            _smsService.VerifySend(contractingParty.Phone, code);
+        }
+        catch (Exception e)
+        {
+            transaction.Rollback();
+            Console.WriteLine(e);
+            throw;
         }
 
-        if (dateMessages)
-            return opration.Failed(dateMaessageResult);
-
-        var firstContract =
-            _institutionContractRepository.GetFirstContract(command.ContractingPartyId, command.TypeOfContract);
-
-        var syear = firstContract.ContractStartFa.Substring(0, 4);
-        var smonth = firstContract.ContractStartFa.Substring(5, 2);
-        var sday = firstContract.ContractStartFa.Substring(8, 2);
-        var contractingParty = _contractingPartyRepository.GetDetails(command.ContractingPartyId);
-        //شماره قرارداد
-        var contractNo = $"{syear}{smonth}{sday}/{contractingParty.ArchiveCode}/{command.ExtensionNo}";
-
-
-        var contractStartGr = command.ContractStartFa.ToGeorgianDateTime();
-        var contractEndGr = command.ContractEndFa.ToGeorgianDateTime();
-
-        var contractDateGr = command.ContractDateFa.ToGeorgianDateTime();
-        if (_institutionContractRepository.Exists(x =>
-                ((contractStartGr >= x.ContractStartGr && contractStartGr <= x.ContractEndGr) ||
-                 (contractEndGr >= x.ContractStartGr && contractEndGr <= x.ContractEndGr)) &&
-                x.TypeOfContract == command.TypeOfContract && x.ContractingPartyId == command.ContractingPartyId))
-            return opration.Failed("تاریخ شروع و پایان وارد شده با قرارداد دیگری تداخل دارد");
-        if (command.Address != null && command.State == null)
+        await transaction.CommitAsync();
+        var result = new OtpResultViewModel
         {
-            return opration.Failed("لطفا استان و شهر را انتخاب کنید");
+            ExpireTimeSec = (int)institutionContract.ExpireTime.TotalSeconds,
+            ReSendTimeSec = (int)institutionContract.ReSendTime.TotalSeconds
+        };
+        return new OperationResult<OtpResultViewModel>().Succcedded(result);
+    }
+
+    public async Task<OperationResult> VerifyOtp(Guid publicId, string code)
+    {
+        var op = new OperationResult();
+        var institutionContract = await _institutionContractRepository.GetByPublicIdAsync(publicId);
+        if (institutionContract == null)
+        {
+            throw new NotFoundException("رکورد مورد نظر یافت نشد");
         }
 
-        if ((command.Address != null && command.State != null) && command.City == "شهرستان")
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
+            throw new BadRequestException("این قرارداد مالی قبلا تایید شده است");
+
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify &&
+            institutionContract.VerifyCodeExpired)
+            throw new BadRequestException("کد تایید منقضی شده است");
+
+        var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
+        if (contractingParty == null)
+            throw new NotFoundException("طرف قرارداد یافت نشد");
+
+        if (institutionContract.VerifyCode != code)
+            return op.Failed("کد وارد شده صحیح نمی باشد");
+        institutionContract.SetPendingWorkflow();
+
+        await _institutionContractRepository.SaveChangesAsync();
+        return op.Succcedded();
+    }
+
+    public async Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId)
+    {
+        var details = await _institutionContractRepository.GetInstitutionWorkshopInitialDetails(workshopDetailsId);
+        var services = details.Services;
+
+        var res = new InstitutionContractWorkshopDetailViewModel()
         {
-            return opration.Failed("لطفا شهر را انتخاب کنید");
+            ServicesViewModel = new WorkshopServicesViewModel()
+            {
+                Contract = services.Contract,
+                ContractInPerson = services.ContractInPerson,
+                CustomizeCheckout = services.CustomizeCheckout,
+                Insurance = services.Insurance,
+                InsuranceInPerson = services.InsuranceInPerson,
+                RollCall = services.RollCall,
+                RollCallInPerson = services.RollCallInPerson
+            }
+        };
+        return res;
+    }
+
+    public async Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId)
+    {
+        return await _institutionContractRepository.GetExtensionInquiry(previousContractId);
+    }
+
+    public async Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(
+        InstitutionContractExtensionWorkshopsRequest request)
+    {
+        return await _institutionContractRepository.GetExtensionWorkshops(request);
+    }
+
+    public async Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request)
+    {
+        return await _institutionContractRepository.GetExtensionInstitutionPlan(request);
+    }
+
+    public async Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request)
+    {
+        return await _institutionContractRepository.GetExtensionPaymentMethod(request);
+    }
+
+    public async Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request)
+    {
+        return await _institutionContractRepository.ExtensionComplete(request);
+    }
+
+
+    private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
+        CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
+        string state)
+    {
+        var opration = new OperationResult<PersonalContractingParty>();
+
+
+        if (representativeId < 1)
+            return opration.Failed("لطفا معرف را انتخاب کنید");
+
+        if (_contractingPartyRepository.Exists(x =>
+                x.LName == request.CompanyName && x.NationalId == request.NationalId))
+            return opration.Failed("نام شرکت  وارد شده تکراری است");
+
+
+        if (_contractingPartyRepository.Exists(x =>
+                x.RegisterId == request.RegisterId && x.LName != request.CompanyName))
+            return opration.Failed("شماره ثبت وارد شده تکراری است");
+
+
+        if (_contractingPartyRepository.Exists(x =>
+                x.NationalId == request.NationalId && x.LName != request.CompanyName))
+        {
+            return opration.Failed("شناسه ملی وارد شده تکراری است");
         }
 
-        if (command.Address == null && command.State != null)
+        var archiveCode = _contractingPartyRepository.GetLastNewArchiveCode();
+
+
+        var representative = _representativeRepository.GetDetails(representativeId);
+        var legalContractingParty = new PersonalContractingParty("*", request.CompanyName,
+            "*", "*", request.RegisterId, request.NationalId,
+            "حقوقی",
+            request.PhoneNumber, request.PhoneNumber, address, representativeId, representative.FullName,
+            archiveCode, state, city, null, null,
+            request.FName, request.LName, request.Position);
+
+        if (request.IsAuth)
         {
-            return opration.Failed("لطفا آدرس را وارد کنید");
+            legalContractingParty.LegalAuthentication(request.FName,request.LName,request.FatherName,
+                request.IdNumber,null,null,request.BirthDateFa,request.Gender,request.PhoneNumber);
         }
 
-        if (string.IsNullOrWhiteSpace(command.OfficialCompany))
-            return opration.Failed("رسمی یا غیر رسمی بودن پرداخت را مشخص کنید");
-        if (command.OfficialCompany == "Official" && string.IsNullOrWhiteSpace(command.HasValueAddedTax))
-            return opration.Failed("وضعیت ارزش افزوده را مشخص کنید");
-        if (string.IsNullOrWhiteSpace(command.TypeOfContract))
-            return opration.Failed("عنوان قرارداد را انتخاب کنید");
-        if (string.IsNullOrWhiteSpace(command.ContractAmountString))
-            command.ContractAmountString = "0";
-        if (string.IsNullOrWhiteSpace(command.DailyCompenseationString))
-            command.DailyCompenseationString = "0";
-        if (string.IsNullOrWhiteSpace(command.ObligationString))
-            command.ObligationString = "0";
-        if (string.IsNullOrWhiteSpace(command.TotalAmountString))
-            command.TotalAmountString = "0";
-        var valueAddedTax = string.IsNullOrWhiteSpace(command.ValueAddedTaxStr)
-            ? 0
-            : command.ValueAddedTaxStr.MoneyToDouble();
-        var contractAmountStr = command.ContractAmountString.ToDoubleMoney();
-        var contractAmount = Convert.ToDouble(contractAmountStr);
-        var DailyCompenseationStr = command.DailyCompenseationString.ToDoubleMoney();
-        var dailyCompenseation = Convert.ToDouble(DailyCompenseationStr);
-        var ObligationStr = command.ObligationString.ToDoubleMoney();
-        var obligation = Convert.ToDouble(ObligationStr);
-        var TotalAmountStr = command.TotalAmountString.ToDoubleMoney();
-        var totalAmount = Convert.ToDouble(TotalAmountStr);
-        var contractingPartyName = contractingParty.LName;
-        var representative = _representativeRepository.GetDetails(command.RepresentativeId).FullName;
-        
-        var createContract = new InstitutionContract(contractNo, command.RepresentativeId, representative,
-            command.ContractingPartyId,
-            contractingPartyName, contractDateGr, command.ContractDateFa, command.State, command.City,
-            command.Address, contractStartGr,
-            command.ContractStartFa, contractEndGr, command.ContractEndFa, contractAmount,
-            dailyCompenseation, obligation,
-            totalAmount, command.ExtensionNo, command.WorkshopManualCount, command.EmployeeManualCount,
-            command.Description, command.OfficialCompany, command.TypeOfContract, command.HasValueAddedTax,
-            valueAddedTax);
+        await _contractingPartyRepository.CreateAsync(legalContractingParty);
+        await _contractingPartyRepository.SaveChangesAsync();
 
-        _institutionContractRepository.Create(createContract);
-        _institutionContractRepository.SaveChanges();
-                                                                                                                                                                                                     
+        return opration.Succcedded(legalContractingParty);
+    }
 
-        
-        return opration.Succcedded(createContract.id);
+    private async Task<OperationResult<PersonalContractingParty>> CreateRealContractingPartyEntity(
+        CreateInstitutionContractRealPartyRequest request, long representativeId, string address,
+        string city, string province)
+    {
+        var operation = new OperationResult<PersonalContractingParty>();
+
+
+        if (representativeId < 1)
+            return operation.Failed("لطفا معرف را انتخاب کنید");
+
+        if (_contractingPartyRepository.Exists(x => x.Nationalcode == request.NationalCode))
+        {
+            return operation.Failed("کد ملی وارد شده تکراری است");
+        }
+
+        var archiveCode = _contractingPartyRepository.GetLastNewArchiveCode();
+
+        if (request.NationalCode.NationalCodeValid() != "valid")
+        {
+            return operation.Failed("کد ملی وارد شده نا معتبر است");
+        }
+
+        var representative = _representativeRepository.GetDetails(representativeId);
+
+        if (representative == null)
+            return operation.Failed("معرف مورد نظر یافت نشد");
+
+        var personalContractingParty = new PersonalContractingParty(request.FName, request.LName,
+            request.NationalCode, request.IdNumber, "*", "*",
+            "حقیقی",
+            request.PhoneNumber, request.PhoneNumber, address, representativeId, representative.FullName, archiveCode,
+            province, city, null, null, null, null);
+
+        if (request.IsAuth)
+        {
+            personalContractingParty.Authentication(request.FName, request.LName, request.FatherName,
+                request.IdNumber, null,null, request.BirthDateFa, request.Gender,request.PhoneNumber);
+        }
+
+        await _contractingPartyRepository.CreateAsync(personalContractingParty);
+        await _contractingPartyRepository.SaveChangesAsync();
+
+        return operation.Succcedded(personalContractingParty);
+    }
+
+    private List<InstitutionContractInstallment> CalculateInstallment(double amount, int installmentCount,
+        string loanStartDate, bool getRounded)
+    {
+        int day = Convert.ToInt32(loanStartDate.Substring(8, 2));
+        int month = Convert.ToInt32(loanStartDate.Substring(5, 2));
+        int year = Convert.ToInt32(loanStartDate.Substring(0, 4));
+
+        var installments = new List<InstitutionContractInstallment>();
+
+
+        bool endOfMonth = day == 31;
+
+
+        var dividedAmount = amount / installmentCount;
+
+        double moneyPerMonth = 0;
+
+        if (getRounded)
+            moneyPerMonth = Math.Floor(dividedAmount / 1000) * 1000;
+        else
+            moneyPerMonth = Math.Floor(dividedAmount);
+
+        double lastLoan = amount - (moneyPerMonth * (installmentCount - 1));
+
+        if (endOfMonth)
+        {
+            for (int i = 1; i < installmentCount; i++)
+            {
+                var installment =
+                    new InstitutionContractInstallment(loanStartDate.ToGeorgianDateTime(), moneyPerMonth, "");
+
+                installments.Add(installment);
+
+                if (month == 12)
+                {
+                    year++;
+                    month = 1;
+                }
+                else
+                {
+                    month++;
+                }
+
+                loanStartDate = $"{year:0000}/{month:00}/01".FindeEndOfMonth();
+            }
+
+            var lastInstallment = new InstitutionContractInstallment(loanStartDate.ToGeorgianDateTime(), lastLoan, "");
+
+            installments.Add(lastInstallment);
+            return installments;
+        }
+        else
+        {
+            for (int i = 1; i < installmentCount; i++)
+            {
+                var installment =
+                    new InstitutionContractInstallment(loanStartDate.ToGeorgianDateTime(), moneyPerMonth, "");
+
+                installments.Add(installment);
+                var endDay = 0;
+
+                if (month == 12)
+                {
+                    year++;
+                    month = 1;
+                }
+                else
+                {
+                    month++;
+                }
+
+                if (day == 30)
+                {
+                    if (month == 12)
+                    {
+                        var lastYearDay =
+                            Convert.ToInt32($"{year:0000}/{month:00}/1".FindeEndOfMonth().Substring(8, 2));
+                        endDay = lastYearDay == 30 ? lastYearDay : 29;
+                    }
+                }
+
+                loanStartDate =
+                    endDay == 0 ? $"{year:0000}/{month:00}/{day:00}" : $"{year:0000}/{month:00}/{endDay:00}";
+            }
+
+            var lastInstallment = new InstitutionContractInstallment(loanStartDate.ToGeorgianDateTime(), lastLoan, "");
+            installments.Add(lastInstallment);
+            return installments;
+        }
     }
 }
 
@@ -1266,4 +1505,4 @@ public class WorkshopsAndEmployeeViewModel
     public int ArchiveCode { get; set; }
 }
 
-#endregion
+#endregion

CompanyManagment.Application/InsuranceJobApplication.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.InsuranceJobItemAgg;
 using Company.Domain.InsurancJobAgg;
@@ -155,4 +156,9 @@ public class InsuranceJobApplication: IInsuranceJobApplication
     {
         return _insuranceJobRepositpry.Remove(id);
     }
+
+    public async Task<List<InsuranceJobSelectListViewModel>> GetSelectList()
+    {
+        return await _insuranceJobRepositpry.GetSelectList();
+    }
 }

CompanyManagment.Application/InsuranceListApplication.cs

@@ -2366,5 +2366,10 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return _insuranceListRepositpry.GetTabCounts(searchModel);
 	}
 
+	public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
+	{
+		return await _insuranceListRepositpry.GetNotCreatedWorkshop(searchModel);
+	}
+
 	#endregion
 }

CompanyManagment.Application/LawApplication.cs

@@ -0,0 +1,256 @@
+using _0_Framework.Application;
+using Company.Domain.LawAgg;
+using CompanyManagment.App.Contracts.Law;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.Application;
+
+public class LawApplication : ILawApplication
+{
+    private readonly ILawRepository _lawRepository;
+
+    public LawApplication(ILawRepository lawRepository)
+    {
+        _lawRepository = lawRepository;
+    }
+
+    public OperationResult Create(CreateLaw command)
+    {
+        var operation = new OperationResult();
+        if (_lawRepository.Exists(x => x.Type == command.Type))
+        {
+            return operation.Failed("این قانون قبلا ثبت شده است");
+        }
+
+        var law = new Law(command.Title, command.Type, command.Notifications, command.HeadTitle);
+        if (command.Items == null || command.Items.Count == 0)
+        {
+            return operation.Failed("باید حداقل یک بند برای قانون باید ثبت شود");
+        }
+        
+        var orderNumber = 1;
+        foreach (var item in command.Items)
+        {
+            law.AddItem(item.Header, item.Details, orderNumber);
+            orderNumber++;
+        }
+
+        _lawRepository.Create(law);
+        _lawRepository.SaveChanges();
+
+        return operation.Succcedded();
+    }
+
+    public OperationResult Edit(EditLaw command)
+    {
+        var operation = new OperationResult();
+        var law = _lawRepository.Get(command.Id);
+
+        if (law == null)
+            return operation.Failed(ApplicationMessages.RecordNotFound);
+
+        if (command.Items == null || command.Items.Count == 0)
+        {
+            return operation.Failed("باید حداقل یک بند برای قانون باید ثبت شود");
+        }
+        var orderNumber = 1;
+        var lawItems = command.Items.Select(x =>
+        {
+            var res = new LawItem(x.Header, x.Details, orderNumber);
+            orderNumber++;
+            return res;
+        }).ToList();
+            
+        law.Edit(command.Title);
+            
+        law.SetItem(lawItems);
+
+        _lawRepository.SaveChanges();
+        return operation.Succcedded();
+    }
+
+    public OperationResult UpsertLaw(EditLaw command)
+    {
+        var operation = new OperationResult();
+        
+        // Validate items
+        if (command.Items == null || command.Items.Count == 0)
+        {
+            return operation.Failed("باید حداقل یک بند برای قانون باید ثبت شود");
+        }
+        
+        // Check if law exists by type
+        var existingLaw = _lawRepository.Get().FirstOrDefault(x => x.Type == command.Type);
+        
+        if (existingLaw == null)
+        {
+            // If law doesn't exist, create a new one
+            var law = new Law(command.Title, command.Type,command.Notifications, command.HeadTitle);
+            
+            var orderNumber = 1;
+            foreach (var item in command.Items)
+            {
+                law.AddItem(item.Header, item.Details, orderNumber);
+                orderNumber++;
+            }
+            
+            _lawRepository.Create(law);
+            _lawRepository.SaveChanges();
+        }
+        else
+        {
+            // If law exists, update it
+            var orderNumber = 1;
+            var lawItems = command.Items.Select(x =>
+            {
+                var res = new LawItem(x.Header, x.Details, orderNumber);
+                orderNumber++;
+                return res;
+            }).ToList();
+            
+            existingLaw.Edit(command.Title);
+            existingLaw.SetItem(lawItems);
+            
+            _lawRepository.SaveChanges();
+        }
+        
+        return operation.Succcedded();
+    }
+
+    public OperationResult Activate(long id)
+    {
+        var operation = new OperationResult();
+        var law = _lawRepository.Get(id);
+
+        if (law == null)
+            return operation.Failed(ApplicationMessages.RecordNotFound);
+
+        law.Activate();
+        _lawRepository.SaveChanges();
+        return operation.Succcedded();
+    }
+
+    public OperationResult Deactivate(long id)
+    {
+        var operation = new OperationResult();
+        var law = _lawRepository.Get(id);
+
+        if (law == null)
+            return operation.Failed(ApplicationMessages.RecordNotFound);
+
+        law.Deactivate();
+        _lawRepository.SaveChanges();
+        return operation.Succcedded();
+    }
+
+    public OperationResult ActivateByType(LawType type)
+    {
+        var operation = new OperationResult();
+        var law = _lawRepository.Get().FirstOrDefault(x => x.Type == type);
+
+        if (law == null)
+        {
+            // If law doesn't exist, create a new active one with default values
+            var newLaw = new Law(GetDefaultTitleForLawType(type), type, new List<string>(), "");
+            newLaw.Activate();
+            _lawRepository.Create(newLaw);
+            _lawRepository.SaveChanges();
+            return operation.Succcedded();
+        }
+
+        law.Activate();
+        _lawRepository.SaveChanges();
+        return operation.Succcedded();
+    }
+
+    public OperationResult DeactivateByType(LawType type)
+    {
+        var operation = new OperationResult();
+        var law = _lawRepository.Get().FirstOrDefault(x => x.Type == type);
+
+        if (law == null)
+            return operation.Failed("قانون مورد نظر یافت نشد");
+
+        law.Deactivate();
+        _lawRepository.SaveChanges();
+        return operation.Succcedded();
+    }
+
+    public EditLaw GetDetails(long id)
+    {
+        var law = _lawRepository.Get(id);
+        return new EditLaw
+        {
+            Id = law.id,
+            Title = law.Title,
+            Type = law.Type,
+            Items = law.Items.OrderBy(x => x.OrderNumber).Select(x => new LawItemViewModel
+            {
+                Header = x.Header,
+                Details = x.Details
+            }).ToList()
+        };
+    }
+
+    public async Task<List<LawViewModel>> GetList(LawSearchModel searchModel)
+    {
+        // Get filtered laws from database
+        return await _lawRepository.GetList(searchModel);
+        
+
+    }
+
+    private string GetDefaultTitleForLawType(LawType lawType)
+    {
+        return lawType switch
+        {
+            LawType.Register => "قوانین ثبت نام",
+            _ => $"قوانین {lawType}"
+        };
+    }
+
+    public async Task<LawViewModel> GetLawWithItems(long id)
+    {
+        var law = await _lawRepository.GetWithItems(id);
+        if (law == null)
+            return null;
+            
+        return new LawViewModel
+        {
+            Id = law.id,
+            Title = law.Title,
+            IsActive = law.IsActive,
+            CreatedAt = law.CreationDate,
+            Type = law.Type,
+            Items = law.Items.OrderBy(x=>x.OrderNumber).Select(x => new LawItemViewModel
+            {
+                Header = x.Header,
+                Details = x.Details,
+            }).ToList()
+        };
+    }
+
+    public async Task<LawViewModel> GetLawByType(LawType type)
+    {
+        var lawViewModel = await _lawRepository.GetByType(type);
+        
+        // If no law exists for this type, return a default empty law
+        if (lawViewModel == null)
+        {
+            return new LawViewModel
+            {
+                Id = 0,
+                Title = GetDefaultTitleForLawType(type),
+                IsActive = false,
+                CreatedAt = DateTime.Now,
+                Type = type,
+                Items = new List<LawItemViewModel>()
+            };
+        }
+        
+        return lawViewModel;
+    }
+}

CompanyManagment.Application/LeaveApplication.cs

@@ -84,7 +84,7 @@ public class LeaveApplication : ILeaveApplication
 
         var end = command.PaidLeaveType == "ساعتی" ? start : command.EndLeave.ToGeorgianDateTime();
 
-        var checkErr = _leaveRepository.CheckErrors(start, end, command.EmployeeId, command.WorkshopId);
+        var checkErr = _leaveRepository.CheckErrors(start, end, command.EmployeeId, command.WorkshopId,command.IsInvallid);
 
         //      start = new DateTime(start.Year, start.Month, start.Day, startH.Hours, startH.Minutes, startH.Seconds);
         //end = new DateTime(end.Year, end.Month, end.Day, endH.Hours, endH.Minutes, endH.Seconds);
@@ -96,10 +96,10 @@ public class LeaveApplication : ILeaveApplication
             return op.Failed(checkErr.ContractErrMessage);
         if (checkErr.HasLeftWork)
             return op.Failed(checkErr.LeftWorlErrMessage);
-        if (checkErr.HasHolidayError)
-            return op.Failed(checkErr.HolidayErrorMessage);
+        //if (checkErr.HasHolidayError)
+           // return op.Failed(checkErr.HolidayErrorMessage);
 
-        if (start > end)
+        if (start > end)    
             return op.Failed("تارخ شروع از پایان بزرگتر است");
 
 
@@ -182,29 +182,30 @@ public class LeaveApplication : ILeaveApplication
                     shiftDuration = shiftEndDateTime - shiftStartDateTime;
                     hasShiftDuration = true;
                 }
-            }
-            else if (employeeSettings is { WorkshopShiftStatus: WorkshopShiftStatus.Irregular })
-            {
-                if ((end - start).TotalDays > 1)
+                else if (employeeSettings is { WorkshopShiftStatus: WorkshopShiftStatus.Irregular })
                 {
-                    return op.Failed("شما نمیتوانید بیشتر از یک روز مرخصی روزانه ثبت کنید");
-                }
-
-                var isActive = _rollCallEmployeeStatusApplication.IsActiveInPeriod(command.EmployeeId, command.WorkshopId, start, start);
-                if (isActive)
-                {
-                    shiftDuration = employeeSettings.IrregularShift.WorkshopIrregularShifts switch
+                    if ((end - start).TotalDays > 1)
                     {
-                        WorkshopIrregularShifts.TwelveThirtySix => TimeSpan.FromHours(12),
-                        WorkshopIrregularShifts.TwelveTwentyFour => TimeSpan.FromHours(12),
-                        WorkshopIrregularShifts.TwentyFourFortyEight => TimeSpan.FromHours(24),
-                        WorkshopIrregularShifts.TwentyFourTwentyFour => TimeSpan.FromHours(24),
-                        _ => new TimeSpan()
-                    };
-                    hasShiftDuration = true;
-                }
+                        return op.Failed("شما نمیتوانید بیشتر از یک روز مرخصی روزانه ثبت کنید");
+                    }
 
+                    var isActive = _rollCallEmployeeStatusApplication.IsActiveInPeriod(command.EmployeeId, command.WorkshopId, start, start);
+                    if (isActive)
+                    {
+                        shiftDuration = employeeSettings.IrregularShift.WorkshopIrregularShifts switch
+                        {
+                            WorkshopIrregularShifts.TwelveThirtySix => TimeSpan.FromHours(12),
+                            WorkshopIrregularShifts.TwelveTwentyFour => TimeSpan.FromHours(12),
+                            WorkshopIrregularShifts.TwentyFourFortyEight => TimeSpan.FromHours(24),
+                            WorkshopIrregularShifts.TwentyFourTwentyFour => TimeSpan.FromHours(24),
+                            _ => new TimeSpan()
+                        };
+                        hasShiftDuration = true;
+                    }
+
+                }
             }
+            
 
         }
 
@@ -237,7 +238,8 @@ public class LeaveApplication : ILeaveApplication
         var employeeFullName = _employeeRepository.GetDetails(command.EmployeeId).EmployeeFullName;
         var workshopName = _workshopRepository.GetDetails(command.WorkshopId).WorkshopName;
         var leave = new Leave(start, end, totalhourses, command.WorkshopId, command.EmployeeId
-            , command.PaidLeaveType, command.LeaveType, employeeFullName, workshopName, command.IsAccepted, command.Decription, year, month, shiftDuration, hasShiftDuration);
+            , command.PaidLeaveType, command.LeaveType, employeeFullName, workshopName, command.IsAccepted, command.Decription,
+            year, month, shiftDuration, hasShiftDuration,command.IsInvallid);
         _leaveRepository.Create(leave);
         _leaveRepository.SaveChanges();
 
@@ -299,7 +301,7 @@ public class LeaveApplication : ILeaveApplication
             return op.Failed("لطفا تاریخ پایان را وارد کنید");
         var start = command.StartLeave.ToGeorgianDateTime();
         var end = command.PaidLeaveType == "ساعتی" ? start : command.EndLeave.ToGeorgianDateTime();
-        var checkErr = _leaveRepository.CheckErrors(start, end, command.EmployeeId, command.WorkshopId);
+        var checkErr = _leaveRepository.CheckErrors(start, end, command.EmployeeId, command.WorkshopId,command.IsInvallid);
 
 
         if (checkErr.HasChekout)

CompanyManagment.Application/LoanApplication.cs

@@ -200,7 +200,8 @@ public class LoanApplication : ILoanApplication
                     DateGr = loanStartDate.ToGeorgianDateTime(),
                     Month = loanStartDate.Substring(5, 2),
                     Year = loanStartDate.Substring(0, 4),
-                    Day = loanStartDate.Substring(8, 2)
+                    Day = loanStartDate.Substring(8, 2),
+                    AmountDouble = moneyPerMonth
                 };
 
                 installments.Add(installment);
@@ -225,7 +226,8 @@ public class LoanApplication : ILoanApplication
                 DateGr = loanStartDate.ToGeorgianDateTime(),
                 Month = loanStartDate.Substring(5, 2),
                 Year = loanStartDate.Substring(0, 4),
-                Day = loanStartDate.Substring(8, 2)
+                Day = loanStartDate.Substring(8, 2),
+                AmountDouble = lastLoan
 
             };
             installments.Add(lastInstallment);
@@ -243,7 +245,8 @@ public class LoanApplication : ILoanApplication
                     DateGr = loanStartDate.ToGeorgianDateTime(),
                     Month = loanStartDate.Substring(5, 2),
                     Year = loanStartDate.Substring(0, 4),
-                    Day = loanStartDate.Substring(8, 2)
+                    Day = loanStartDate.Substring(8, 2),
+                    AmountDouble = moneyPerMonth
                 };
 
                 installments.Add(installment);
@@ -278,7 +281,8 @@ public class LoanApplication : ILoanApplication
                 DateGr = loanStartDate.ToGeorgianDateTime(),
                 Month = loanStartDate.Substring(5, 2),
                 Year = loanStartDate.Substring(0, 4),
-                Day = loanStartDate.Substring(8, 2)
+                Day = loanStartDate.Substring(8, 2),
+                AmountDouble = lastLoan
 
             };
             installments.Add(lastInstallment);

CompanyManagment.Application/PersonalContractingPartyApplication.cs

@@ -131,7 +131,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.Nationalcode, command.IdNumber, "*", "*", 
                 "حقیقی",
                 command.Phone, command.AgentPhone, command.Address,command.RepresentativeId,representative.FullName,command.ArchiveCode,
-                command.State,command.City,command.Zone,command.SureName);
+                command.State,command.City,command.Zone,command.SureName,null,null);
 
 
             _personalContractingPartyRepository.Create(personalContractingParty);
@@ -203,7 +203,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 "*", "*",  command.RegisterId, command.NationalId,
                 "حقوقی",
                 command.Phone, command.AgentPhone, command.Address,command.RepresentativeId, representative.FullName,command.ArchiveCode,
-                command.State, command.City, command.Zone,command.SureName);
+                command.State, command.City, command.Zone,command.SureName,null,null);
 
 
             _personalContractingPartyRepository.Create(legalContractingParty);
@@ -370,7 +370,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
     public int GetLastArchiveCode()
     {
-        return _personalContractingPartyRepository.GetLastArchiveCode();
+        return _personalContractingPartyRepository.GetLastNewArchiveCode();
     }
 	#region Mahan
 	public List<string> SearchByName(string name)
@@ -554,7 +554,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
             command.NationalCode, command.IdNumber, "*", "*",
             "حقیقی",
             command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
-            command.State, command.City, command.Zone, command.SureName);
+            command.State, command.City, command.Zone, command.SureName, null, null);
 
 
         await _personalContractingPartyRepository.CreateAsync(personalContractingParty);
@@ -607,7 +607,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
             "حقوقی",
             command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName,
             command.ArchiveCode,
-            command.State, command.City, command.Zone, command.SureName);
+            command.State, command.City, command.Zone, command.SureName,null,null);
 
 
         await _personalContractingPartyRepository.CreateAsync(legalContractingParty);