fix: update SMS reminder job schedule and clean up code

.github/workflows/dotnet-developPublish.yml

@@ -1,48 +0,0 @@
-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=".\deployuser",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/Application/AuthHelper.cs

@@ -42,7 +42,6 @@ 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;
 	}
 
@@ -77,7 +76,7 @@ public class AuthHelper : IAuthHelper
 
 	#region Vafa
 
-	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName,long newWorkshopId)
+	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName)
 	{
 		var user = _contextAccessor.HttpContext.User;
 
@@ -86,7 +85,6 @@ 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)
 			{
@@ -98,14 +96,9 @@ 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
@@ -135,16 +128,8 @@ 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()
 	{
@@ -197,7 +182,6 @@ 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,7 +20,6 @@ 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,12 +17,11 @@ public interface IAuthHelper
 
 	#region Vafa
 
-	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
+	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
 
 	#endregion
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
-    long GetWorkshopId();
     (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/PagedResult.cs

@@ -1,15 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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 == ".dadmehrg.ir")
+        if (appSetting.Value.Domain == ".dad-mehr.ir")
         {
             _pin = "7349F84E81AB584862D9";
         }

0_Framework/Application/Sms/ISmsService.cs

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

0_Framework/Application/Sms/SmsResult.cs

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

0_Framework/Application/Tools.cs

@@ -477,42 +477,26 @@ public static class Tools
         string bb = string.Empty;
         bool isNegative = false;
 
-        try
+        for (int x = 0; x < myMoney.Length; x++)
         {
-            if (!string.IsNullOrWhiteSpace(myMoney))
+            if (char.IsDigit(myMoney[x]))
             {
-                for (int x = 0; x < myMoney.Length; x++)
-                {
-                    if (char.IsDigit(myMoney[x]))
-                    {
-                        bb += myMoney[x];
-                    }
-                    else if (myMoney[x] == '-' && bb.Length == 0)
-                    {
-                        // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
-                        isNegative = true;
-                    }
-                }
-
-                if (bb.Length > 0)
-                {
-                    double res = double.Parse(bb);
-                    return isNegative ? -res : res;
-                }
-                else
-                {
-                    return 0;
-                }
+                bb += myMoney[x];
             }
-            else
+            else if (myMoney[x] == '-' && bb.Length == 0)
             {
-                return 0;
+                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                isNegative = true;
             }
-            
         }
-        catch (Exception)
-        {
 
+        if (bb.Length > 0)
+        {
+            double res = double.Parse(bb);
+            return isNegative ? -res : res;
+        }
+        else
+        {
             return 0;
         }
     }

0_Framework/Application/UID/IUidService.cs

@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => Application.Gender.None
+        _ => throw new ArgumentOutOfRangeException()
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);

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

AccountManagement.Application/AccountApplication.cs

@@ -259,8 +259,7 @@ 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);
@@ -318,7 +317,6 @@ 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;
@@ -370,7 +368,6 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.Name;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-                authViewModel.WorkshopId = workshop.Id;
 			}
 		}
 
@@ -518,7 +515,6 @@ 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);

BackgroundJobs/BackgroundJobs.Task/BackgroundJobs.Task.csproj

@@ -0,0 +1,17 @@
+<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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,116 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,38 @@
+{
+  "$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

@@ -0,0 +1,42 @@
+{
+  "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

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

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,TimeSpan employeeMandatoryHours)
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -90,10 +90,8 @@ 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; }
@@ -195,16 +193,7 @@ 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; } = [];
@@ -327,16 +316,6 @@ 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,6 +78,4 @@ 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,7 +10,6 @@ namespace Company.Domain.ClassifiedSalaryAgg
 {
     public class ClassifiedSalary : EntityBase
     {
-        //test//test
         public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
         {
             Group1 = group1;

Company.Domain/ContractAgg/Contract.cs

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

Company.Domain/ContractAgg/IContractRepository.cs

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

Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs

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

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -374,13 +374,6 @@ 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,16 +377,4 @@ 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/IFinancialStatmentRepository.cs

@@ -13,14 +13,12 @@ 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,
-        FinancialStatementSearchModel searchModel);
+        ClientFinancialStatementSearchModel 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,7 +2,6 @@
 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;
@@ -44,7 +43,4 @@ 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);
 }

Company.Domain/LeaveAgg/ILeaveRepository.cs

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

Company.Domain/LeaveAgg/Leave.cs

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

Company.Domain/PaymentInstrumentAgg/IPaymentInstrumentGroupRepository.cs

