has ticket access

Updated ILawApplication with new methods for activating and deactivating laws by type. Added UpsertLaw method for creating and updating laws. Modified LawViewModel and EditLaw to include LawType. Enhanced LawApplication methods to support new features and updated GetLawByType to return default laws when none exist. Introduced LawController with endpoints for law operations.

.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/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,7 +26,6 @@ public interface ISmsService
     #region Mahan
 
     Task<double> GetCreditAmount();
-    SmsResult TaskReminderSms(string number, string taskCount);
 
     #endregion
 

0_Framework/Application/Sms/SmsResult.cs

@@ -1,32 +0,0 @@
-namespace _0_Framework.Application.Sms;
-
-public class SmsResult
-{
-    public SmsResult()
-    {
-        IsSuccedded = false;
-    }
-
-    public bool IsSuccedded { get; set; }
-    public string Message { get; set; }
-    public byte StatusCode { get; set; }
-    public int MessageId { get; set; }
-
-    public SmsResult Succedded(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = true;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-
-    public SmsResult Failed(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = false;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-}

0_Framework/Application/Sms/SmsService.cs

@@ -332,34 +332,6 @@ public class SmsService : ISmsService
        
     }
 
-    public SmsResult TaskReminderSms(string number, string taskCount)
-    {
-        var tamplateId = 909433;
-        var result = new SmsResult();
-        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var sendResult = smsIr.VerifySendAsync(number, tamplateId,
-            new VerifySendParameter[]
-            {
-                new("TASKCOUNT", taskCount), 
-            });
-        Thread.Sleep(500);
-
-
-        if (sendResult.IsCompletedSuccessfully)
-        {
-            var status = sendResult.Result.Status;
-            var message = sendResult.Result.Message;
-            var messaeId = sendResult.Result.Data.MessageId;
-            return result.Succedded(status, message, messaeId);
-        }
-        else
-        {
-            var status = sendResult.Result.Status;
-            var message = sendResult.Result.Message;
-            var messaeId = sendResult.Result.Data.MessageId;
-            return result.Failed(status, message, messaeId);
-        }
-    }
 
     #endregion
 }

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/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);

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/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();
+    }
 }

BackgroundJobs/BackgroundJobs.Task/BackgroundJobs.Task.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\0_Framework\0_Framework.csproj" />
-      <ProjectReference Include="..\..\AccountManagement.Configuration\AccountManagement.Configuration.csproj" />
-      <ProjectReference Include="..\..\PersonalContractingParty.Config\PersonalContractingParty.Config.csproj" />
-      <ProjectReference Include="..\..\Query.Bootstrapper\Query.Bootstrapper.csproj" />
-      <ProjectReference Include="..\..\WorkFlow\Infrastructure\WorkFlow.Infrastructure.Config\WorkFlow.Infrastructure.Config.csproj" />
-    </ItemGroup>
-
-</Project>

BackgroundJobs/BackgroundJobs.Task/FileUploader.cs

@@ -1,32 +0,0 @@
-using _0_Framework.Application;
-
-namespace BackgroundJobs.Task
-{
-    public class FileUploader : IFileUploader
-    {
-        private readonly IWebHostEnvironment _webHostEnvironment;
-
-        public FileUploader(IWebHostEnvironment webHostEnvironment)
-        {
-            _webHostEnvironment = webHostEnvironment;
-        }
-    
-        public string Upload(IFormFile file, string path)
-        {
-            if (file == null) return "";
-
-            var directoryPath = $"{_webHostEnvironment.WebRootPath}\\ProductPictures\\{path}";
-
-            if (!Directory.Exists(directoryPath))
-                Directory.CreateDirectory(directoryPath);
-
-            var fileName = $"{DateTime.Now.ToFileName()}-{file.FileName}";
-            var filePath = $"{directoryPath}\\{fileName}";
-            var output = System.IO.File.Create(filePath);
-            file.CopyTo(output);
-            return $"{path}/{fileName}";
-        }
-
-      
-    }
-}

BackgroundJobs/BackgroundJobs.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,62 +0,0 @@
-using Hangfire;
-
-namespace BackgroundJobs.Task.Jobs;
-
-public class JobSchedulerRegistrator
-{
-    private readonly IBackgroundJobClient _backgroundJobClient;
-    private readonly SmsReminder _smsReminder;
-    private static DateTime? _lastRunDateMorning;
-    private static DateTime? _lastRunDateEvening;
-
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient)
-    {
-        _smsReminder = smsReminder;
-        _backgroundJobClient = backgroundJobClient;
-    }
-
-    public void Register()
-    {
-        RecurringJob.AddOrUpdate(
-            "Task.SmsReminderChecker",
-            () => SmsReminderCheckAndSchedule(),
-            "*/5 * * * *"  // هر 5 دقیقه یکبار چک کن
-        );
-    }
-
-    public void SmsReminderCheckAndSchedule()
-    {
-        var now = DateTime.Now;
-
-        var startMorning = new TimeSpan(9, 0, 0);
-        var endMorning   = new TimeSpan(9, 40, 0);
-
-        var startEvening = new TimeSpan(15, 30, 0);
-        var endEvening   = new TimeSpan(15, 40, 0);
-
-        // صبح
-        if (now.DayOfWeek != DayOfWeek.Friday &&
-            now.TimeOfDay >= startMorning &&
-            now.TimeOfDay < endMorning)
-        {
-            if (_lastRunDateMorning?.Date != now.Date)
-            {
-                _backgroundJobClient.Enqueue(() => _smsReminder.Execute());
-                _lastRunDateMorning = now;
-            }
-        }
-
-        // عصر - پنجشنبه و جمعه تعطیل است
-        if (now.DayOfWeek != DayOfWeek.Friday &&
-            now.DayOfWeek != DayOfWeek.Thursday &&
-            now.TimeOfDay >= startEvening &&
-            now.TimeOfDay < endEvening)
-        {
-            if (_lastRunDateEvening?.Date != now.Date)
-            {
-                _backgroundJobClient.Enqueue(() => _smsReminder.Execute());
-                _lastRunDateEvening = now;
-            }
-        }
-    }
-}

