feat: extend SMS service to include contracting party and institution contract IDs in verification link and code methods

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

.github/workflows/dotnet-developPublish.yml

@@ -0,0 +1,48 @@
+name: Deploy Development ASP.NET Core App to IIS
+
+on:
+  push:
+    branches:
+      - Main
+
+env:
+  DOTNET_ENVIRONMENT: Development
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration Release 
+
+    - name: Publish
+      run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
+
+    - name: Deploy to IIS via Web Deploy
+      shell: powershell
+      run: |
+        $publishFolder = Resolve-Path ./publish
+        & "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="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
+          -allowUntrusted `
+          -enableRule:AppOffline
+
+
+      env:
+        SERVER_HOST: your-server-ip-or-domain
+        DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+        DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

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/AuthHelper.cs

@@ -42,6 +42,7 @@ public class AuthHelper : IAuthHelper
 		result.WorkshopName = claims.FirstOrDefault(x => x is { Type: "WorkshopName" })?.Value;
 		result.Permissions = Tools.DeserializeFromBsonList<int>(claims.FirstOrDefault(x => x is { Type: "permissions" })?.Value);
         result.RoleName = claims.FirstOrDefault(x => x is { Type: "RoleName" })?.Value;
+        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value??"0");
         return result;
 	}
 
@@ -76,7 +77,7 @@ public class AuthHelper : IAuthHelper
 
 	#region Vafa
 
-	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName)
+	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName,long newWorkshopId)
 	{
 		var user = _contextAccessor.HttpContext.User;
 
@@ -85,6 +86,7 @@ public class AuthHelper : IAuthHelper
 			var claimsIdentity = (ClaimsIdentity)user.Identity;
 			var existingClaimSlug = claimsIdentity.FindFirst("WorkshopSlug");
 			var existingClaimName = claimsIdentity.FindFirst("WorkshopName");
+			var existingWorkshopId = claimsIdentity.FindFirst("WorkshopId");
 
 			if (existingClaimSlug != null)
 			{
@@ -96,9 +98,14 @@ public class AuthHelper : IAuthHelper
 				claimsIdentity.RemoveClaim(existingClaimName);
 			}
 
+			if (existingWorkshopId != null)
+			{
+				claimsIdentity.RemoveClaim(existingWorkshopId);
+			}
 
 			claimsIdentity.AddClaim(new Claim("WorkshopSlug", newWorkshopSlug));
 			claimsIdentity.AddClaim(new Claim("WorkshopName", newWorkshopName));
+			claimsIdentity.AddClaim(new Claim("WorkshopId",newWorkshopId.ToString()));
 
 
 			var authProperties = new AuthenticationProperties
@@ -128,8 +135,16 @@ public class AuthHelper : IAuthHelper
 
 		return "";
 	}
+
+
 	#endregion
 
+	public long GetWorkshopId()
+	{
+		return long.Parse(_contextAccessor.HttpContext?.User.Claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value ?? "0");
+		
+		
+	}
 
 	public string CurrentAccountRole()
 	{
@@ -182,6 +197,7 @@ public class AuthHelper : IAuthHelper
             //mahanChanges
             new("workshopList",workshopBson),
 			new("WorkshopSlug",slug),
+			new("WorkshopId", account.WorkshopId.ToString()),
 			new("WorkshopName",account.WorkshopName??"")
 
 		};

0_Framework/Application/AuthViewModel.cs

@@ -20,6 +20,7 @@ public class AuthViewModel
 
     public int? PositionValue { get; set; }
     public string WorkshopSlug { get; set; }
+    public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
 	public List<WorkshopClaim> WorkshopList { get; set; }
 

0_Framework/Application/IAuthHelper.cs

@@ -17,11 +17,12 @@ public interface IAuthHelper
 
 	#region Vafa
 
-	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
+	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
 
 	#endregion
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
+    long GetWorkshopId();
     (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/PagedResult.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace _0_Framework.Application;
+
+
+public class PagedResult<T> where T : class
+{
+    public int TotalCount  { get; set; }
+    public List<T> List { get; set; }
+}
+public class PagedResult<T,TMeta>:PagedResult<T> where T : class
+{
+    public TMeta? Meta { get; set; }
+}

0_Framework/Application/PaginationRequest.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class PaginationRequest
+{
+    public int PageIndex { get; set; } = 1;
+    public int PageSize { get; set; } = 30;
+}

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -24,7 +24,7 @@ public class AqayePardakhtPaymentGateway:IPaymentGateway
     {
         _httpClient = httpClientFactory.CreateClient();
          
-        if (appSetting.Value.Domain == ".dad-mehr.ir")
+        if (appSetting.Value.Domain == ".dadmehrg.ir")
         {
             _pin = "7349F84E81AB584862D9";
         }

0_Framework/Application/Sms/ISmsService.cs

@@ -26,6 +26,11 @@ public interface ISmsService
     #region Mahan
 
     Task<double> GetCreditAmount();
+    
+    public Task<bool> SendInstitutionVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
+    
+    public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
+        long contractingPartyId, long institutionContractId);
 
     #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/StaticWorkshopAccounts.cs

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

0_Framework/Application/Tools.cs

@@ -477,26 +477,42 @@ public static class Tools
         string bb = string.Empty;
         bool isNegative = false;
 
-        for (int x = 0; x < myMoney.Length; x++)
+        try
         {
-            if (char.IsDigit(myMoney[x]))
+            if (!string.IsNullOrWhiteSpace(myMoney))
             {
-                bb += myMoney[x];
-            }
-            else if (myMoney[x] == '-' && bb.Length == 0)
-            {
-                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
-                isNegative = true;
-            }
-        }
+                for (int x = 0; x < myMoney.Length; x++)
+                {
+                    if (char.IsDigit(myMoney[x]))
+                    {
+                        bb += myMoney[x];
+                    }
+                    else if (myMoney[x] == '-' && bb.Length == 0)
+                    {
+                        // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                        isNegative = true;
+                    }
+                }
 
-        if (bb.Length > 0)
-        {
-            double res = double.Parse(bb);
-            return isNegative ? -res : res;
+                if (bb.Length > 0)
+                {
+                    double res = double.Parse(bb);
+                    return isNegative ? -res : res;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            else
+            {
+                return 0;
+            }
+            
         }
-        else
+        catch (Exception)
         {
+
             return 0;
         }
     }
@@ -1496,6 +1512,14 @@ public static class Tools
     #region Mahan
 
 
+    public static bool IsvalidIban(this string iban)
+    {
+        return Regex.IsMatch(iban, @"^IR[0-9]{24}$");
+    }
+    public static bool IsValidCardNumber(this string cardNumber)
+    {
+        return Regex.IsMatch(cardNumber, @"^[0-9]{16}$");
+    }
     /// <summary>
     /// این متد حروف عربی را به فارسی در میاورد. مثال: علي را به علی تبدیل میکند
     /// </summary>

0_Framework/Application/UID/IUidService.cs

@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => throw new ArgumentOutOfRangeException()
+        _ => Application.Gender.None
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);
@@ -110,6 +110,53 @@ public interface IUidService
 {
     Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode , string birthDate);
     Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode , string phoneNumber);
+    Task<IbanInquiryResponse> IbanInquiry (string iban);
+    Task<AccountToIbanResponse> AccountToIban(string accountNumber, UidBanks bank);
+    Task<CardToNumberResponse> CardToIban(string cardNumber);
+}
+
+public class CardToNumberResponse:UidBaseResponse
+{
+    public string Iban { get; set; }
+    public string CardNumber { get; set; }
+}
+
+public class AccountToIbanResponse:UidBaseResponse
+{
+    public string Iban { get; set; }
+}
+
+public class IbanInquiryResponse:UidBaseResponse
+{
+    public IbanInquiryAccountBasicInformation AccountBasicInformation { get; set; }
+    [JsonProperty("owners")]
+    public List<IbanInquiryOwner> Owners { get; set; }
+}
+
+public class IbanInquiryAccountBasicInformation
+{
+    public string Iban { get; set; }
+    public string AccountNumber { get; set; }
+    public IbanInquiryBankInformation BankInformation { get; set; }
+    public string AccountStatus { get; set; }
+
+}
+
+public class IbanInquiryBankInformation
+{
+    public string BankName { get; set; }
+}
+
+public class IbanInquiryOwner
+{
+    [JsonProperty("firstName")]
+    public string FirstName { get; set; }
+    [JsonProperty("lastName")]
+    public string LastName { get; set; }
+    [JsonProperty("nationalIdentifier")]
+    public string NationalIdentifier { get; set; }
+    [JsonProperty("customerType")]
+    public string CustomerType { get; set; }
 }
 
 public class MatchMobileWithNationalCodeResponse
@@ -118,4 +165,7 @@ public class MatchMobileWithNationalCodeResponse
 
     public ResponseContext ResponseContext { get; set; }
 }
-
+public class UidBaseResponse
+{
+    public ResponseContext ResponseContext { get; set; }
+}

0_Framework/Application/UID/UidBanks.cs

@@ -0,0 +1,117 @@
+using System.ComponentModel;
+
+namespace _0_Framework.Application.UID;
+
+public enum UidBanks
+{
+    [Description("بانک دی")]
+    BANK_DEY = 66,
+    
+    [Description("بانک سپه")]
+    BANK_SEPAH = 15,
+    
+    [Description("بانک شهر")]
+    BANK_SHAHR = 61,
+    
+    [Description("بانک ملت")]
+    BANK_MELAT = 12,
+    
+    [Description("بانک ملی")]
+    BANK_MELLI = 17,
+    
+    [Description("بانک رفاه کارگران")]
+    BANK_REFAH = 13,
+    
+    [Description("بانک سینا")]
+    BANK_SINA = 59,
+    
+    [Description("بانک مسکن")]
+    BANK_MASKAN = 14,
+    
+    [Description("بانک آینده")]
+    BANK_AYANDEH = 62,
+    
+    [Description("بانک انصار")]
+    BANK_ANSAR = 63,
+    
+    [Description("بانک تجارت")]
+    BANK_TEJARAT = 18,
+    
+    [Description("بانک رسالت")]
+    BANK_RESALAT = 70,
+    
+    [Description("بانک سامان")]
+    BANK_SAMAN = 56,
+    
+    [Description("بانک مرکزی")]
+    BANK_MARKAZI = 10,
+    
+    [Description("بانک سرمایه")]
+    BANK_SARMAYEH = 58,
+    
+    [Description("بانک صادرات")]
+    BANK_SADERAT = 19,
+    
+    [Description("بانک قوامین")]
+    BANK_GHAVAMIN = 52,
+    
+    [Description("بانک پارسیان")]
+    BANK_PARSIAN = 54,
+    
+    [Description("بانک کشاورزی")]
+    BANK_KESHAVARZI = 16,
+    
+    [Description("بانک گردشگری")]
+    BANK_GARDESHGARI = 64,
+    
+    [Description("پست بانک")]
+    BANK_POST_BANK = 21,
+    
+    [Description("بانک پاسارگاد")]
+    BANK_PASARGAD = 57,
+    
+    [Description("بانک کارآفرین")]
+    BANK_KARAFARIN = 53,
+    
+    [Description("بانک خاورمیانه")]
+    BANK_KHAVARMIANEH = 78,
+    
+    [Description("بانک ایران زمین")]
+    BANK_IRAN_ZAMIN = 69,
+    
+    [Description("بانک مهر اقتصاد")]
+    BANK_MEHR_EQTESAD = 79,
+    
+    [Description("بانک صنعت و معدن")]
+    BANK_SANAT_MADAN = 11,
+    
+    [Description("بانک اقتصاد نوین")]
+    BANK_EGHTESAD_NOVIN = 55,
+    
+    [Description("بانک توسعه تعاون")]
+    BANK_TOSSE_TAAVON = 22,
+    
+    [Description("بانک توسعه صادرات")]
+    BANK_TOSSE_SADERAT = 20,
+    
+    [Description("بانک ایران و ونزوئلا")]
+    BANK_IRAN_VENEZUELA = 95,
+    
+    [Description("بانک حکمت ایرانیان")]
+    BANK_HEKMAT_IRANIAN = 65,
+    
+    [Description("بانک قرض الحسنه مهر")]
+    BANK_GHARZOLHASANEH_MEHR = 60,
+    
+    [Description("موسسه مالی و اعتباری ملل")]
+    BANK_MOASSASE_MELLAL = 75,
+    
+    [Description("موسسه مالی و اعتباری نور")]
+    BANK_MOASSASE_NOOR = 80,
+    
+    [Description("موسسه مالی و اعتباری کوثر")]
+    BANK_MOASSASE_KOSAR = 73,
+    
+    [Description("موسسه مالی و اعتباری توسعه")]
+    BANK_MOASSASE_TOSSE = 51
+}

0_Framework/Application/UID/UidBanksExtension.cs

@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace _0_Framework.Application.UID
+{
+    public static class UidBanksExtension
+    {
+        /// <summary>
+        /// دریافت نام فارسی بانک
+        /// </summary>
+        /// <param name="bank">بانک</param>
+        /// <returns>نام فارسی بانک</returns>
+        public static string GetPersianName(this UidBanks bank)
+        {
+            var fieldInfo = bank.GetType().GetField(bank.ToString());
+            
+            if (fieldInfo == null) 
+                return string.Empty;
+            
+            var attribute = (DescriptionAttribute)Attribute.GetCustomAttribute(
+                fieldInfo, typeof(DescriptionAttribute));
+            
+            return attribute?.Description ?? bank.ToString();
+        }
+    }
+}

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/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs

@@ -119,7 +119,7 @@ public class BaseCustomizeEntity : EntityBase
 
 	public BreakTime BreakTime { get; protected set; }
 
-	public List<WeeklyOffDay> WeeklyOffDays { get; set; }
+    public List<WeeklyOffDay> WeeklyOffDays { get; set; } = [];
 
 	public void FridayWorkToWeeklyDayOfWeek()
 	{

0_Framework/Domain/IRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.Domain;
 
@@ -17,4 +18,6 @@ public interface IRepository<TKey, T> where  T:class
     bool Exists(Expression<Func<T, bool>> expression);
     void SaveChanges();
     Task SaveChangesAsync();
+	Task<IDbContextTransaction> BeginTransactionAsync();
+    
 }

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;

0_Framework/InfraStructure/RepositoryBase.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.InfraStructure
 {
@@ -70,5 +71,10 @@ namespace _0_Framework.InfraStructure
         {
             await _context.SaveChangesAsync();
         }
+
+        public async Task<IDbContextTransaction> BeginTransactionAsync()
+        {
+            return await _context.Database.BeginTransactionAsync();
+        }
     }
 }

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

@@ -259,7 +259,8 @@ public class AccountApplication : IAccountApplication
 					var workshop = workshopList.First();
 					authViewModel.WorkshopName = workshop.Name;
 					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-				}
+                    authViewModel.WorkshopId = workshop.Id;
+                }
 			}
 
             _authHelper.Signin(authViewModel);
@@ -317,6 +318,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.WorkshopName;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
+                authViewModel.WorkshopId = workshop.WorkshopId;
 			}
 			_authHelper.Signin(authViewModel);
 			idAutoriz = 2;
@@ -368,6 +370,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.Name;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+                authViewModel.WorkshopId = workshop.Id;
 			}
 		}
 
@@ -515,6 +518,7 @@ public class AccountApplication : IAccountApplication
 			var workshop = authViewModel.WorkshopList.First();
 			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
 			authViewModel.WorkshopName = workshop.Name;
+            authViewModel.WorkshopId = workshop.Id;
 		}
 		_authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
@@ -795,4 +799,8 @@ public class AccountApplication : IAccountApplication
         return _accountRepository.CheckExistClientAccount(userName);
     }
 
+    public List<AccountViewModel> GetAdminAccountsNew()
+    {
+        return _accountRepository.GetAdminAccountsNew();
+    }
 }

Company.Domain/AuthorizedBankDetailsAgg/AuthorizedBankDetails.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using _0_Framework_b.Domain;
+
+namespace Company.Domain.AuthorizedBankDetailsAgg
+{
+    public class AuthorizedBankDetails : EntityBase
+    {
+        private AuthorizedBankDetails() 
+        {
+            OwnersList = new List<AuthorizedBankDetailsOwner>();
+        }
+
+        public AuthorizedBankDetails(string cardNumber, string accountNumber, string ban, string bankName, List<AuthorizedBankDetailsOwner> ownersList)
+        {
+            CardNumber = cardNumber;
+            AccountNumber = accountNumber;
+            IBan = ban;
+            BankName = bankName;
+            OwnersList = ownersList ?? new List<AuthorizedBankDetailsOwner>();
+        }
+
+        public string CardNumber { get; private set; }
+        public string AccountNumber { get; private set; }
+        public string IBan { get; private set; }
+        public string BankName { get; private set; }
+        public List<AuthorizedBankDetailsOwner> OwnersList { get; private set; }
+    }
+
+    public class AuthorizedBankDetailsOwner // Value Object - not inheriting from EntityBase
+    {
+        private AuthorizedBankDetailsOwner() { }
+
+        public AuthorizedBankDetailsOwner(string fName, string lName, string nationalIdentifier, string customerType)
+        {
+            FName = fName;
+            LName = lName;
+            NationalIdentifier = nationalIdentifier;
+            CustomerType = customerType;
+        }
+        
+        public string FName { get; private set; }
+        public string LName { get; private set; }
+        public string NationalIdentifier { get; private set; }
+        public string CustomerType { get; private set; }
+    }
+}

Company.Domain/AuthorizedBankDetailsAgg/IAuthorizedBankDetailsRepository.cs

@@ -0,0 +1,13 @@
+using _0_Framework_b.Domain;
+using System.Collections.Generic;
+using Company.Application.Contracts.AuthorizedBankDetails;
+
+namespace Company.Domain.AuthorizedBankDetailsAgg
+{
+    public interface IAuthorizedBankDetailsRepository : IRepository<long, AuthorizedBankDetails>
+    {
+        EditAuthorizedBankDetails GetDetails(long id);
+        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
+        AuthorizedBankDetailsViewModel GetByIban(string iban);
+    }
+}

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/CheckoutAgg/Checkout.cs

@@ -30,7 +30,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall)
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -90,8 +90,10 @@ public class Checkout : EntityBase
         LoanInstallments = loanInstallments;
         SalaryAids = salaryAids;
         CheckoutRollCall = checkoutRollCall;
+        EmployeeMandatoryHours = employeeMandatoryHours;
     }
 
+
     public string EmployeeFullName { get; private set; }
     public string IsActiveString { get; private set; }
     public string Signature { get; private set; }
@@ -193,7 +195,16 @@ public class Checkout : EntityBase
    /// </summary>
    public string TotalDayOfBunosesCompute { get; private set; }
 
+   /// <summary>
+   /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
+   /// </summary>
+   public bool HasAmountConflict { get; private set; }
 
+   /// <summary>
+   /// ساعت موظفی پرسنل در ماه
+   /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+   
    #region valueObjects
 
    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
@@ -316,6 +327,16 @@ public class Checkout : EntityBase
     {
         CheckoutRollCall = checkoutRollCall;
     }
+
+    public void SetAmountConflict(bool hasAmountConflict)
+    {
+	    HasAmountConflict = hasAmountConflict;
+    }
+
+    public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
+    {
+        EmployeeMandatoryHours = employeeMandatoryHours;
+    }
 }
 
 public class CheckoutRollCall

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -78,4 +78,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         long workshopId, DateTime start, DateTime end);
 
     #endregion
+
+    Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
 }

Company.Domain/ClassifiedSalaryAgg/ClassifiedSalary.cs

@@ -10,6 +10,7 @@ namespace Company.Domain.ClassifiedSalaryAgg
 {
     public class ClassifiedSalary : EntityBase
     {
+        //test//test
         public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
         {
             Group1 = group1;

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/ContractAgg/Contract.cs

@@ -17,7 +17,7 @@ public class Contract : EntityBase
     public Contract(long personnelCode, long employeeId, long employerId, 
         long workshopIds, long yearlySalaryId, DateTime contarctStart, DateTime contractEnd, string dayliWage,
         string archiveCode, DateTime getWorkDate, DateTime setContractDate, string jobType,
-        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod)
+        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod, double dailySalaryAffected, double baseYearAffected, double dailySalaryUnAffected, double baseYearUnAffected, bool hasManualDailyWage, string dailyWageType)
     {
         PersonnelCode = personnelCode;
         EmployeeId = employeeId;
@@ -45,6 +45,19 @@ public class Contract : EntityBase
         WorkingHoursWeekly = workingHoursWeekly;
         FamilyAllowance = familyAllowance;
         ContractPeriod = contractPeriod;
+        
+        //پراپرتی های جدید برای دستمزد دلخواه
+        #region NewManualDailyWage
+        DailySalaryAffected = dailySalaryAffected;
+        BaseYearAffected = baseYearAffected;
+        DailySalaryUnAffected = dailySalaryUnAffected;
+        BaseYearUnAffected = baseYearUnAffected;
+        HasManualDailyWage = hasManualDailyWage;
+        DailyWageType = dailyWageType;
+
+        #endregion
+
+
         Signature = "0";
 
 
@@ -65,7 +78,42 @@ public class Contract : EntityBase
     public DateTime SetContractDate { get; private set; }
     public string JobType { get; private set; }
     public string ContractType { get; private set; }
+    /// <summary>
+    /// مزد تجمیعی یعد از تاثیر ساعت کار
+    /// </summary>
     public string DayliWage { get; private set; }
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا دستمزد روزانه دستی وارد شده است؟
+    /// </summary>
+    public bool HasManualDailyWage { get; set; }
+
+    /// <summary>
+    /// نوع دستمزد انتخاب شده
+    /// </summary>
+    public string DailyWageType { get; set; }
+
     public string IsActiveString { get; private set; }
     public string ArchiveCode { get; private set; }
     public string WorkshopAddress1 { get; private set; }
@@ -89,6 +137,7 @@ public class Contract : EntityBase
 
     public Contract()
     {
+     
         WorkingHoursList = new List<WorkingHours>();
     }
     public void Edit(long pesrsonnelCode, long employeeId, long employerId, long workshopId, long yearlySalaryId,

Company.Domain/ContractAgg/IContractRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Contract;
@@ -9,6 +10,24 @@ namespace Company.Domain.ContractAgg;
 
 public interface IContractRepository : IRepository<long, Contract>
 {
+    /// <summary>
+    /// دریافت مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="yearlySalaryId"></param>
+    /// <returns></returns>
+    Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart);
+
+    /// <summary>
+    /// دریافت لیست مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <returns></returns>
+    Task<UpgradeManualDailyWageModel> GetManualDailWageList(long workshopId, long employeeId,
+        DateTime contractStart);
     EditContract GetDetails(long id);
     EditContract GetContractByStartEnd(DateTime start, DateTime end, long workshopId, long employeeId);
 

Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs

@@ -8,10 +8,12 @@ namespace Company.Domain.ContractingPartyBankAccountsAgg;
 
 public interface IContractingPartyBankAccountsRepository:IRepository<long,ContractingPartyBankAccount>
 {
-    Task<OperationResult<List<GetContractingPartyBankAccountViewModel>>> GetList(ContractingPartyBankAccountSearchModel searchModel);
-    Task<OperationResult<List<string>>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
-    Task<OperationResult<List<string>>> IBanSelectList(string search, string selected);
+    Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
+    Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
+    Task<List<string>> IBanSelectList(string search, string selected);
 
-    Task<OperationResult<List<string>>> CardNumberSelectList(string search, string selected);
-    Task<OperationResult<List<string>>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> CardNumberSelectList(string search, string selected);
+    Task<List<string>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
+    Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
 }

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -374,6 +374,13 @@ public class CustomizeCheckout : EntityBase
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
 
+    /// <summary>
+    /// آیا مغایرت مبلغ دارد
+    /// </summary>
+    public bool HasAmountConflict { get; private set; }
 
-
+    public void SetHasAmountConflict(bool hasConflict)
+    {
+        HasAmountConflict = hasConflict;
+    }
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -377,4 +377,16 @@ public class CustomizeCheckoutTemp : EntityBase
     {
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
+	
+    /// <summary>
+    /// آیا مغایرت مبلغ دارد
+    /// </summary>
+    public bool HasAmountConflict { get; private set; }
+
+    
+
+    public void SetHasAmountConflict(bool hasConflict)
+    {
+        HasAmountConflict = hasConflict;
+    }
 }

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

@@ -13,12 +13,15 @@ namespace Company.Domain.FinancialStatmentAgg;
 public interface IFinancialStatmentRepository : IRepository<long, FinancialStatment>
 {
 
+    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
     Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(long accountId,
-        ClientFinancialStatementSearchModel searchModel);
+        FinancialStatementSearchModel searchModel);
 
     Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
     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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
@@ -43,4 +44,35 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     /// <param name="endOfMonth"></param>
     /// <param name="description"></param>
     void RollcallServiceCreateTransaction();
+
+    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);
+
+    #region Extension
+
+    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);
+
+        #endregion
+
+    #region Upgrade(Amendment)
+
+        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
+        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
+
+        Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+        Task RemoveAmendmentWorkshops(Guid workshopTempId);
+        #endregion
+
+    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -1,17 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+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, long lawId)
     {
         ContractNo = contractNo;
         RepresentativeId = representativeId;
@@ -43,67 +50,121 @@ public class InstitutionContract : EntityBase
         TypeOfContract = typeOfcontract;
         HasValueAddedTax = hasValueAddedTax;
         ValueAddedTax = valueAddedTax;
+        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
+        ContactInfoList = [];
+        Installments = [];
+        WorkshopGroup = new InstitutionContractWorkshopGroup(id, workshopDetails);
+        PublicId = Guid.NewGuid();
+        LawId = lawId;
     }
 
+    public long LawId { get; private set; }
+
     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 +185,11 @@ public class InstitutionContract : EntityBase
 
     public void Active()
     {
-
         this.IsActiveString = "true";
     }
 
     public void DeActive()
     {
-
         this.IsActiveString = "false";
     }
 
@@ -148,4 +207,172 @@ 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
+{
+    private InstitutionContractAmendment(){}
+    public InstitutionContractAmendment(long institutionContractId,
+        List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
+        InstitutionContractAmendmentChange amendmentChange, long lawId)
+    {
+        InstitutionContractId = institutionContractId;
+        Installments = installments is { Count: > 0} ? installments : [];
+        Amount = amount;
+        HasInstallment = hasInstallment;
+        AmendmentChanges = [amendmentChange];
+        LawId = lawId;
+    }
+
+    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 long LawId { get; set; }
+
+    public void SetVerifyCode(string code)
+    {
+        VerifyCode = code;
+        VerificationCreation = DateTime.Now;
+    }
+}
+
+public class InstitutionContractAmendmentChange : EntityBase
+{
+    private InstitutionContractAmendmentChange() { }
+    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
+        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
+        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
+        bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
+        long? workshopDetailsId)
+    {
+        InstitutionContractAmendmentId = institutionContractAmendmentId;
+        InstitutionContractAmendment = institutionContractAmendment;
+        ChangeType = changeType;
+        ChangeDateGr = changeDateGr;
+        HasRollCallPlan = hasRollCallPlan;
+        HasCustomizeCheckoutPlan = hasCustomizeCheckoutPlan;
+        HasContractPlan = hasContractPlan;
+        HasContractPlanInPerson = hasContractPlanInPerson;
+        HasInsurancePlan = hasInsurancePlan;
+        HasInsurancePlanInPerson = hasInsurancePlanInPerson;
+        PersonnelCount = personnelCount;
+        WorkshopDetailsId = workshopDetailsId;
+    }
+
+    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/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractAmendmentTempAgg;
+
+public class InstitutionContractAmendmentTemp
+{
+    public InstitutionContractAmendmentTemp(List<InstitutionContractAmendmentTempPrevWorkshop> prevWorkshops,
+        long institutionContractId)
+    {
+        Id = Guid.NewGuid();
+        PrevWorkshops = prevWorkshops;
+        NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
+            x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
+            x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
+            x.CurrentWorkshopId, 0)).ToList();
+        InstitutionContractId = institutionContractId;
+    }
+
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; private set; }
+    public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
+    public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
+    public long InstitutionContractId { get; private set; }
+}
+
+public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
+{
+    public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
+        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
+        workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
+        rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
+    {
+        PriceDifference = priceDifference;
+    }
+
+    /// <summary>
+    /// مبلغ اختلاف کارگاه جدید با کارگاه قبلی(مبلغ اصلی ارتقاء)
+    /// </summary>
+    public double PriceDifference { get; private set; }
+    
+    
+    public void Edit(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson,
+        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
+        double price,double priceDifference)
+    {
+        base.Edit(workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance,
+            insuranceInPerson, rollCall, customizeCheckout, price);
+        PriceDifference = priceDifference;
+    }
+}
+
+public class InstitutionContractAmendmentTempPrevWorkshop
+{
+    public InstitutionContractAmendmentTempPrevWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
+        bool contractAndCheckoutInPerson,
+        bool insurance, bool insuranceInPerson,
+        bool rollCall, bool rollCallInPerson, bool customizeCheckout, double price, long workshopId,
+        long currentWorkshopId)
+    {
+        Id = Guid.NewGuid();
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractAndCheckout = contractAndCheckout;
+        Insurance = insurance;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
+        InsuranceInPerson = insuranceInPerson;
+        RollCallInPerson = rollCallInPerson;
+        Price = price;
+        WorkshopId = workshopId;
+        CurrentWorkshopId = currentWorkshopId;
+    }
+
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    public long CurrentWorkshopId { get; private set; }
+    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; private set; }
+
+    #endregion
+
+    public void Edit(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson,
+        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
+        double price)
+    {
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractAndCheckout = contractAndCheckout;
+        Insurance = insurance;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
+        InsuranceInPerson = insuranceInPerson;
+        Price = price;
+    }
+}

Company.Domain/InstitutionContractExtensionTempAgg/IInstitutionContractExtenstionTempRepository.cs

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

Company.Domain/InstitutionContractExtensionTempAgg/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.InstitutionContractExtensionTempAgg;
+
+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 InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
+    public InstitutionContractPaymentOneTimeViewModel 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,InstitutionContractPaymentMonthlyViewModel monthly,
+        InstitutionContractPaymentOneTimeViewModel 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,116 @@
+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; }
+        public int Version { 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, int version = 1)
+        {
+            Title = title;
+            IsActive = true; // آخرین نسخه فعال است
+            Items = new List<LawItem>();
+            Type = lawType;
+            Notifications = notifications ?? new List<string>();
+            HeadTitle = headTitle;
+            Version = version;
+        }
+
+        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 void SetAsLatestVersion()
+        {
+            IsActive = true;
+        }
+
+        public void SetAsOldVersion()
+        {
+            IsActive = false;
+        }
+
+        public Law CreateNewVersion(string title, List<string> notifications, string headTitle, List<LawItem> items)
+        {
+            var newVersion = new Law(
+                title,
+                this.Type,
+                notifications,
+                headTitle,
+                this.Version + 1
+            );
+            
+            newVersion.SetItem(items);
+            newVersion.SetAsLatestVersion();
+            
+            return newVersion;
+        }
+    }
+
+    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/PaymentInstrumentAgg/IPaymentInstrumentGroupRepository.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public interface IPaymentInstrumentGroupRepository:IRepository<long,PaymentInstrumentGroup>
+{
+    void Remove(PaymentInstrumentGroup paymentInstrumentGroup);
+    Task<List<PaymentInstrumentGroupsViewModel>> GetList();
+}

Company.Domain/PaymentInstrumentAgg/IPaymentInstrumentRepository.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public interface IPaymentInstrumentRepository:IRepository<long,PaymentInstrument>
+{
+    Task<GetPaymentInstrumentListViewModel> GetList(PaymentInstrumentSearchModel searchModel);
+    Task<List<PosTerminalSelectListViewModel>> GetPosTerminalSelectList(string search);
+    Task<List<string>> PosTerminalIdSelectList(string search, string selected);
+    Task<List<string>> IbanSelectList(string search, string selected);
+    Task<List<string>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> CardNumberSelectList(string search, string selected);
+    Task<List<string>> AccountHolderNameSelectList(string search, string selected);
+   
+}

Company.Domain/PaymentInstrumentAgg/PaymentInstrument.cs

@@ -0,0 +1,52 @@
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public class PaymentInstrument:EntityBase
+{
+    private  PaymentInstrument(string cardNumber, string accountHolderName, string accountNumber,string iBan,bool isAuth,long paymentInstrumentGroupId)
+    {
+        CardNumber = cardNumber;
+        AccountHolderName = accountHolderName;
+        AccountNumber = accountNumber;
+        IBan = iBan;
+        IsAuth = isAuth;
+        PaymentInstrumentGroupId = paymentInstrumentGroupId;
+        Type = PaymentInstrumentType.BankAccount;
+    }
+
+    private PaymentInstrument(string posTerminalId , string description,long paymentInstrumentGroupId)
+    {
+        PosTerminalId = posTerminalId;
+        Description = description;
+        PaymentInstrumentGroupId = paymentInstrumentGroupId;
+        Type = PaymentInstrumentType.Pos;
+    }
+
+    public static PaymentInstrument CreatePosType(string posTerminalId, string description, long paymentInstrumentGroupId)
+    {
+        return new PaymentInstrument(posTerminalId, description, paymentInstrumentGroupId);
+    }
+
+    public static PaymentInstrument CreateBankAccount(string cardNumber, string accountHolderName, string accountNumber,
+        string iBan, bool isAuth, long paymentInstrumentGroupId)
+    {
+        return new PaymentInstrument(cardNumber, accountHolderName, accountNumber, iBan, isAuth, paymentInstrumentGroupId);
+    }
+
+    public string CardNumber { get; private set; }
+    public string AccountHolderName { get; private set; }
+    public string AccountNumber { get; private set; }
+    public string IBan { get; private set; }
+
+    public string PosTerminalId { get; private set; }
+    public string Description { get; set; }
+
+    public PaymentInstrumentType Type { get; private set; }
+    
+    public bool IsAuth { get; private set; }
+    
+    public long PaymentInstrumentGroupId { get; private set; }
+    public PaymentInstrumentGroup PaymentInstrumentGroup { get; private set; }
+}

Company.Domain/PaymentInstrumentAgg/PaymentInstrumentGroup.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public class PaymentInstrumentGroup:EntityBase
+{
+    public PaymentInstrumentGroup(string name)
+    {
+        Name = name;
+        IsActive = IsActive.True;
+    }
+
+    public string Name { get; private set; }
+    public IsActive IsActive { get; private set; }
+    public List<PaymentInstrument> PaymentInstruments { get; set; }
+
+    public void Edit(string name)
+    {
+        Name = name;
+    }
+
+    public void DeActive()
+    {
+        IsActive = IsActive.False;
+    }
+}

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -15,7 +15,7 @@ namespace Company.Domain.RollCallAgg;
 
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute, double dailyWageUnAffected, bool totalLeaveCompute);
 
     /// <summary>
     /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.SalaryAid;
@@ -21,4 +22,5 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
 
 	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
 	#endregion
+
 }

Company.Domain/SmsResultAgg/SmsResult.cs

@@ -5,7 +5,8 @@ namespace Company.Domain.SmsResultAgg;
 
 public class SmsResult: EntityBase
 {
-    public SmsResult(int messageId, string status,string typeOfSms, string contractingPartyName,string mobile, long contractingPatyId, long institutionContractId)
+    public SmsResult(int messageId, string status,string typeOfSms, 
+        string contractingPartyName,string mobile, long contractingPatyId, long institutionContractId)
     {
         MessageId = messageId;
         Status = status;

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/IWorkshopRepository.cs

@@ -70,6 +70,7 @@ public interface IWorkshopRepository : IRepository<long, Workshop>
     Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
     Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
     Task<List<WorkshopSelectListViewModel>> GetSelectList(string search, long id);
+    int GetLastArchiveCode();
 
 
     #endregion

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
 }

Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs

@@ -6,6 +6,7 @@ using CompanyManagment.App.Contracts.YearlySalary;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Holiday;
+using CompanyManagment.App.Contracts.Contract;
 
 namespace Company.Domain.YearlySalaryAgg;
 
@@ -17,10 +18,50 @@ public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
     void TestDayliFeeCompute();
     List<string> GetYears();
     List<YearlySalaryViewModel> GetYearlySalary();
+
+    /// <summary>
+    /// دریافت مزد روزانه فیش حقوقی
+    /// </summary>
+    /// <param name="contract"></param>
+    /// <param name="checkoutStart"></param>
+    /// <param name="checkoutEnd"></param>
+    /// <returns></returns>
+    Task<double> GetCheckoutDailyWage(EditContract contract, DateTime checkoutStart, DateTime checkoutEnd);
+
+    /// <summary>
+    /// دریافت مزد روزانه بر اساس تاریخ شروع و پایان
+    /// </summary>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns></returns>
+    Task<(double dailyWage, long yearlySalaryId)> GetDailyWageByStartEnd(DateTime start, DateTime end);
+
     MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking,string shiftWork);
     double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM);
     double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM);
     double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM);
+
+    /// <summary>
+    /// متد ارتقاء مزد  دلخواه
+    /// </summary>
+    /// <param name="newContractStart"></param>
+    /// <param name="lastContractStart"></param>
+    /// <param name="lastContractManualDailyWage"></param>
+    /// <returns></returns>
+    Task<UpgradeManualDailyWageModel> UpgradeManualDailyWage(DateTime newContractStart, DateTime lastContractStart,
+        double lastContractManualDailyWage);
+
+    /// <summary>
+    /// متد محاسبه پایه سنوات و لیست پایه سنوات های پرسنل
+    /// </summary>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="workshopId"></param>
+    /// <param name="leftWorkList"></param>
+    /// <returns></returns>
+    Task<BaseYearDataViewModel> BaseYearCompute(DateTime contractStart, DateTime contractEnd, long employeeId,
+        long workshopId, List<LeftWorkViewModel> leftWorkList);
     DayliFeeViewModel DayliFeeComputing(DateTime startDateW,DateTime contractStart, DateTime endDateW, long employeeId, long workshopId,List<LeftWorkViewModel> leftWorkList);
     Task<DayliFeeViewModel> DayliFeeComputingAsync(DateTime startDateW, DateTime contractStart, DateTime endDateW, long employeeId, long workshopId, List<LeftWorkViewModel> leftWorkList);
     string ConsumableItems(DateTime endDateW);

Company.Domain/empolyerAgg/Employer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Security.AccessControl;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractAgg;
@@ -66,6 +68,11 @@ public class Employer : EntityBase
     public string SanaPassword { get; private set; }
 
     public string EmployerNo { get; set; }
+    public bool IsAuth { get; set; }
+    public string IdNumberSerial { get; set; }
+
+    public string IdNumberSeri { get; set; }
+
     public PersonalContractingParty ContractingParty { get; set; }
 
     //public List<Workshop> Workshops { get; private set; }
@@ -227,4 +234,35 @@ public class Employer : EntityBase
         this.IsActive = false;
         this.Address = "false";
     }
+    
+    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;
+        this.FatherName = fatherName;
+        this.IdNumberSeri = idNumberSeri;
+        this.IdNumberSerial = idNumberSerial;
+        this.DateOfBirth = !string.IsNullOrWhiteSpace(dateOfBirth) ? dateOfBirth.ToGeorgianDateTime() : new();
+        this.IdNumber = idNumber;
+        this.Gender = gender == _0_Framework.Application.Gender.Male? "مرد" : "زن";
+        this.IsAuth = true;
+        Phone = phone;
+    }
+
+
+    public void LegalAuthentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri,
+        string idNumberSerial, string dateOfBirth, Gender gender,string phone)
+    {
+        FName = fName;
+        EmployerLName = lName;
+        this.FatherName = fatherName;
+        this.IdNumberSeri = idNumberSeri;
+        this.IdNumberSerial = idNumberSerial;
+        this.DateOfBirth = !string.IsNullOrWhiteSpace(dateOfBirth) ? dateOfBirth.ToGeorgianDateTime() : new();
+        this.IdNumber = idNumber;
+        this.Gender =gender == _0_Framework.Application.Gender.Male? "مرد" : "زن";
+        this.IsAuth = true;
+        Phone = phone;
+    }
 }

Company.Domain/empolyerAgg/IEmployerRepository.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Employer;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.empolyerAgg;
 
@@ -34,7 +36,7 @@ public interface IEmployerRepository : IRepository<long, Employer>
 
     List<EmployerViewModel> GetEmployersHasWorkshop();
 
-    Task<List<EmployerSelectListViewModel>> GetSelectList(string search,long id);
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search, long id, LegalType? legalType);
 
 
     #endregion
@@ -68,5 +70,5 @@ public interface IEmployerRepository : IRepository<long, Employer>
 	#endregion
 
 
-
+	Task<ActionResult<EditEmployerWorkflowRegistration>> GetWorkflowRegistrationForEdit(long employerId, long institutionWorkshopDetailsId);
 }

CompanyManagement.Infrastructure.Excel/RollCall/CaseHistoryRollCallExcelViewModel.cs

@@ -12,9 +12,7 @@ public class CaseHistoryRollCallExcelForEmployeeViewModel
     public string EmployeeFullName { get; set; }
     public string TotalWorkingHoursFa { get; set; }
     public string TotalWorkingTimeSpan { get; set; }
-
-
-
+    
     public List<RollCallItemForEmployeeExcelViewModel> RollCalls { get; set; }
 }
 
@@ -40,7 +38,8 @@ public class RollCallItemForEmployeeExcelViewModel
     public bool HasLeave { get; set; }
 
     public string TotalWorkingHours { get; set; }
-
+    public string EnterTimeDifferences { get; set; }
+    public string ExitTimeDifferences { get; set; }
 }
 
 public class RollCallTimeExcelViewModel

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -113,11 +113,12 @@ public class RollCallExcelGenerator : ExcelGenerator
             worksheet.Cells[i + row + 1, 1].Value = i + 1;
             worksheet.Cells[i + row + 1, 2].Value = rollCall.DayOfWeekFa;
             worksheet.Cells[i + row + 1, 3].Value = rollCall.DateFa;
-            worksheet.Cells[i + row + 1, 4].Value = "-";
+            worksheet.Cells[i + row + 1, 4].Value = rollCall.EnterTimeDifferences;
             worksheet.Cells[i + row + 1, 5].Value = rollCall.StartsItems;
             worksheet.Cells[i + row + 1, 6].Value = rollCall.EndsItems;
-            worksheet.Cells[i + row + 1, 7].Value = "-";
-            worksheet.Cells[i + row + 1, 8].Value = rollCall.TotalWorkingHours == string.Empty ? "ندارد" : rollCall.TotalWorkingHours;
+            worksheet.Cells[i + row + 1, 7].Value = rollCall.ExitTimeDifferences;
+            worksheet.Cells[i + row + 1, 8].Value = rollCall.TotalWorkingHours == string.Empty 
+                ? "ندارد" : rollCall.TotalWorkingHours;
 
             // Style data cells
             for (int j = 1; j <= 8; j++)
@@ -307,6 +308,49 @@ public class RollCallExcelGenerator : ExcelGenerator
         return package.GetAsByteArray();
     }
 
+    private string CalculateExitMinuteDifference(TimeSpan early, TimeSpan late)
+    {
+        if (early == TimeSpan.Zero && late == TimeSpan.Zero)
+        {
+            return "-";
+        }
+        else if (late != TimeSpan.Zero)
+        {
+            var minutes = late.TotalMinutes > 999 ? "999" : late.TotalMinutes.ToString();
+            return $"{minutes}+";
+        }
+        else if (early != TimeSpan.Zero)
+        {
+            var minutes = early.TotalMinutes > 999 ? "999" : early.TotalMinutes.ToString();
+            return $"{minutes}-";
+        }
+        else
+        {
+            return $"";
+        }
+    }
+
+    private string CalculateEntryMinuteDifference(TimeSpan early, TimeSpan late)
+    {
+        if (early == TimeSpan.Zero && late == TimeSpan.Zero)
+        {
+            return "-";
+        }
+        else if (late != TimeSpan.Zero)
+        {
+            var minutes = late.TotalMinutes > 999 ? "999" : late.TotalMinutes.ToString();
+            return $"{minutes}-";
+        }
+        else if (early != TimeSpan.Zero)
+        {
+            var minutes = early.TotalMinutes > 999 ? "999" : early.TotalMinutes.ToString();
+            return $"{minutes}+";
+        }
+        else
+        {
+            return $"";
+        }
+    }
 
 
 }

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.InstitutionContractExtensionTempAgg;
+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/AuthorizedBankDetails/AuthorizedBankDetailsSearchModel.cs

@@ -0,0 +1,12 @@
+namespace Company.Application.Contracts.AuthorizedBankDetails
+{
+    public class AuthorizedBankDetailsSearchModel
+    {
+        public string CardNumber { get; set; }
+        public string AccountNumber { get; set; }
+        public string IBan { get; set; }
+        public string BankName { get; set; }
+        public string NationalIdentifier { get; set; }
+    }
+}
+

CompanyManagment.App.Contracts/AuthorizedBankDetails/AuthorizedBankDetailsViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System;
+
+using System.Collections.Generic;
+namespace Company.Application.Contracts.AuthorizedBankDetails;
+
+public class AuthorizedBankDetailsViewModel
+{
+    public string NationalIdentifier { get; set; }
+        
+    public long Id { get; set; }
+    public string CustomerType { get; set; }
+    public string CardNumber { get; set; }
+    public string AccountNumber { get; set; }
+    public string IBan { get; set; }
+    public string BankName { get; set; }
+    public List<AuthorizedBankDetailsOwnerViewModel> Owners { get; set; }
+}

CompanyManagment.App.Contracts/AuthorizedBankDetails/CreateAuthorizedBankDetails.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Company.Application.Contracts.AuthorizedBankDetails
+{
+    public class CreateAuthorizedBankDetails
+    {
+        public string CardNumber { get; set; }
+
+        public string AccountNumber { get; set; }
+
+        public string IBan { get; set; }
+
+        public string BankName { get; set; }
+
+        public List<CreateAuthorizedBankDetailsOwner> OwnersList { get; set; }
+    }
+
+    public class CreateAuthorizedBankDetailsOwner
+    {
+        public string FName { get; set; }
+
+        public string LName { get; set; }
+
+        public string NationalIdentifier { get; set; }
+
+        public string CustomerType { get; set; }
+    }
+}

CompanyManagment.App.Contracts/AuthorizedBankDetails/EditAuthorizedBankDetails.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Company.Application.Contracts.AuthorizedBankDetails
+{
+    public class EditAuthorizedBankDetails
+    {
+        public long Id { get; set; }
+        
+        public string CardNumber { get; set; }
+
+        public string AccountNumber { get; set; }
+
+        public string IBan { get; set; }
+
+        public string BankName { get; set; }
+
+        public List<AuthorizedBankDetailsOwnerViewModel> OwnersList { get; set; }
+    }
+
+    public class AuthorizedBankDetailsOwnerViewModel
+    {
+        public string FName { get; set; }
+        public string LName { get; set; }
+        public string NationalIdentifier { get; set; }
+        public string CustomerType { get; set; }
+    }
+}

CompanyManagment.App.Contracts/AuthorizedBankDetails/IAuthorizedBankDetailsApplication.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using _0_Framework.Application;
+using Company.Application.Contracts.AuthorizedBankDetails;
+
+namespace Company.Application.Contracts.AuthorizedBankDetails
+{
+    public interface IAuthorizedBankDetailsApplication
+    {
+        OperationResult Create(CreateAuthorizedBankDetails command);
+        EditAuthorizedBankDetails GetDetails(long id);
+        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
+        AuthorizedBankDetailsViewModel GetByIban(string iban);
+    }
+}

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/Checkout/CheckoutViewModel.cs

@@ -141,7 +141,9 @@ public class CheckoutViewModel
     public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
     public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
     public CheckoutRollCallViewModel CheckoutRollCall { get; set; }
-
+    public bool HasAmountConflict { get; set; }
+    public string EmployeeMandatoryHoursStr { get; set; }
+    public TimeSpan EmployeeMandatoryHoursTimeSpan { get; set; }
 }
 
 public class CheckoutRollCallViewModel

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -135,6 +135,11 @@ public class CreateCheckout
     /// </summary>
     public string TotalDayOfBunosesCompute { get; set; }
 
+    /// <summary>
+    /// ساعت موظفی پرسنل برای این ماه
+    /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+
     public bool HolidayWorking { get; set; }
 
     public string ShiftWork { get; set; }
@@ -155,4 +160,37 @@ public class CreateCheckout
     public TimeSpan TotalPaidLeave { get; set; }
     public TimeSpan TotalSickLeave { get; set; }
 
+    public bool HasLeft { get; set; }
+
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه  دریافت شده از سمت فرانت
+    /// </summary>
+    public string DailySalaryUnAffectedStr { get; set; }
+
+    /// <summary>
+    /// مزد سالانه نرمال دریافت از سمت فرانت
+    /// </summary>
+    public string NormalDailyWage { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
 }

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -56,5 +56,28 @@ public class ComputingViewModel
     public TimeSpan TotalPaidLeave { get; set; }
     public TimeSpan TotalSickLeave { get; set; }
 
+    /// <summary>
+    /// ساعت موظفی پرسنل برای این ماه
+    /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
     //public List<string> holidays;
 }

CompanyManagment.App.Contracts/Contract/ContractDailyWageAndBaseYearReport.cs

@@ -0,0 +1,70 @@
+using CompanyManagment.App.Contracts.YearlySalary;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.Contract;
+/// <summary>
+/// نمایش نحوه محاسبه پایه سنوات و دستمزد روزانه
+/// </summary>
+public class ContractDailyWageAndBaseYearReport
+{
+    /// <summary>
+    /// لیست داده های محاسبه پایه سنوات
+    /// </summary>
+    public BaseYearDataViewModel BaseYearDataViewModel { get; set; }
+
+    /// <summary>
+    /// پایه سنوات متاثر از ساعت کار
+    /// </summary>
+    public string BaseYearAffected { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه متاثر از ساعت کار
+    /// </summary>
+    public string DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه بدون تاثیر ساعت کار
+    /// </summary>
+    public string DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه تجمیعی
+    /// </summary>
+    public string DailyWage { get; set; }
+
+    /// <summary>
+    /// تاریخ  قراداد
+    /// </summary>
+    public string ContractDate { get; set; }
+
+
+    /// <summary>
+    /// نوع دستمزد انتخاب شده
+    /// </summary>
+    public string DailyWageType { get; set; }
+
+    /// <summary>
+    /// لیست ارتقاء
+    /// </summary>
+    public List<UpgradeManualDailyWageList> UpgradeManualDailyWageLists { get; set; }
+
+    /// <summary>
+    /// نام پرسنل
+    /// </summary>
+    public string EmployeeName { get; set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; set; }
+
+    /// <summary>
+    /// آیا با متد جدید محاسبه شده
+    /// </summary>
+    public bool OldComputeMethod { get; set; }
+
+    /// <summary>
+    /// آیا محاسبات با مقادیر ذخیره شده مغایرت دارد
+    /// </summary>
+    public bool Contradiction { get; set; }
+}

CompanyManagment.App.Contracts/Contract/CreateContract.cs

@@ -140,7 +140,36 @@ public class CreateContract
     public string ConvertMonth { get; set; }
     public string FormStep { get; set; }
 
-      
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا دستمزد روزانه دستی وارد شده است؟
+    /// </summary>
+    public bool HasManualDailyWage { get; set; }
+
+    /// <summary>
+    /// نوع دستمزد انتخاب شده
+    /// </summary>
+    public string DailyWageType { get; set; }
     public List<ContractViweModel> Contracts { get; set; }
     public List<WorkshopViewModel> Workshops { get; set; }
     public List<EmployerViewModel> Employers { get; set; }

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

@@ -7,6 +7,14 @@ namespace CompanyManagment.App.Contracts.Contract;
 
 public interface IContractApplication
 {
+    /// <summary>
+    /// دریافت مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="yearlySalaryId"></param>
+    /// <returns></returns>
+    Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart);
     OperationResult Create(CreateContract command);
     OperationResult CreateNew(createContractModel command);
     OperationResult Edit(EditContract command);

CompanyManagment.App.Contracts/Contract/UpgradeManualDailyWageModel.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.Contract;
+
+/// <summary>
+/// ویو مدل رتقاء دستمزد روزانه و لیست ارتقاء
+/// </summary>
+public class UpgradeManualDailyWageModel
+{
+    /// <summary>
+    /// دستمزد روزانه
+    /// </summary>
+    public double DailyWage{ get; set; }
+
+
+    /// <summary>
+    /// لیست ارتقاء
+    /// </summary>
+    public List<UpgradeManualDailyWageList> UpgradeManualDailyWageLists { get; set; }
+}
+
+/// <summary>
+/// لیست ارتقاء
+/// </summary>
+public class UpgradeManualDailyWageList
+{
+    /// <summary>
+    /// تاریخ شروع و پایان بازه ارتقاء
+    /// </summary>
+    public string StartEndDate { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه
+    /// </summary>
+    public string DailyWage { get; set; }
+}

CompanyManagment.App.Contracts/ContractingPartyBankAccounts/GetContractingPartyBankAccountViewModel.cs

@@ -6,6 +6,16 @@ namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
 /// لیست اطلاعات بانکی طرف حساب
 /// </summary>
 public class GetContractingPartyBankAccountViewModel
+{
+    /// <summary>
+    /// تعداد
+    /// </summary>
+    public int Count { get; set; }
+    public List<ContractingPartyBankAccountsGroupedViewModel> List { get; set; }
+
+}
+
+public class ContractingPartyBankAccountsGroupedViewModel
 {
     /// <summary>
     /// لیست حساب های بانکی
@@ -27,6 +37,7 @@ public class GetContractingPartyBankAccountViewModel
     /// </summary>
     public string WorkshopName { get; set; }
 }
+
 /// <summary>
 /// حساب بانکی طرف حساب 
 /// </summary>

CompanyManagment.App.Contracts/ContractingPartyBankAccounts/IContractingPartyBankAccountsApplication.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Security.AccessControl;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
 using System.Transactions;
 using _0_Framework.Application;
+using _0_Framework.Application.UID;
 using CompanyManagment.App.Contracts.OriginalTitle;
 
 namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
@@ -18,14 +20,14 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="command"></param>
     /// <returns></returns>
     Task<OperationResult> Create(CreateContractingPartyBankAccounts command);
+    Task<OperationResult> Create(List<CreateContractingPartyBankAccounts> commands);
 
     /// <summary>
     /// لیست اطلاعات طرف حساب بانکی
     /// </summary>
     /// <param name="searchModel"></param>
     /// <returns></returns>
-    Task<OperationResult<List<GetContractingPartyBankAccountViewModel>>> GetList(
-        ContractingPartyBankAccountSearchModel searchModel);
+    Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
 
     /// <summary>
     /// سلکت لیست جستجو برای نام طرف حساب / صاحب حساب
@@ -33,7 +35,7 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    Task<OperationResult<List<string>>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
+    Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
 
     /// <summary>
     /// سلکت لیست شماره کارت
@@ -41,7 +43,7 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    Task<OperationResult<List<string>>> CardNumberSelectList(string search, string selected);
+    Task<List<string>> CardNumberSelectList(string search, string selected);
 
     /// <summary>
     /// سلکت لیست شماره شبا
@@ -49,7 +51,7 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    Task<OperationResult<List<string>>> IBanSelectList(string search, string selected);
+    Task<List<string>> IBanSelectList(string search, string selected);
 
     /// <summary>
     /// سلکت لیست شماره حساب
@@ -57,6 +59,44 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    Task<OperationResult<List<string>>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> AccountNumberSelectList(string search, string selected);
+
+    /// <summary>
+    /// سلکت لیست نام صاحبان حساب
+    /// </summary>
+    /// <param name="search">نام جستجو</param>
+    /// <param name="selected">نام سلکت شده</param>
+    /// <returns></returns>
+    Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
+
+    /// <summary>
+    /// سلکت لیست نام طرف حساب‌ها
+    /// </summary>
+    /// <param name="search">نام جستجو</param>
+    /// <param name="selected">نام سلکت شده</param>
+    /// <returns></returns>
+    Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
+    
+    /// <summary>
+    /// احراز هویت اطلاعات بانکی طرف حساب
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<ContractingPartyBankInquiryResponse> InquiryContractingPartyBankDetails(InquiryContractingPartyBankDetailsRequest command);
+    
+}
+public class InquiryContractingPartyBankDetailsRequest
+{
+    public string CardNumber { get; set; }
+    public string AccountNumber { get; set; }
+    public string IBan { get; set; }
+    public UidBanks? UidBank { get; set; }
+}
+public class ContractingPartyBankInquiryResponse
+{
+    public string FullName { get; set; }
+    public string Iban { get; set; }
+    public string AccountNumber { get; set; }
+    public string CardNumber { get; set; }
 }
 

CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs

@@ -109,6 +109,8 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout
         public List<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
         public List<CustomizeSifts> RegularShift { get; set; }
 
+        public bool HasAmountConflict { get; set; }
+
 		//public bool HasLeft { get; set; }
 		//public string IsBlockCantracingParty { get; set; }
 		//public string IsActiveString { get; set; }

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -1,8 +1,12 @@
-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;
+using Microsoft.AspNetCore.Mvc;
 
 
 namespace CompanyManagment.App.Contracts.Employer;
@@ -43,8 +47,9 @@ public interface IEmployerApplication
     /// </summary>
     /// <param name="search"></param>
     /// <param name="id"></param>
+    /// <param name="legalType"></param>
     /// <returns></returns>
-    Task<List<EmployerSelectListViewModel>> GetSelectList(string search, long id);
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search, long id, LegalType? legalType = null);
 
     #endregion
     #region NewByHeydari
@@ -125,4 +130,293 @@ 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);
+    Task<ActionResult<EditEmployerWorkflowRegistration>> GetWorkflowRegistrationForEdit(long employerId, long institutionWorkshopDetailsId);
+}
+
+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 long EmployerId { get; set; }
+	/// <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; }
+
+	public string IdNumberSeri { get; set; }
+	public string IdNumberSerial { 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; }
+
+	public string IdNumberSeri { get; set; }
+	public string IdNumberSerial { get; set; }
+}
+
+/// <summary>
+/// کلاس ویرایش کارفرما در گردش کار - شامل اطلاعات کارفرمای حقیقی و حقوقی
+/// </summary>
+public class EditEmployerWorkflowRegistration : CreateEmployerWorkflowRegistration
+{
+    /// <summary>
+    /// شناسه کارفرما
+    /// </summary>
+    public long EmployerId { get; set; }
+}