@@ -1,12 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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, double dailyWageUnAffected, bool totalLeaveCompute);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
 
     /// <summary>
     /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

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

Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs

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

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

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

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

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

CompanyManagment.App.Contracts/Contract/ContractDailyWageAndBaseYearReport.cs

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

CompanyManagment.App.Contracts/Contract/CreateContract.cs

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

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

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

CompanyManagment.App.Contracts/Contract/UpgradeManualDailyWageModel.cs

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

CompanyManagment.App.Contracts/ContractingPartyBankAccounts/GetContractingPartyBankAccountViewModel.cs

@@ -6,16 +6,6 @@ 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>
     /// لیست حساب های بانکی
@@ -37,7 +27,6 @@ public class ContractingPartyBankAccountsGroupedViewModel
     /// </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<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
+    Task<OperationResult<List<GetContractingPartyBankAccountViewModel>>> GetList(
+        ContractingPartyBankAccountSearchModel searchModel);
 
     /// <summary>
     /// سلکت لیست جستجو برای نام طرف حساب / صاحب حساب
@@ -33,7 +33,7 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
+    Task<OperationResult<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<List<string>> CardNumberSelectList(string search, string selected);
+    Task<OperationResult<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<List<string>> IBanSelectList(string search, string selected);
+    Task<OperationResult<List<string>>> IBanSelectList(string search, string selected);
 
     /// <summary>
     /// سلکت لیست شماره حساب
@@ -57,22 +57,6 @@ public interface IContractingPartyBankAccountsApplication
     /// <param name="search">نام جستجو</param>
     /// <param name="selected">نام سلکت شده</param>
     /// <returns></returns>
-    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);
+    Task<OperationResult<List<string>>> AccountNumberSelectList(string search, string selected);
 }
 

CompanyManagment.App.Contracts/CustomizeCheckout/CustomizeCheckoutViewModel.cs

@@ -109,8 +109,6 @@ 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/FinancialStatment/ClientFinancialStatementSearchModel.cs

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

CompanyManagment.App.Contracts/FinancialStatment/ClientFinancialStatementViewModel.cs

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

CompanyManagment.App.Contracts/FinancialStatment/ClientFinancialTransactionViewModel.cs

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

CompanyManagment.App.Contracts/FinancialStatment/IFinancialStatmentApplication.cs

@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
@@ -20,7 +19,6 @@ public interface IFinancialStatmentApplication
     OperationResult Create(CreateFinancialStatment command);
 
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
-    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
 
     /// <summary>
@@ -29,10 +27,9 @@ public interface IFinancialStatmentApplication
     /// <param name="searchModel"></param>
     /// <param name="accountId"></param>
     /// <returns>مدل صورت حساب مالی کلاینت</returns>