BackgroundJobs/BackgroundJobs.Task/Jobs/SmsReminder.cs

@@ -1,116 +0,0 @@
-using _0_Framework.Application.Sms;
-using AccountManagement.Application.Contracts.Account;
-using AccountMangement.Infrastructure.EFCore;
-using Company.Domain.SmsResultAgg;
-using Microsoft.EntityFrameworkCore;
-using SmsResult = Company.Domain.SmsResultAgg.SmsResult;
-
-namespace BackgroundJobs.Task.Jobs;
-public class SmsReminder
-{
-    private readonly AccountContext _accountContext;
-    private readonly ISmsService _smsService;
-    private readonly ISmsResultRepository _smsResultRepository;
-
-    public SmsReminder(ISmsService smsService, AccountContext accountContext, ISmsResultRepository smsResultRepository)
-    {
-        _smsService = smsService;
-        _accountContext = accountContext;
-        _smsResultRepository = smsResultRepository;
-    }
-
-    public void Execute()
-    {
-        //var accounts = _accountContext.Accounts.Where(x => x.PositionId > 0 && x.IsActiveString == "true").Select(x => new AccountViewModel() { Id = x.id, Mobile = x.Mobile, Fullname = x.Fullname }).ToList();
-        //Thread.Sleep(300);
-         //var accounts = new List<AccountViewModel>() { new AccountViewModel() { Mobile = "09114221321", Id = 2 } };
-        var accounts= _accountContext.Accounts.Where(x => x.Username.ToLower()=="mahan").Select(x => new AccountViewModel() { Id = x.id, Mobile = x.Mobile, Fullname = x.Fullname }).ToList();
-        var smsVM = accounts.Select(x => new AccountSmsTaskViewModel()
-        {
-            Mobile = x.Mobile,
-            AccountId = x.Id,
-            FullName = x.Fullname,
-            TaskCount = GetLateTasksCount(x.Id)
-        }).Where(x => x.TaskCount > 0 && !string.IsNullOrEmpty(x.Mobile) && x.Mobile.Length == 11).ToList();
-        Thread.Sleep(300);
-
-
-        foreach (var viewmodel in smsVM)
-        {
-            var smsResult = _smsService.TaskReminderSms(viewmodel.Mobile, $"{viewmodel.TaskCount}");
-            Thread.Sleep(1000);
-            var createSmsResult = new SmsResult(smsResult.MessageId, smsResult.Message, "یادآور وظایف",
-                viewmodel.FullName, viewmodel.Mobile, viewmodel.AccountId, viewmodel.AccountId);
-            _smsResultRepository.Create(createSmsResult);
-            _smsResultRepository.SaveChanges();
-            Thread.Sleep(1000);
-        }
-    }
-     private int GetLateTasksCount(long accountId)
-    {
-        var positionValue = _accountContext.Accounts
-            .Where(x => x.id == accountId)
-            .Include(p => p.Position)
-            .Select(x => x.Position.PositionValue)
-            .FirstOrDefault();
-
-        if (positionValue == 0)
-            return 0;
-
-
-        DateTime now = DateTime.Now;
-        int overdueTasksCount;
-
-        if (positionValue == 1)
-        {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == accountId &&
-                    x.AssignerId == accountId && x.Task.Assigns.Count == 1 &&
-                    !x.IsCancel && !x.IsCanceledRequest &&
-                    !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date && x.Task.IsActiveString == "true")
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-
-            //overdueTasksCount = _accountContext.Tasks.Include(x =>
-            //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
-            //						  !x.Assigns.Any(a => a.IsDone) && !x.Assigns.Any(a => a.IsDoneRequest) &&
-            //						  !x.Assigns.Any(a => a.TimeRequest)
-            //						  && x.Assigns.Any(a => a.AssignedId == accountId && a.AssignerId == accountId) &&
-            //						  (x.Assigns.First(a => a.AssignedId == accountId && a.AssignerId == accountId)
-            //							  .EndTaskDate.Date <= DateTime.Now.Date) && x.Assigns.Count == 1);
-        }
-        else
-        {
-
-            overdueTasksCount = _accountContext.Assigns
-                .Include(x => x.Task)
-                .Where(x => x.AssignedId == accountId &&
-                            !x.IsCancel && !x.IsCanceledRequest &&
-                            !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date && x.Task.IsActiveString == "true")
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-        }
-
-
-        //overdueTasksCount = _accountContext.Tasks.Include(x =>
-        //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
-        //	                      !x.Assigns.Any(a => a.IsDone) && !x.Assigns.Any(a => a.IsDoneRequest) &&
-        //	                      !x.Assigns.Any(a => a.TimeRequest)
-        //	                      && x.Assigns.Any(a => a.AssignedId == accountId) &&
-        //	                      (x.Assigns.First(a => a.AssignedId == accountId).EndTaskDate.Date <= DateTime.Now.Date));
-
-
-        var overdueRequestsCount = _accountContext.Assigns.Include(x => x.Task)
-            .Where(x => (x.IsCanceledRequest
-                         || x.IsDoneRequest || x.TimeRequest) && !x.IsCancel && !x.IsDone &&
-                        x.Task.IsActiveString == "true" &&
-                        x.Task.SenderId == accountId).GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-
-        return overdueTasksCount + overdueRequestsCount;
-    }
-    
-}
-public class AccountSmsTaskViewModel
-{
-    public int TaskCount { get; set; }
-    public long AccountId { get; set; }
-    public string Mobile { get; set; }
-    public string FullName { get; set; }
-}

BackgroundJobs/BackgroundJobs.Task/JobsBootstrapper.cs

@@ -1,24 +0,0 @@
-using BackgroundJobs.Task.Jobs;
-
-namespace BackgroundJobs.Task;
-
-public class JobsBootstrapper
-{
-    public static void Configure(IServiceCollection services)
-    {
-        var currentNamespace = typeof(JobSchedulerRegistrator).Namespace; // همون namespace کلاس
-
-        var assembly = typeof(JobSchedulerRegistrator).Assembly;
-
-        var jobTypes = assembly.GetTypes()
-            .Where(t =>
-                t is { IsClass: true, IsAbstract: false, Namespace: not null } &&
-                t.Namespace.StartsWith(currentNamespace, StringComparison.Ordinal))
-            .ToList();
-
-        foreach (var jobType in jobTypes)
-        {
-            services.AddTransient(jobType);
-        }
-    }
-}