-    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(FinancialStatementSearchModel searchModel,
+    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(ClientFinancialStatementSearchModel searchModel,
         long accountId);
 
-
     /// <summary>
     /// نمایش اطلاعات صورت حساب مالی کلاینت بر اساس کد هش
     /// </summary>
@@ -53,46 +50,6 @@ 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

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class CreateInstitutionContractRequest
-{
-    public List<CreateContactInfo> ContactInfos { get; set; }
-    public long ContractingPartyId { get; set; }
-    public long RepresentativeId { get; set; }
-    public string TypeOfContract { get; set; }
-    public string ContractDateFa { get; set; }
-    public string ContractStartFa { get; set; }
-    public string ContractEndFa { get; set; }
-    public string Address { get; set; }
-    public string State { get; set; }
-    public string City { get; set; }
-    public string OfficialCompany { get; set; }
-    public string HasValueAddedTax { get; set; }
-    public string ContractAmountString { get; set; }
-    public string DailyCompenseationString { get; set; }
-    public string ObligationString { get; set; }
-    public string TotalAmountString { get; set; }
-    public string ValueAddedTaxStr { get; set; }
-    public string WorkshopManualCount { get; set; }
-    public string EmployeeManualCount { get; set; }
-    public string Description { get; set; }
-    public int ExtensionNo { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/EditInstitutionContractRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -1,86 +0,0 @@
-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 InstitutionContractStatus Status { get; set; }
-
-    /// <summary>
-    /// آیا منقضی شده است
-    /// </summary>
-    public bool IsExpired { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListViewModel.cs

@@ -1,22 +0,0 @@
-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,19 +1,15 @@
 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;
 
 public interface IInstitutionContractApplication
 {
     OperationResult Create(CreateInstitutionContract command);
-    OperationResult Extension(CreateInstitutionContract command);
+    OperationResult Extension(CreateInstitutionContract command);   
     OperationResult Edit(EditInstitutionContract command);
     EditInstitutionContract GetDetails(long id);
 
@@ -27,107 +23,19 @@ public interface IInstitutionContractApplication
     /// </summary>
     /// <returns></returns>
     List<InstitutionContractViewModel> GetInstitutionContractToSetServicesExcelImport();
-
     List<InstitutionContractViewModel> PrintAll(List<long> id);
     InstitutionContractViewModel PrintOne(long id);
-
     OperationResult Active(long id);
-
-
     OperationResult DeActive(long id);
-
-
     OperationResult DeActiveBlue(long id);
-
-
     OperationResult DeActiveAllConnections(long id);
-
-
     OperationResult ReActiveAllConnections(long id);
-
     void ReActiveAllAfterCreateNew(long contractingPartyId);
-
-    
     void RemoveContract(long id);
 
-
     OperationResult Sign(long id);
-
-
     OperationResult UnSign(long id);
     void CreateContractingPartyAccount(long contractingPartyid, long accountId);
 
     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);
-    
-    #endregion
-}
-
-public class GetInstitutionContractListStatsViewModel
-{
-    /// <summary>
-    /// Represents the total outstanding debt of institution contracts.
-    /// This property aggregates the liabilities of the respective contracts and provides
-    /// a single metric to measure financial obligations.
-    /// </summary>
-    public double TotalDebt { get; set; }
-
-    /// <summary>
-    /// Represents the total monetary value associated with institution contracts.
-    /// This property consolidates the aggregate amount from relevant contracts
-    /// for financial reporting and analysis.
-    /// </summary>
-    public double TotalAmount { get; set; }
-
-    /// <summary>
-    /// Represents a collection of counts for institution contracts categorized by their status.
-    /// This property provides the count of contracts for each status defined in the
-    /// InstitutionContractStatus enumeration, enabling analysis and monitoring of contract distribution.
-    /// </summary>
-    public List<InstitutionContractStatusCount> Counts { get; set; } 
-}
-
-public class InstitutionContractStatusCount
-{
-    public InstitutionContractStatus Status { get; set; }
-    public int Count { get; set; }
-}
-public class ExtenstionInstitutionContractRequest:EditInstitutionContractRequest
-{
-    public long PreviousContractId { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractListSearchModel.cs

@@ -1,67 +0,0 @@
-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 InstitutionContractStatus? 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/InstitutionContractStatus.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractType.cs

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

CompanyManagment.App.Contracts/Leave/CreateLeave.cs

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

CompanyManagment.App.Contracts/Leave/LeavErrorViewModel.cs

@@ -14,8 +14,5 @@ namespace CompanyManagment.App.Contracts.Leave
         public string LeftWorlErrMessage { get; set; }
         public bool HasNotContract { get; set; }
         public string ContractErrMessage { get; set; }
-
-        public bool HasHolidayError { get; set; }
-        public string HolidayErrorMessage { get; set; }
     }
 }

CompanyManagment.App.Contracts/Leave/LeavePrintViewModel.cs

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

CompanyManagment.App.Contracts/Leave/LeaveSearchModel.cs

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

CompanyManagment.App.Contracts/Leave/LeaveViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/AccountNumberSelectListViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/CardNumberSelectListViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/CreateBankPaymentInstrument.cs

@@ -1,37 +0,0 @@
-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

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

CompanyManagment.App.Contracts/PaymentInstrument/CreatePosPaymentInstrument.cs

@@ -1,22 +0,0 @@
-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

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

CompanyManagment.App.Contracts/PaymentInstrument/GetPaymentInstrumentListViewModel.cs

@@ -1,73 +0,0 @@
-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

@@ -1,63 +0,0 @@
-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

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

CompanyManagment.App.Contracts/PaymentInstrument/PaymentInstrumentGroupsViewModel.cs

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

CompanyManagment.App.Contracts/PaymentInstrument/PaymentInstrumentSearchModel.cs

@@ -1,38 +0,0 @@
-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

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

CompanyManagment.App.Contracts/PaymentInstrument/PosTerminalSelectListViewModel.cs

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

CompanyManagment.App.Contracts/Representative/GetSelectListRepresentativeViewModel.cs

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

CompanyManagment.App.Contracts/RollCall/IRollCallMandatoryApplication.cs

@@ -8,8 +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, double dailyWageUnAffected, bool totalLeaveCompute);
-
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
 
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب

CompanyManagment.App.Contracts/SalaryAid/ISalaryAidApplication.cs

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

CompanyManagment.App.Contracts/WorkingHoursTemp/CreateWorkingHoursTemp.cs

@@ -311,9 +311,4 @@ public class CreateWorkingHoursTemp
     public string WeeklyWorkingTime { get; set; }
     public long ContractId { get; set; }
     public long WorknigHoursId { get; set; }
-
-    /// <summary>
-    /// دستمزد روزانه قبل از تاثیر ساعت کار
-    /// </summary>
-    public double DailySalaryUnAffected { get; set; }
 }

CompanyManagment.App.Contracts/Workshop/DTOs/AutoExtensionEmployeeListDto.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace CompanyManagment.App.Contracts.Workshop.DTOs;
+namespace CompanyManagment.App.Contracts.Workshop.DTOs;
 
 public class AutoExtensionEmployeeListDto
 {
@@ -34,17 +32,6 @@ public class AutoExtensionEmployeeListDto
     public bool EmployeeHasCreateContract { get; set; }
 
 
-    /// <summary>
-    /// دستمزد روزانه  دریافت شده از سمت فرانت
-    /// </summary>
-    public string DailySalaryUnAffectedStr => "0";
-
-    /// <summary>
-    /// مزد سالانه نرمال دریافت از سمت فرانت
-    /// </summary>
-    public string NormalDailyWage => "0";
-
-
     public string ContarctStart { get; set; }
     public string ContractEnd { get; set; }
 

CompanyManagment.App.Contracts/Workshop/createContractModel.cs

@@ -38,46 +38,6 @@ public class createContractModel
 
     public long YearlySalaryId { get; set; }
     public long EmployerId { get; set; }
-
-    /// <summary>
-    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
-    /// </summary>
-    public double DailySalaryAffected { get; set; }
-
-    /// <summary>
-    /// پایه سنوات بعد از تاثیر ساعت کار
-    /// </summary>
-    public double BaseYearAffected { get; set; }
-
-
-    /// <summary>
-    /// دستمزد روزانه قبل از تاثیر ساعت کار
-    /// </summary>
-    public double DailySalaryUnAffected { get; set; }
-
-    /// <summary>
-    /// دستمزد روزانه  دریافت شده از سمت فرانت
-    /// </summary>
-    public string DailySalaryUnAffectedStr { get; set; }
-
-    /// <summary>
-    /// مزد سالانه نرمال دریافت از سمت فرانت
-    /// </summary>
-    public string NormalDailyWage { get; set; }
-
-    /// <summary>
-    /// پایه سنوات قبل از تاثیر ساعت کار
-    /// </summary>
-    public double BaseYearUnAffected { get; set; }
-
-    /// <summary>
-    /// آیا دستمزد روزانه دستی وارد شده است؟
-    /// </summary>
-    public bool HasManualDailyWage { get; set; }
-
-    /// <summary>
-    /// نوع دستمزد انتخاب شده
-    /// </summary>
-    public string DailyWageType { get; set; }
+   
 
 }

CompanyManagment.App.Contracts/YearlySalary/BaseYearDataViewModel.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.YearlySalary;
-
-/// <summary>
-/// دیتای پایه سنوات از اولین شروع بکار پرسنل
-/// </summary>
-public class BaseYearDataViewModel
-{
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-
-    /// <summary>
-    /// پایه سنوات محاسبه شده نهایی
-    /// </summary>
-    public double BaseYearResult { get; set; }
-
-    /// <summary>
-    /// اولین روز شروع بکار
-    /// </summary>
-    public string FirstWorkDayInLeftWork { get; set; }
-
-    /// <summary>
-    /// لیست تمام پایه سنوات های محاسبه شده
-    /// </summary>
-    public List<BaseYearDataList> BaseYearDataList { get; set; }
-}
-
-/// <summary>
-/// لیست تمام پایه سنوات های محاسبه شده
-/// </summary>
-public class BaseYearDataList
-{
-    /// <summary>
-    /// پایه سنوات
-    /// </summary>
-    public double BaseYear { get; set; }
-
-    /// <summary>
-    /// تاریخ میلادی شروع محاسبه پایه سنوات
-    /// </summary>
-    public DateTime StartDateGr { get; set; }
-
-    /// <summary>
-    /// تاریخ میلادی پایان محاسبه پایه سنوات
-    /// </summary>
-    public DateTime EndDateGr { get; set; }
-
-    /// <summary>
-    /// تاریخ شمسی شروع محاسبه پایه سنوات
-    /// </summary>
-    public string StartDateFa { get; set; }
-
-    /// <summary>
-    /// تاریخ شمسی پایان محاسبه پایه سنوات
-    /// </summary>
-    public string EndDateFa { get; set; }
-
-    /// <summary>
-    /// سالی که در آن پایه سنوات تعلق گرفته
-    /// </summary>
-    public string Year { get; set; }
-
-    /// <summary>
-    ///روزی که پایه سنوات تعلق گرفته
-    ///یا شروع بکار. ترک کار
-    /// شمسی
-    /// </summary>
-    public string BaseYearPayDay { get; set; }
-
-    /// <summary>
-    /// روزی که پایه سنوات تعلق گرفته
-    ///یا شروع بکار. ترک کار
-    /// میلادی
-    /// </summary>
-    public DateTime BaseYearPayDayGr { get; set; }
-
-
-
-    /// <summary>
-    /// آیا تاریخ شروع بکار دارد
-    /// </summary>
-    public bool HasStartWork { get; set; }
-    /// <summary>
-    /// آیا تاریخ پایان کار دارد
-    /// </summary>
-    public bool HasLeftWork { get; set; }
-}

CompanyManagment.App.Contracts/YearlySalary/IYearlySalaryApplication.cs

@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.Holiday;
-using CompanyManagment.App.Contracts.LeftWork;
 
 namespace CompanyManagment.App.Contracts.YearlySalary;
 
@@ -16,35 +14,6 @@ public interface IYearlySalaryApplication
     OperationResult Err();
     EditYearlySalary GetDetails(long id);
     List<YearlySalaryViewModel> GetYearlySalary();
-
-    /// <summary>
-    /// متد ارتقاء مزد  دلخواه
-    /// </summary>
-    /// <param name="newContractStart"></param>
-    /// <param name="lastContractStart"></param>
-    /// <param name="lastContractManualDailyWage"></param>
-    /// <returns></returns>
-    Task<UpgradeManualDailyWageModel> UpgradeManualDailyWage(DateTime newContractStart, DateTime lastContractStart,
-        double lastContractManualDailyWage);
-
-    /// <summary>
-    /// متد محاسبه پایه سنوات و لیست پایه سنوات های پرسنل
-    /// </summary>
-    /// <param name="contractStart"></param>
-    /// <param name="contractEnd"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="leftWorkList"></param>
-    /// <returns></returns>
-    Task<BaseYearDataViewModel> BaseYearComputeByContractId(long contractId);
-    /// <summary>
-    /// دریافت مزد روزانه بر اساس تاریخ شروع و پایان
-    /// </summary>
-    /// <param name="start"></param>
-    /// <param name="end"></param>
-    /// <returns></returns>
-    Task<(double dailyWage, long yearlySalaryId)> GetDailyWageByStartEnd(DateTime start, DateTime end);
-
     List<YearlySalaryViewModel> Search(YearlySalarySearchModel searchModel);
     EditYearlySalary GetDetailsBySearchModel(YearlySalarySearchModel searchModel);
 

CompanyManagment.Application/CheckoutApplication.cs

@@ -152,38 +152,17 @@ public class CheckoutApplication : ICheckoutApplication
 		var housingAllowance = command.HousingAllowance.MoneyToDouble();
 		//حق تاهل
 		var marriedAllowance = command.MarriedAllowance.MoneyToDouble();
-        //var MontlyYearsBunos =
-        //_yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork);
-        //دستمزد ماهانه
-
-        #region Salary
-
-        var totalDays = (command.ContractEndGr - command.ContractStartGr).TotalDays + 1;
-
-        var mandatoryDays = totalDays - command.FridayStarttoEnd - command.officialholiday;
-
-        if (!command.HasRollCall && command.ShiftWork != "4")
-            mandatoryDays = totalDays - command.FridayStarttoEnd;
-        var monthlyWage = command.DailySalaryAffected * totalDays;
-
-        //پایه سنوات
-        var bacicYears = command.BaseYearAffected * totalDays;
-        #endregion
-
-        //سنوات
-        var years = command.YearsPay;
+		var MontlyYearsBunos =
+			_yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork);
+		//دستمزد ماهانه
+		var monthlyWage = MontlyYearsBunos.MontlyWage;
+		//سنوات
+		var years = command.YearsPay;
 		//عیدی و پاداش
 		var bunos = command.BonusesPay;
-
-        //فاطمه احمدژاد === موقت عیدی و پاداش  و سنوات حساب نشه
-        if (command.EmployeeId == 45104 && command.WorkshopId == 315)
-        {
-            years = 0;
-
-            bunos = 0;
-        }
-
-        var sumOfWorkingDays = $"{totalDays}";
+		//پایه سنوات
+		var bacicYears = MontlyYearsBunos.BasicYears;
+		var sumOfWorkingDays = MontlyYearsBunos.SumOfWorkingDay;
 		if (command.friday > 0)
 		{
 			var fridayPercent = dayliWage * 40 / 100;
@@ -205,8 +184,7 @@ public class CheckoutApplication : ICheckoutApplication
 			{
 				command.AbsenceDeduction = command.AbsenceDeduction - command.OvertimePay;
 				command.OvertimePay = 0;
-                command.OverTimeWorkValue = "00:00";
-            }
+			}
 			else
 			{
 				command.OvertimePay = command.OvertimePay - command.AbsenceDeduction;
@@ -221,11 +199,11 @@ public class CheckoutApplication : ICheckoutApplication
 				.Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
 
 		command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble());
-		
+
+
 		var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId,
-				command.WorkshopId, command.ContractStartGr, command.HasLeft ? DateTime.MaxValue : command.ContractEndGr)
-			.Select(x => 
-				new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
+				command.WorkshopId, command.ContractStartGr, command.ContractEndGr)
+			.Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
 
 		command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