BackgroundJobs/BackgroundJobs.Task/Program.cs

@@ -1,45 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Sms;
-using _0_Framework.Application.UID;
-using AccountManagement.Configuration;
-using BackgroundJobs.Task;
-using BackgroundJobs.Task.Jobs;
-using Hangfire;
-using Microsoft.AspNetCore.Identity;
-using PersonalContractingParty.Config;
-using Query.Bootstrapper;
-using WorkFlow.Infrastructure.Config;
-
-var builder = WebApplication.CreateBuilder(args);
-var hangfireConnectionString = builder.Configuration.GetConnectionString("HangfireDb");
-builder.Services.AddHangfire(x => x.UseSqlServerStorage(hangfireConnectionString));
-builder.Services.AddHangfireServer();
-var connectionString = builder.Configuration.GetConnectionString("MesbahDb");
-var connectionStringTestDb = builder.Configuration.GetConnectionString("TestDb");
-builder.Services.AddSingleton<IPasswordHasher, PasswordHasher>();
-builder.Services.AddTransient<IAuthHelper, AuthHelper>();
-builder.Services.AddTransient<ISmsService, SmsService>();
-builder.Services.AddTransient<IUidService, UidService>();
-builder.Services.AddTransient<IFileUploader, FileUploader>();
-builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-
-PersonalBootstrapper.Configure(builder.Services, connectionString);
-TestDbBootStrapper.Configure(builder.Services, connectionStringTestDb);
-AccountManagementBootstrapper.Configure(builder.Services, connectionString);
-WorkFlowBootstrapper.Configure(builder.Services, connectionString);
-QueryBootstrapper.Configure(builder.Services);
-JobsBootstrapper.Configure(builder.Services);
-builder.Services.AddHttpClient();
-builder.Services.AddHttpContextAccessor();
-var app = builder.Build();
-
-app.MapHangfireDashboard();
-app.MapGet("/", () => "Hello World!");
-
-using (var scope = app.Services.CreateScope())
-{
-    var jobScheduler = scope.ServiceProvider.GetRequiredService<JobSchedulerRegistrator>();
-    jobScheduler.Register();
-}
-
-app.Run();

BackgroundJobs/BackgroundJobs.Task/Properties/launchSettings.json

@@ -1,38 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:56492",
-      "sslPort": 44378
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5216",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7222;http://localhost:5216",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

BackgroundJobs/BackgroundJobs.Task/appsettings.Development.json

@@ -1,42 +0,0 @@
-{
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    //تست
-    //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True"
-
-    //server
-    //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
-
-
-    //local
-    "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
-
-    //dad-mehr
-    //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
-
-    "TestDb": "Data Source=.;Initial Catalog=TestDb;Integrated Security=True;TrustServerCertificate=true;",
-
-    //mahan Docker
-    //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;",
-    "HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;"
-  },
-
-  "GoogleRecaptchaV3": {
-    "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",
-    "SecretKey": "6Lfhp_AnAAAAANjDDY6DPrbbUQS7k6ZCRmrVP5Lb"
-  },
-  "SmsSecrets": {
-    "ApiKey": "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa",
-    "SecretKey": "dadmehr"
-  },
-  "Domain": ".gozareshgir.ir",
-
-
-}

BackgroundJobs/BackgroundJobs.Task/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

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
         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/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);

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -73,12 +73,16 @@ 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; }
     #endregion
 
 
@@ -94,7 +98,7 @@ 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 legalPosition=null)
     {
 
         FName = fName;
@@ -120,8 +124,7 @@ public class PersonalContractingParty : EntityBase
         IsActiveString = "true";
         IsBlock = "false";
         BlockTimes = 0;
-                
-
+        LegalPosition = legalPosition;
     }
 
 
@@ -151,7 +154,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 +171,8 @@ public class PersonalContractingParty : EntityBase
         State = state;
         City = city;
         Zone = zone;
+        if (legalPosition != null)
+            LegalPosition = legalPosition;
 
 
     }

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,14 @@ 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);
 }

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,12 @@ 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<InstitutionContractWorkshopDetail> GetInstitutionWorkshopDetails(long institutionWorkshopDetailsId);
+    Task<InstitutionContract> GetIncludeWorkshopDetailsAsync(long institutionContractId);
+    void UpdateStatusIfNeeded(long institutionContractId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -1,17 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
+using _0_Framework.Application;
 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)
     {
         ContractNo = contractNo;
         RepresentativeId = representativeId;
@@ -43,6 +48,10 @@ public class InstitutionContract : EntityBase
         TypeOfContract = typeOfcontract;
         HasValueAddedTax = hasValueAddedTax;
         ValueAddedTax = valueAddedTax;
+        Status = InstitutionContractStatus.Incomplete;
+        ContactInfoList = [];
+        WorkshopDetails = [];
+        Installments = [];
     }
 
     public string ContractNo { get; private set; }
@@ -55,21 +64,24 @@ public class InstitutionContract : EntityBase
     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; }
@@ -82,28 +94,33 @@ public class InstitutionContract : EntityBase
     public string TypeOfContract { get; private set; }
     public string HasValueAddedTax { get; set; }
     public double ValueAddedTax { get; set; }
+    public InstitutionContractStatus Status { get; private set; }
+
+    public List<InstitutionContractWorkshopDetail> WorkshopDetails { get; set; }
 
     public List<InstitutionContractContactInfo> ContactInfoList { get; set; }
 
+    public List<InstitutionContractInstallment> Installments { get; set; }
+
     public InstitutionContract()
     {
-
-        ContactInfoList = new List<InstitutionContractContactInfo>();
+        ContactInfoList = [];
+        WorkshopDetails = [];
+        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 +141,11 @@ public class InstitutionContract : EntityBase
 
     public void Active()
     {
-
         this.IsActiveString = "true";
     }
 
     public void DeActive()
     {
-
         this.IsActiveString = "false";
     }
 
@@ -148,4 +163,177 @@ public class InstitutionContract : EntityBase
     {
         this.Signature = "0";
     }
+
+    public void Complete()
+    {
+        Status = InstitutionContractStatus.Completed;
+    }
+
+    public void SetWorkshopDetails(List<InstitutionContractWorkshopDetail> commandWorkshops)
+    {
+        WorkshopDetails = commandWorkshops;
+    }
+
+    public void SetInstallments(List<InstitutionContractInstallment> installments)
+    {
+        Installments = installments;
+    }
+}
+
+public class InstitutionContractWorkshopDetail:EntityBase
+{
+    public InstitutionContractWorkshopDetail(string workshopName, bool hasRollCallPlan,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
+        int personnelCount, double price)
+    {
+        WorkshopName = workshopName;
+        HasRollCallPlan = hasRollCallPlan;
+        HasCustomizeCheckoutPlan = hasCustomizeCheckoutPlan;
+        HasContractPlan = hasContractPlan;
+        HasContractPlanInPerson = hasContractPlanInPerson;
+        HasInsurancePlan = hasInsurancePlan;
+        HasInsurancePlanInPerson = hasInsurancePlanInPerson;
+        PersonnelCount = personnelCount;
+        WorkshopCreated = false;
+        Price = price;
+        Employers = [];
+    }
+
+    /// <summary>
+    /// شناسه کارگاه
+    /// </summary>
+    public long? WorkshopId { get; private set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { 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; }
+
+    public int PersonnelCount { get; private set; }
+
+    public bool WorkshopCreated { get; private set; }
+
+    /// <summary>
+    /// شناسه قرارداد نهاد مرتبط
+    /// </summary>
+    public long InstitutionContractId { get; private set; }
+
+    /// <summary>
+    /// Navigation property to InstitutionContract
+    /// </summary>
+    public InstitutionContract InstitutionContract { get; private set; }
+
+    public double Price { get; private set; }
+
+    
+    private InstitutionContractWorkshopDetail()
+    {
+    }
+    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(id, employerId));
+        }
+    }
+    public void AddEmployer(long employerId)
+    {
+        if (Employers.Exists(x => x.EmployerId == employerId))
+            return;
+
+        Employers.Add(new InstitutionContractWorkshopDetailEmployer(id, employerId));
+    }
+
+    public void Edit(bool hasAttendancePlan, bool hasUnofficialPayslipPlan, bool hasContractSettlementPlan)
+    {
+        HasRollCallPlan = hasAttendancePlan;
+        HasCustomizeCheckoutPlan = hasUnofficialPayslipPlan;
+        HasContractPlan = hasContractSettlementPlan;
+    }
+    
+    public void SetWorkshopId(long workshopId)
+    {
+        WorkshopId = workshopId;
+        WorkshopCreated = true;
+    }
+}
+
+public enum InstitutionContractStatus
+{
+    /// <summary>
+    /// ناتمام - قرارداد هنوز تکمیل نشده و نیاز به انجام کارهای بیشتر دارد
+    /// </summary>
+    Incomplete = 0,
+
+    /// <summary>
+    /// تکمیل شده - قرارداد به طور کامل انجام شده و نهایی شده است
+    /// </summary>
+    Completed = 1
+}
+
+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 InstitutionContract InstitutionContract { get; private set; }
+}
+public class InstitutionContractWorkshopDetailEmployer : EntityBase
+{
+    public long InstitutionContractWorkshopDetailId { get; private set; }
+    public long EmployerId { get; private set; }
+    
+    public InstitutionContractWorkshopDetailEmployer(long institutionContractWorkshopDetailId, long employerId)
+    {
+        InstitutionContractWorkshopDetailId = institutionContractWorkshopDetailId;
+        EmployerId = employerId;
+    }
+    
+    private InstitutionContractWorkshopDetailEmployer() { }
 }

Company.Domain/LawAgg/ILawRepository.cs

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

Company.Domain/LawAgg/Law.cs

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

Company.Domain/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, 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/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs

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

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractContactInfoTempRepository.cs

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

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractTempRepository.cs

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

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractContactInfoTemp.cs

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

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

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

Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs

@@ -21,6 +21,18 @@ public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
     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="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);

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; }

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -56,5 +56,14 @@ public class ComputingViewModel
     public TimeSpan TotalPaidLeave { get; set; }
     public TimeSpan TotalSickLeave { get; set; }
 
+    /// <summary>
+    /// ساعت موظفی پرسنل برای این ماه
+    /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+
+    /// <summary>
+    /// مجموع مرخصی های پرسنل در این فیش حقوقی
+    /// </summary>
+    //public TimeSpan TotalLeaveOnThisCheckout { get; set; }
     //public List<string> holidays;
 }

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

@@ -18,14 +18,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 +33,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 +41,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 +49,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 +57,22 @@ 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);
 }
 

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

CompanyManagment.App.Contracts/FinancialStatment/ClientFinancialStatementViewModel.cs

@@ -30,5 +30,5 @@ public class ClientFinancialStatementViewModel
     /// <summary>
     /// تراکنش ها
     /// </summary>
-    public List<ClientFinancialTransactionViewModel> Transactions { get; set; }
+    public List<FinancialTransactionDetailViewModel> Transactions { get; set; }
 }

CompanyManagment.App.Contracts/FinancialStatment/FinancialStatementSearchModel.cs

@@ -1,6 +1,6 @@
 namespace CompanyManagment.App.Contracts.FinancialStatment;
 