@@ -367,7 +345,8 @@ public class CheckoutApplication : ICheckoutApplication
 			{
 				command.Signature = "0";
 			}
-			
+
+
 
 			var checkout = new Checkout(command.EmployeeFullName, command.FathersName, command.NationalCode
 				, command.DateOfBirth, command.EmployeeId, command.WorkshopName, command.WorkshopId, command.ContractNo, command.ContractStartGr, command.ContractEndGr, month, year,
@@ -375,7 +354,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours);
+				loanInstallments, salaryAids,checkoutRollCall);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();
@@ -518,7 +497,6 @@ public class CheckoutApplication : ICheckoutApplication
 				x.TotalPresentTimeStr =
 					Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
 				x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
-				
 			}
 		});
 			

CompanyManagment.Application/ContractApplication.cs

@@ -78,11 +78,6 @@ public class ContractApplication : IContractApplication
     }
 
 
-    public async Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart)
-    {
-        return await _contractRepository.GetManualDailWage(workshopId, employeeId, yearlySalaryId, contractStart);
-    }
-
     public OperationResult Create(CreateContract command)
     {
         var yearlysalaryList = _yearlySalaryRepository.GetYearlySalary();
@@ -147,9 +142,7 @@ public class ContractApplication : IContractApplication
             yearlySalarId,
             start, end, command.DayliWage, command.ArchiveCode, getWorkdate, setContractDate,
             command.JobType, command.ContractType, command.WorkshopAddress1, command.WorkshopAddress2,
-            command.ConsumableItems, command.JobTypeId, command.HousingAllowance, command.AgreementSalary,
-            command.WorkingHoursWeekly, command.FamilyAllowance, command.ContractPeriod,command.DailySalaryAffected,
-            command.BaseYearAffected, command.DailySalaryUnAffected,command.BaseYearUnAffected, command.HasManualDailyWage, command.DailyWageType);
+            command.ConsumableItems, command.JobTypeId, command.HousingAllowance, command.AgreementSalary, command.WorkingHoursWeekly, command.FamilyAllowance, command.ContractPeriod);
 
         _contractRepository.Create(makeContract);
         _contractRepository.SaveChanges();