-public class ClientFinancialStatementSearchModel
+public class FinancialStatementSearchModel
 {
     /// <summary>
     /// از تاریخ

CompanyManagment.App.Contracts/FinancialStatment/FinancialTransactionDetailViewModel.cs

@@ -2,8 +2,9 @@
 
 namespace CompanyManagment.App.Contracts.FinancialStatment;
 
-public class ClientFinancialTransactionViewModel
+public class FinancialTransactionDetailViewModel
 {
+    public long Id { get; set; }
     /// <summary>
     /// زمان و تاریخ میلادی
     /// </summary>

CompanyManagment.App.Contracts/FinancialStatment/IFinancialStatmentApplication.cs

@@ -1,4 +1,5 @@
-using _0_Framework.Application;
+using System;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
@@ -19,6 +20,7 @@ public interface IFinancialStatmentApplication
     OperationResult Create(CreateFinancialStatment command);
 
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
+    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
 
     /// <summary>
@@ -27,9 +29,10 @@ public interface IFinancialStatmentApplication
     /// <param name="searchModel"></param>
     /// <param name="accountId"></param>
     /// <returns>مدل صورت حساب مالی کلاینت</returns>
-    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(ClientFinancialStatementSearchModel searchModel,
+    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(FinancialStatementSearchModel searchModel,
         long accountId);
 
+
     /// <summary>
     /// نمایش اطلاعات صورت حساب مالی کلاینت بر اساس کد هش
     /// </summary>
@@ -50,6 +53,46 @@ public interface IFinancialStatmentApplication
     /// <param name="accountId"></param>
     /// <returns></returns>
     Task<double> GetClientDebtAmount(long accountId);
+
+    /// <summary>
+    /// جزئیات بر اساس
+    /// </summary>
+    /// <param name="contractingPartyId"></param>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,
+        FinancialStatementSearchModel searchModel);
+}
+
+public class FinancialStatmentDetailsByContractingPartyViewModel
+{
+    /// <summary>
+    /// آیدی FinancialStatement
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// جمع بدهکاری
+    /// </summary>
+    public double TotalDebt { get; set; }
+    /// <summary>
+    /// جمع بستانکاری
+    /// </summary>
+    public double TotalCredit { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public double TotalAmountPayable { get; set; }
+
+    /// <summary>
+    /// تراکنش ها
+    /// </summary>
+    public List<FinancialTransactionDetailViewModel> List { get; set; }
 }
 
 public class GetFinancialStatementBalanceAmount

CompanyManagment.App.Contracts/InstitutionContract/CreateInstitutionContractRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/EditInstitutionContractRequest.cs

@@ -0,0 +1,7 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class EditInstitutionContractRequest:CreateInstitutionContractRequest
+{
+    public long Id { get; set; }
+    public long ContractingPartyId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -0,0 +1,88 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class GetInstitutionContractListItemsViewModel
+{
+    /// <summary>
+    /// آیدی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// دارای امضا
+    /// </summary>
+    public bool HasSigniture { get; set; }
+
+    /// <summary>
+    /// شماره قرارداد
+    /// </summary>
+    public string ContractNo { get; set; }
+
+    /// <summary>
+    /// نام معرف
+    /// </summary>
+    public string RepresentativeName { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// شماره کارفرما
+    /// </summary>
+    public string ArchiveNo { get; set; }
+
+    /// <summary>
+    /// نام کارفرماها
+    /// </summary>
+    public List<string> EmployerNames { get; set; }
+
+    /// <summary>
+    /// تعداد کارگاه
+    /// </summary>
+    public int WorkshopsCount { get; set; }
+
+    /// <summary>
+    /// نام کارگاه ها
+    /// </summary>
+    public List<string> WorkshopNames { get; set; }
+
+    /// <summary>
+    /// تعداد پرسنل
+    /// </summary>
+    public int EmployeesCount { get; set; }
+
+    /// <summary>
+    /// شروع قرارداد
+    /// </summary>
+    public string ContractStartFa { get; set; }
+
+    /// <summary>
+    /// پایان قرارداد
+    /// </summary>
+    public string ContractEndFa { get; set; }
+
+    /// <summary>
+    /// مبلغ قرارداد
+    /// </summary>
+    public double ContractAmount { get; set; }
+
+    /// <summary>
+    /// وضعیت مالی
+    /// </summary>
+    public double Balance { get; set; }
+
+    /// <summary>
+    /// وضعیت قرارداد
+    /// </summary>
+    public InstitutionContractListStatus ListStatus { get; set; }
+
+    /// <summary>
+    /// آیا منقضی شده است
+    /// </summary>
+    public bool IsExpired { get; set; }
+
+    public long ContractingPartyId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListViewModel.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// لیست قرارداد های موسسه
+/// </summary>
+public class GetInstitutionContractListViewModel
+{
+    /// <summary>
+    /// بدهی کل
+    /// </summary>
+    public double TotalDebt { get; set; }
+
+    /// <summary>
+    /// مبلغ قرارداد ها
+    /// </summary>
+    public double TotalAmount { get; set; }
+
+    public List<GetInstitutionContractListItemsViewModel> Items { get; set; }
+
+}

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -1,41 +1,301 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
+/// <summary>
+/// رابط اپلیکیشن قراردادهای مؤسسه
+/// مدیریت عملیات مربوط به قراردادهای مالی مؤسسات
+/// </summary>
 public interface IInstitutionContractApplication
 {
+    /// <summary>
+    /// ایجاد قرارداد جدید
+    /// </summary>
+    /// <param name="command">اطلاعات قرارداد جدید</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Create(CreateInstitutionContract command);
-    OperationResult Extension(CreateInstitutionContract command);   
+    
+    /// <summary>
+    /// تمدید قرارداد موجود
+    /// </summary>
+    /// <param name="command">اطلاعات قرارداد برای تمدید</param>
+    /// <returns>نتیجه عملیات</returns>
+    OperationResult Extension(CreateInstitutionContract command);
+    
+    /// <summary>
+    /// ویرایش قرارداد موجود
+    /// </summary>
+    /// <param name="command">اطلاعات جدید قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Edit(EditInstitutionContract command);
+    
+    /// <summary>
+    /// دریافت جزئیات قرارداد برای ویرایش
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>اطلاعات قرارداد</returns>
     EditInstitutionContract GetDetails(long id);
 
+    /// <summary>
+    /// جستجو در قراردادها
+    /// </summary>
+    /// <param name="searchModel">مدل جستجو</param>
+    /// <returns>لیست قراردادها</returns>
     List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
+    
+    /// <summary>
+    /// جستجوی جدید در قراردادها
+    /// </summary>
+    /// <param name="searchModel">مدل جستجو</param>
+    /// <returns>لیست قراردادها</returns>
     List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
 
     /// <summary>
-    /// دریافت اطلاعات قزداد های مالی فعال 
+    /// دریافت اطلاعات قرارداد های مالی فعال 
     ///دارای کارگاه
     /// جهت ست کردن سرویس ها از طریق اکسل
     /// </summary>
     /// <returns></returns>
     List<InstitutionContractViewModel> GetInstitutionContractToSetServicesExcelImport();
+
+    /// <summary>
+    /// چاپ مجموعه قراردادها
+    /// </summary>
+    /// <param name="id">لیست شناسه قراردادها</param>
+    /// <returns>لیست قراردادها برای چاپ</returns>
     List<InstitutionContractViewModel> PrintAll(List<long> id);
+    
+    /// <summary>
+    /// چاپ یک قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>اطلاعات قرارداد برای چاپ</returns>
     InstitutionContractViewModel PrintOne(long id);
+
+    /// <summary>
+    /// فعال کردن قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Active(long id);
+
+    /// <summary>
+    /// غیرفعال کردن قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActive(long id);
+
+    /// <summary>
+    /// غیرفعال کردن قرارداد (حالت آبی)
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActiveBlue(long id);
+
+    /// <summary>
+    /// غیرفعال کردن تمام اتصالات قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult DeActiveAllConnections(long id);
+
+    /// <summary>
+    /// فعال کردن مجدد تمام اتصالات قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult ReActiveAllConnections(long id);
+
+    /// <summary>
+    /// فعال کردن مجدد تمام قراردادها بعد از ایجاد قرارداد جدید
+    /// </summary>
+    /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
     void ReActiveAllAfterCreateNew(long contractingPartyId);
+
+    /// <summary>
+    /// حذف قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
     void RemoveContract(long id);
 
+    /// <summary>
+    /// امضای قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult Sign(long id);
+
+    /// <summary>
+    /// لغو امضای قرارداد
+    /// </summary>
+    /// <param name="id">شناسه قرارداد</param>
+    /// <returns>نتیجه عملیات</returns>
     OperationResult UnSign(long id);
+    
+    /// <summary>
+    /// ایجاد حساب کاربری برای طرف قرارداد
+    /// </summary>
+    /// <param name="contractingPartyid">شناسه طرف قرارداد</param>
+    /// <param name="accountId">شناسه حساب کاربری</param>
     void CreateContractingPartyAccount(long contractingPartyid, long accountId);
 
+    /// <summary>
+    /// محاسبه مبلغ قرارداد بر اساس تعداد افراد
+    /// </summary>
+    /// <param name="countPerson">تعداد افراد</param>
+    /// <returns>مبلغ قرارداد</returns>
     double GetcontractAmount(int countPerson);
-}
+
+    #region Api
+
+    /// <summary>
+    /// لیست قرارداد های مالی
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList
+        (InstitutionContractListSearchModel searchModel);
+
+    /// <summary>
+    /// وضعیت لیست کلی
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<GetInstitutionContractListStatsViewModel> GetListStats(InstitutionContractListSearchModel searchModel);
+
+    /// <summary>
+    /// ایجاد
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateAsync(CreateInstitutionContractRequest command);
+
+    /// <summary>
+    /// ویرایش
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditAsync(EditInstitutionContractRequest command);
+
+    /// <summary>
+    /// تمدید قرارداد
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> ExtensionَAsync(CreateInstitutionContractRequest command);
+    
+    /// <summary>
+    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
+    /// جهت نمایش در کارپوشه
+    /// </summary>
+    /// <returns></returns>
+    Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
+    /// <summary>
+    /// دریافت آیتم های کارپوشه ثبت نام
+    /// </summary>
+    /// <param name="institutionContractId"></param>
+    /// <returns></returns>
+    Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
+
+    #endregion
+}
+
+public class GetInstitutionContractListStatsViewModel
+{
+    /// <summary>
+    /// مجموع بدهی قراردادهای مؤسسه
+    /// این ویژگی بدهی‌های قراردادهای مربوطه را تجمیع می‌کند و
+    /// یک معیار واحد برای اندازه‌گیری تعهدات مالی ارائه می‌دهد
+    /// </summary>
+    public double TotalDebt { get; set; }
+
+    /// <summary>
+    /// مجموع ارزش پولی مرتبط با قراردادهای مؤسسه
+    /// این ویژگی مبلغ کل قراردادهای مربوطه را برای
+    /// گزارش‌گیری و تجزیه و تحلیل مالی تجمیع می‌کند
+    /// </summary>
+    public double TotalAmount { get; set; }
+
+    /// <summary>
+    /// مجموعه‌ای از تعداد قراردادهای مؤسسه دسته‌بندی شده بر اساس وضعیت
+    /// این ویژگی تعداد قراردادها را برای هر وضعیت تعریف شده در
+    /// شمارش InstitutionContractStatus ارائه می‌دهد که امکان تجزیه و تحلیل و نظارت بر توزیع قراردادها را فراهم می‌کند
+    /// </summary>
+    public List<InstitutionContractStatusCount> Counts { get; set; }
+}
+
+/// <summary>
+/// شمارش وضعیت قراردادهای مؤسسه
+/// نمایش تعداد قراردادها برای هر وضعیت خاص
+/// </summary>
+public class InstitutionContractStatusCount
+{
+    /// <summary>
+    /// وضعیت لیست قرارداد
+    /// </summary>
+    public InstitutionContractListStatus ListStatus { get; set; }
+    
+    /// <summary>
+    /// تعداد قراردادها در این وضعیت
+    /// </summary>
+    public int Count { get; set; }
+}
+
+/// <summary>
+/// درخواست تمدید قرارداد مؤسسه
+/// شامل اطلاعات قرارداد قبلی برای فرآیند تمدید
+/// </summary>
+public class ExtenstionInstitutionContractRequest : EditInstitutionContractRequest
+{
+    /// <summary>
+    /// شناسه قرارداد قبلی که قرار است تمدید شود
+    /// </summary>
+    public long PreviousContractId { get; set; }
+}
+
+/// <summary>
+/// مدل نمایش اقساط قرارداد مؤسسه
+/// شامل اطلاعات مربوط به هر قسط از قرارداد
+/// </summary>
+public class InstitutionContractInstallmentViewModel
+{
+    /// <summary>
+    /// شناسه یکتای قسط
+    /// </summary>
+    public long Id { get; set; }
+    
+    /// <summary>
+    /// تاریخ میلادی قسط
+    /// </summary>
+    public DateTime InstallmentDateGr { get; set; }
+    
+    /// <summary>
+    /// تاریخ فارسی قسط
+    /// </summary>
+    public string InstallmentDateFa { get; set; }
+    
+    /// <summary>
+    /// مبلغ قسط
+    /// </summary>
+    public double Amount { get; set; }
+    
+    /// <summary>
+    /// توضیحات قسط
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد مؤسسه مربوط به این قسط
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractListSearchModel.cs

@@ -0,0 +1,67 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractListSearchModel :PaginationRequest
+{
+    /// <summary>
+    /// کارفرما / کارگاه / طرف حساب / معرف
+    /// </summary>
+    public string EmployerOrWorkshopOrContractingPartyOrRepresentativeName { get; set; }
+
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string Province { get; set; }
+
+    /// <summary>
+    /// شهر
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// مبلغ قرارداد از
+    /// </summary>
+    public double AmountFrom { get; set; }
+
+    /// <summary>
+    /// مبلغ قرارداد تا
+    /// </summary>
+    public double AmountTo { get; set; }
+
+    /// <summary>
+    /// تاریخ قرارداد از
+    /// </summary>
+    public string ContractDateFrom { get; set; }
+
+    /// <summary>
+    /// تاریخ قرارداد تا
+    /// </summary>
+    public string ContractDateTo { get; set; }
+
+    /// <summary>
+    /// تب
+    /// </summary>
+    public InstitutionContractListStatus? Status { get; set; }
+
+    /// <summary>
+    /// فعال / غیرفعال
+    /// </summary>
+    public bool? IsActive { get; set; }
+
+    /// <summary>
+    /// موجود / ناموجود
+    /// </summary>
+    public bool? HasSignature { get; set; }
+
+    /// <summary>
+    /// نوع = روابط کار / مالیات و حسابداری
+    /// </summary>
+    public InstitutionContractType? Type { get; set; }
+
+    /// <summary>
+    /// رسمی / غیررسمی
+    /// </summary>
+    public bool? IsOfficial { get; set; }
+    
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractListStatus.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public enum InstitutionContractListStatus
+{
+    Active,
+    Deactive,
+    DeactiveWithDebt,
+    Block,
+    Free,
+    PendingForRenewal,
+    WithoutWorkshop
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractType.cs

@@ -0,0 +1,13 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public enum InstitutionContractType
+{
+    /// <summary>
+    /// روابط کار
+    /// </summary>
+    JobRelation,
+    /// <summary>
+    /// حسابداری و مالیات
+    /// </summary>
+    TaxAndFinancial
+}

CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs

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

CompanyManagment.App.Contracts/Law/ILawApplication.cs

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

CompanyManagment.App.Contracts/Law/LawViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/AccountNumberSelectListViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/CardNumberSelectListViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/CreateBankPaymentInstrument.cs

@@ -0,0 +1,37 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// ایجاد اطلاعات بانکی
+/// </summary>
+public class CreateBankPaymentInstrument
+{
+    /// <summary>
+    /// آیدی عنوان
+    /// </summary>
+    public long PaymentInstrumentGroupId { get; set; }
+
+    /// <summary>
+    /// نام صاحب حساب
+    /// </summary>
+    public string AccountHolderName { get; set; }
+
+    /// <summary>
+    /// شماره کارت
+    /// </summary>
+    public string CardNumber { get; set; }
+
+    /// <summary>
+    /// شماره حساب
+    /// </summary>
+    public string AccountNumber { get; set; }
+
+    /// <summary>
+    /// شماره حساب
+    /// </summary>
+    public string IBan { get; set; }
+
+    /// <summary>
+    /// آیا احزار هویت شده است
+    /// </summary>
+    public bool IsAuth { get; set; }
+}

CompanyManagment.App.Contracts/PaymentInstrument/CreateBankPaymentInstrumentGroup.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// ایجاد عنوان
+/// </summary>
+public class CreateBankPaymentInstrumentGroup
+{
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string Name { get; set; }
+}

CompanyManagment.App.Contracts/PaymentInstrument/CreatePosPaymentInstrument.cs

@@ -0,0 +1,22 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// 
+/// </summary>
+public class CreatePosPaymentInstrument
+{
+    /// <summary>
+    /// آیدی عنوان
+    /// </summary>
+    public long PaymentInstrumentGroupId { get; set; }
+
+    /// <summary>
+    /// شناسه دستگاه پوز
+    /// </summary>
+    public string PosTerminalId { get; set; }
+
+    /// <summary>
+    /// توضیحات
+    /// </summary>
+    public string Description { get; set; }
+}

CompanyManagment.App.Contracts/PaymentInstrument/EditBankPaymentInstrumentGroup.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// ویرایش عنوان
+/// </summary>
+public class EditBankPaymentInstrumentGroup : CreateBankPaymentInstrumentGroup
+{
+    /// <summary>
+    /// آیدی
+    /// </summary>
+    public long Id { get; set; }
+}

CompanyManagment.App.Contracts/PaymentInstrument/GetPaymentInstrumentListViewModel.cs

@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+public class GetPaymentInstrumentListViewModel
+{
+    /// <summary>
+    /// تعداد آیتم
+    /// </summary>
+    public int Count { get; set; }
+
+    /// <summary>
+    /// لیست گروهی
+    /// </summary>
+    public List<PaymentInstrumentGroupedViewModel> GropedViewModels { get; set; }
+}
+public class PaymentInstrumentGroupedViewModel
+{
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// آیتم های گروه
+    /// </summary>
+    public List<PaymentInstrumentItemsViewModel> Items { get; set; }
+}
+/// <summary>
+/// 
+/// </summary>
+public class PaymentInstrumentItemsViewModel
+{
+    /// <summary>
+    /// آیدی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// شماره کارت
+    /// </summary>
+    public string CardNumber { get; set; }
+
+    /// <summary>
+    /// شماره حساب
+    /// </summary>
+    public string AccountNumber { get; set; }
+
+    /// <summary>
+    /// شماره شبا
+    /// </summary>
+    public string IBan { get; set; }
+
+    /// <summary>
+    /// شناسه دستگاه
+    /// </summary>
+    public string PosTerminalId { get; set; }
+
+    /// <summary>
+    /// توضیحات
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// نام صاحب حساب
+    /// </summary>
+    public string AccountHolderName { get; set; }
+
+    /// <summary>
+    /// نوع 
+    /// </summary>
+    public PaymentInstrumentType Type { get; set; }
+}

CompanyManagment.App.Contracts/PaymentInstrument/IPaymentInstrumentApplication.cs

@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// اپلیکیشن جاری شرکا
+/// </summary>
+public interface IPaymentInstrumentApplication
+{
+    /// <summary>
+    /// ایجاد حساب اطلاعات بانکی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateBankAccount(CreateBankPaymentInstrument command);
+    Task<OperationResult> CreateBankAccount(List<CreateBankPaymentInstrument> commands);
+
+    /// <summary>
+    /// ایجاد اطلاعات دستگاه پوز
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreatePos(CreatePosPaymentInstrument command);
+    Task<OperationResult> CreatePos(List<CreatePosPaymentInstrument> commands);
+
+    /// <summary>
+    /// گرفتن لیست
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<GetPaymentInstrumentListViewModel> GetList(PaymentInstrumentSearchModel searchModel);
+
+    /// <summary>
+    ///  ایجاد عنوان
+    ///  </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateGroup(CreateBankPaymentInstrumentGroup command);
+
+    /// <summary>
+    /// ویرایش عنوان
+    /// </summary>
+    /// <returns></returns>
+    Task<OperationResult> EditGroup(EditBankPaymentInstrumentGroup command);
+
+    /// <summary>
+    /// حذف عنوان
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult> DeleteGroup(long id);
+
+    Task<List<PaymentInstrumentGroupsViewModel>> GetGroup();
+    
+    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);
+}

CompanyManagment.App.Contracts/PaymentInstrument/IbanSelectListViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/PaymentInstrumentGroupsViewModel.cs

@@ -0,0 +1,5 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+public class PaymentInstrumentGroupsViewModel:EditBankPaymentInstrumentGroup
+{
+}

CompanyManagment.App.Contracts/PaymentInstrument/PaymentInstrumentSearchModel.cs

@@ -0,0 +1,38 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+/// <summary>
+/// سرچ مدل
+/// </summary>
+public class PaymentInstrumentSearchModel
+{
+    /// <summary>
+    /// نام صاحب حساب
+    /// </summary>
+    public string AccountHolderName { get; set; }
+
+    /// <summary>
+    /// شناسه دستگاه
+    /// </summary>
+    public string PosTerminalId { get; set; }
+
+    /// <summary>
+    /// شماره کارت
+    /// </summary>
+    public string CardNumber { get; set; }
+
+    /// <summary>
+    /// شماره حساب
+    /// </summary>
+    public string AccountNumber { get; set; }
+
+    /// <summary>
+    /// شماره شبا
+    /// </summary>
+    public string IBan { get; set; }
+
+    /// <summary>
+    /// ایندکس صفحه
+    /// </summary>
+    public int PageIndex { get; set; }
+    
+}

CompanyManagment.App.Contracts/PaymentInstrument/PaymentInstrumentType.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+/// <summary>
+///  نوع حساب های جاری شرکا 
+/// </summary>
+public enum PaymentInstrumentType
+{
+    /// <summary>
+    /// حساب بانکی
+    /// </summary>
+    BankAccount,
+    /// <summary>
+    /// دستگاه پوز
+    /// </summary>
+    Pos
+}

CompanyManagment.App.Contracts/PaymentInstrument/PosTerminalSelectListViewModel.cs

@@ -0,0 +1,7 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.PaymentInstrument;
+
+public class PosTerminalSelectListViewModel:SelectListViewModel
+{
+}

CompanyManagment.App.Contracts/Representative/GetSelectListRepresentativeViewModel.cs

@@ -1,17 +1,8 @@
-namespace CompanyManagment.App.Contracts.Representative;
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.Representative;
 
 /// <summary>
 /// ویو مدل سلکت لیست برای معرف
 /// </summary>
-public class GetSelectListRepresentativeViewModel
-{
-	/// <summary>
-	/// آیدی
-	/// </summary>
-	public long Id { get; set; }
-
-	/// <summary>
-	/// نام معرف
-	/// </summary>
-	public string Name { get; set; }
-}
+public class GetSelectListRepresentativeViewModel:SelectListViewModel;

CompanyManagment.App.Contracts/RollCall/IRollCallMandatoryApplication.cs

@@ -8,7 +8,7 @@ namespace CompanyManagment.App.Contracts.RollCall;
 public interface IRollCallMandatoryApplication
 {
 	bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart);
-	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, bool totalLeaveCompute);
 
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب

CompanyManagment.App.Contracts/SalaryAid/ISalaryAidApplication.cs

@@ -22,5 +22,5 @@ public interface ISalaryAidApplication
 	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
 	#endregion
 
-    OperationResult CreateRange(List<CreateSalaryAidViewModel> commands);
+    Task<OperationResult> CreateRangeAsync(List<CreateSalaryAidViewModel> commands);
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateInstitutionContractTemp.cs

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

CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateWorkshopTemp.cs

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