@@ -363,9 +356,7 @@ public class ContractApplication : IContractApplication
             command.YearlySalaryId,
             start, end, command.DayliWage, command.ArchiveCode, getWorkdate, setContractDate,
             command.JobName, command.ContractType, command.WorkshopAddress1, command.WorkshopAddress2,
-            command.ConsumableItems, command.JobId, command.HousingAllowance, "0", command.WorkingHoursWeekly, command.FamilyAllowance, command.ContractPeriod,
-            command.DailySalaryAffected,
-            command.BaseYearAffected, command.DailySalaryUnAffected, command.BaseYearUnAffected, command.HasManualDailyWage, command.DailyWageType);
+            command.ConsumableItems, command.JobId, command.HousingAllowance, "0", command.WorkingHoursWeekly, command.FamilyAllowance, command.ContractPeriod);
         _contractRepository.Create(makeContract);
         _contractRepository.SaveChanges();
     

CompanyManagment.Application/ContractingPartyBankAccountsApplication.cs

@@ -8,13 +8,12 @@ using CompanyManagment.App.Contracts.PersonalContractingParty;
 
 namespace CompanyManagment.Application;
 
-public class ContractingPartyBankAccountsApplication : IContractingPartyBankAccountsApplication
+public class ContractingPartyBankAccountsApplication:IContractingPartyBankAccountsApplication
 {
     private readonly IContractingPartyBankAccountsRepository _contractingPartyBankAccountsRepository;
     private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository;
 
-    public ContractingPartyBankAccountsApplication(
-        IContractingPartyBankAccountsRepository contractingPartyBankAccountsRepository,
+    public ContractingPartyBankAccountsApplication(IContractingPartyBankAccountsRepository contractingPartyBankAccountsRepository,
         IPersonalContractingPartyRepository personalContractingPartyRepository)
     {
         _contractingPartyBankAccountsRepository = contractingPartyBankAccountsRepository;
@@ -24,13 +23,13 @@ public class ContractingPartyBankAccountsApplication : IContractingPartyBankAcco
     public async Task<OperationResult> Create(CreateContractingPartyBankAccounts command)
     {
         var operationResult = new OperationResult();
-
+        
         if (!_personalContractingPartyRepository.Exists(x => x.id == command.ContractingPartyId))
             return operationResult.Failed("طرف حساب مورد نظر یافت نشد");
-
+        
         if (string.IsNullOrWhiteSpace(command.CardNumber))
             return operationResult.Failed("شماره کارت خود را وارد کنید");
-
+        
         if (string.IsNullOrWhiteSpace(command.AccountNumber))
             return operationResult.Failed("شماره حساب خود را وارد کنید");
 
@@ -39,95 +38,42 @@ public class ContractingPartyBankAccountsApplication : IContractingPartyBankAcco
 
         if (string.IsNullOrWhiteSpace(command.AccountHolderName))
             return operationResult.Failed("نام صاحب حساب را وارد کنید");
-
+        
         var entity = new ContractingPartyBankAccount(command.ContractingPartyId, command.CardNumber,
-            command.AccountHolderName, command.AccountNumber, command.IBan, command.IsAuth);
-
+            command.AccountHolderName,command.AccountNumber, command.IBan,command.IsAuth);
+        
         await _contractingPartyBankAccountsRepository.CreateAsync(entity);
-
+        
         await _contractingPartyBankAccountsRepository.SaveChangesAsync();
-
+        
         return operationResult.Succcedded();
+        
     }
 
-    public async Task<OperationResult> Create(List<CreateContractingPartyBankAccounts> commands)
-    {
-        var operationResult = new OperationResult();
-        foreach (var command in commands)
-        {
-            if (!_personalContractingPartyRepository.Exists(x => x.id == command.ContractingPartyId))
-                return operationResult.Failed("طرف حساب مورد نظر یافت نشد");
-
-            if (command.IsAuth)
-            {
-                if (string.IsNullOrWhiteSpace(command.CardNumber))
-                    return operationResult.Failed("شماره کارت خود را وارد کنید");
-
-                if (string.IsNullOrWhiteSpace(command.AccountNumber))
-                    return operationResult.Failed("شماره حساب خود را وارد کنید");
-
-                if (string.IsNullOrWhiteSpace(command.IBan))
-                    return operationResult.Failed("شماره شبا خود را وارد کنید");
-            }
-            else if(string.IsNullOrWhiteSpace(command.CardNumber) &&
-                     string.IsNullOrWhiteSpace(command.AccountNumber) &&
-                     string.IsNullOrWhiteSpace(command.IBan))
-            {
-                return operationResult.Failed(" حداقل یکی از اطلاعات بانکی را وارد کنید: شماره کارت، شماره حساب یا شماره شبا");
-            }
-
-            if (string.IsNullOrWhiteSpace(command.AccountHolderName))
-            {
-                return operationResult.Failed("نام صاحب حساب را وارد کنید");
-            }
-            
-
-            var entity = new ContractingPartyBankAccount(command.ContractingPartyId, command.CardNumber,
-                command.AccountHolderName, command.AccountNumber, command.IBan, command.IsAuth);
-
-            await _contractingPartyBankAccountsRepository.CreateAsync(entity);
-        }
-
-        await _contractingPartyBankAccountsRepository.SaveChangesAsync();
-
-        return operationResult.Succcedded();
-    }
-
-    public async Task<GetContractingPartyBankAccountViewModel> GetList(
+    public async Task<OperationResult<List<GetContractingPartyBankAccountViewModel>>> GetList(
         ContractingPartyBankAccountSearchModel searchModel)
     {
         return await _contractingPartyBankAccountsRepository.GetList(searchModel);
     }
 
-    public async Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search,
+    public async Task<OperationResult<List<string>>> ContractingPartyOrAccountHolderNameSelectList(string search,
         string selected)
     {
-        return await _contractingPartyBankAccountsRepository.ContractingPartyOrAccountHolderNameSelectList(search,
-            selected);
+        return await _contractingPartyBankAccountsRepository.ContractingPartyOrAccountHolderNameSelectList(search, selected);
     }
 
-    public async Task<List<string>> CardNumberSelectList(string search, string selected)
+    public async Task<OperationResult<List<string>>> CardNumberSelectList(string search, string selected)
     {
         return await _contractingPartyBankAccountsRepository.CardNumberSelectList(search, selected);
     }
 
-    public async Task<List<string>> IBanSelectList(string search, string selected)
+    public async Task<OperationResult<List<string>>> IBanSelectList(string search, string selected)
     {
         return await _contractingPartyBankAccountsRepository.IBanSelectList(search, selected);
     }
 
-    public async Task<List<string>> AccountNumberSelectList(string search, string selected)
+    public async Task<OperationResult<List<string>>> AccountNumberSelectList(string search, string selected)
     {
         return await _contractingPartyBankAccountsRepository.AccountNumberSelectList(search, selected);
     }
-
-    public async Task<List<string>> GetAccountHolderNameSelectList(string search, string selected)
-    {
-        return await _contractingPartyBankAccountsRepository.GetAccountHolderNameSelectList(search, selected);
-    }
-
-    public async Task<List<string>> ContractingPartyNamesSelectList(string search, string selected)
-    {
-        return await _contractingPartyBankAccountsRepository.ContractingPartyNamesSelectList(search, selected);
-    }
 }

CompanyManagment.Application/CustomizeCheckoutApplication.cs

@@ -319,10 +319,7 @@ namespace CompanyManagment.Application
 
             if (workshopId == 170)
             {
-                var exceptionEmployeeIds = _customizeWorkshopGroupSettingsRepository
-                    .GetEmployeeSettingsByGroupSettingsId(117)
-                    .Select(x => x.EmployeeId)
-                    .Where(x=> workshopLeftWorksInMonth.Select(l=>l.EmployeeId).Contains(x)).ToList();
+                var exceptionEmployeeIds = _customizeWorkshopGroupSettingsRepository.GetEmployeeSettingsByGroupSettingsId(117).Select(x => x.EmployeeId).ToList();
                 foreach (var employeesId in exceptionEmployeeIds)
                 {
 

CompanyManagment.Application/CustomizeCheckoutTempApplication.cs

@@ -249,10 +249,7 @@ namespace CompanyManagment.Application
 
             if (workshopId == 170)
             {
-                var exceptionEmployeeIds = _customizeWorkshopGroupSettingsRepository
-                    .GetEmployeeSettingsByGroupSettingsId(117)
-                    .Select(x => x.EmployeeId)
-                    .Where(x=> workshopLeftWorksInMonth.Select(l=>l.EmployeeId).Contains(x)).ToList();
+                var exceptionEmployeeIds = _customizeWorkshopGroupSettingsRepository.GetEmployeeSettingsByGroupSettingsId(117).Select(x => x.EmployeeId).ToList();
                 foreach (var employeesId in exceptionEmployeeIds)
                 {
 

CompanyManagment.Application/EmployeeDocumentsApplication.cs

@@ -1735,7 +1735,7 @@ namespace CompanyManagment.Application
             if (file.Length > (50 * 1024 * 1024))
                 return op.Failed("حجم فایل نمی تواند بیشتر از 50 مگابایت باشد");
 
-            if (!allowedExtensions.Contains(fileExtension.ToLower()))
+            if (!allowedExtensions.Contains(fileExtension))
             {
                 var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
                 operationMessage += "\n";

CompanyManagment.Application/FinancialStatmentApplication.cs

@@ -176,7 +176,7 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
     }
 
     public async Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(
-        FinancialStatementSearchModel searchModel, long accountId)
+        ClientFinancialStatementSearchModel searchModel, long accountId)
     {
         return await _financialStatmentRepository.GetClientFinancialStatement(accountId, searchModel);
     }
@@ -196,10 +196,4 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
     {
         return _financialStatmentRepository.GetClientDebtAmount(accountId);
     }
-
-    public async Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(
-        long contractingPartyId, FinancialStatementSearchModel searchModel)
-    {
-        return await _financialStatmentRepository.GetDetailsByContractingParty(contractingPartyId,searchModel);
-    }
 }