feat: add financial transaction handling during institution contract verification

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

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

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

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

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

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

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,10 +98,8 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
+    public double ContractAmountWithTax => !IsOldContract && IsInstallment ? ContractAmount + (ContractAmount * 0.10)
         : ContractAmount;
-    
-    public double ContractAmountTax => ContractAmount*0.10;
 
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -23,6 +23,4 @@ public class InstitutionContractPrintViewModel
     public string VerifierPhoneNumber { get; set; }
     public LawViewModel LawViewModel { get; set; }
     public string Obligation { get; set; }
-    public string OneMonthWithoutTax { get; set; }
-    public string OneMonthTax { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

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

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

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

CompanyManagment.App.Contracts/InstitutionPlan/IInstitutionPlanApplication.cs

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

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanListDto.cs

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

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanSearchModel.cs

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

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1570,7 +1570,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
                 createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
                 createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
             institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
-            
+
+
+
         }
         
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
@@ -1609,9 +1611,23 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var transaction = await _institutionContractRepository.BeginTransactionAsync();
         await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
         
+        var financialStatement = await _financialStatmentRepository
+            .GetByContractingPartyId(institutionContract.ContractingPartyId);
+        
+        DateTime today = DateTime.Today;
+        var description = institutionContract.IsInstallment
+            ? "قسط اول سرویس"
+            : "پرداخت کل سرویس";
+        var debtorAmount = institutionContract.IsInstallment
+            ? institutionContract.Installments.First().Amount
+            : institutionContract.TotalAmount;
+        
+        var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+            description, "debt", "بابت خدمات", debtorAmount, 0, 0);
+        financialStatement.AddFinancialTransaction(financialTransaction);
         
-        await transaction.CommitAsync();
         await _institutionContractRepository.SaveChangesAsync();
+        await transaction.CommitAsync();
         return op.Succcedded();
     }
 

CompanyManagment.Application/InstitutionPlanApplication.cs

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

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -52,7 +52,5 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
 
         builder.Ignore(x => x.ContractAmountWithTax);
-        builder.Ignore(x => x.ContractAmountTax);
-        builder.Ignore(x => x.ContractAmountTax);
     }
 }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -3199,8 +3199,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
                 TaxPrice = institution.ValueAddedTax.ToMoney(),
                 OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
-                OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
-                OneMonthTax = institution.ContractAmountTax.ToMoney(),
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,
@@ -4364,7 +4362,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             {
                 var sendResult = await _smsService.SendInstitutionCreationVerificationLink(item.Number, item.FullName,
                     item.InstitutionId, item.ContractingPartyId, item.InstitutionContractId, typeOfSms);
-                Thread.Sleep(1000);
             }
 
             Console.WriteLine("executed at : " + persianNow + " - " + hour + ":" + minute);
@@ -4416,13 +4413,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TypeOfContract = x.TypeOfContract,
                 IsInstallment = x.IsInstallment,
                 VerificationStatus = x.VerificationStatus,
-                SigningType = x.SigningType,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
                     { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
-                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0)
             .ToListAsync();
 
         #endregion
@@ -4440,13 +4436,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
         #region GetDectivedContractOnCurrentMonth
-       
+
         if (futureContracts.Any())
         {
             List<long> futureContractIds = futureContracts.Select(x => x.ContractingPartyId).ToList();
             List<InstitutionContractViewModel> deatcivedContract = await _context.InstitutionContractSet
                 .Where(x => x.IsActiveString == "false" && futureContractIds.Contains(x.ContractingPartyId) &&
-                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0)
                 .Select(x => new InstitutionContractViewModel
                 {
                     Id = x.id,
@@ -4461,7 +4457,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     TypeOfContract = x.TypeOfContract,
                     IsInstallment = x.IsInstallment,
                     VerificationStatus = x.VerificationStatus,
-                    SigningType = x.SigningType,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
                         { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
@@ -4472,12 +4467,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 institutionContracts.AddRange(deatcivedContract);
         }
 
-        // قرارداد هایی که پطور یکجا پرداخت شده اند
-        var paidInFull = institutionContracts.Where(x =>
-            x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
-
-        //حذف قراداد هایی که یکجا پرداخت شده اند از لیست ایجاد سند ماهانه
-        institutionContracts = institutionContracts.Except(paidInFull).ToList();
 
         #region RollCallServicCompute
 
@@ -4525,7 +4514,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                         if (!alreadyCreated)
                         {
-                            if (item.IsInstallment)
+                            if (item.IsInstallment &&
+                                item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                             {
                                 var instalment = item.InstallmentList
                                     .FirstOrDefault(x =>
@@ -4559,7 +4549,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                         await _financialStatmentRepository.SaveChangesAsync();
 
 
-                        if (item.IsInstallment)
+                        if (item.IsInstallment &&
+                            item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                         {
                             var instalment = item.InstallmentList
                                 .FirstOrDefault(x =>
@@ -4586,17 +4577,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
                     #region RollCallServicCompute
-                    //ایجاد سند مالی حضورغیاب
-                    //قرارداد هایی که جدید نیستند و اقساط ندارند
-                    //کارگاه های استثناء : کباب مهدی 30520 و نمونه پروتئین 30739 
-                    if (item.SigningType != InstitutionContractSigningType.OtpBased && item.SigningType != InstitutionContractSigningType.Physical
-                        && !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
+
+                    if (item.VerificationStatus != InstitutionContractVerificationStatus.Verified &&
+                        !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
                     {
                         try
                         {
-                            //TODO
-                            //@refactor Need
-
                             var employers = await _context.Employers
                                 .Where(x => x.ContractingPartyId == item.ContractingPartyId)
                                 .Select(x => x.id).ToListAsync();

CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs

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

ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs

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

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

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

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

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

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

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

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

@@ -19,7 +19,6 @@ using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.EFCore;
-using Hangfire;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -32,9 +31,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Net.Http;
 using System.Security.Cryptography.Xml;
-using System.Text;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Authentication;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -51,7 +48,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IOnlinePayment _onlinePayment;
         private readonly IFaceEmbeddingService _faceEmbeddingService;
-        private readonly IAuthHelper _authHelper;
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -66,18 +62,13 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         [Display(Name = "کد ورژن")]
         public string VersionCode { get; set; }
 
-        /// <summary>
-        /// لاگ آپلود فرانت
-        /// </summary>
-        public string LogContent { get; set; }
-
         [BindProperty] public ApkType SelectedApkType { get; set; }
         [BindProperty] public bool IsForce { get; set; }
 
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -87,7 +78,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _clientRegistrationApplication = clientRegistrationApplication;
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
-            _authHelper = authHelper;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -326,106 +316,26 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //TranslateCode(result?.ErrorCode);
             return Page();
         }
-        [DisableConcurrentExecution(timeoutInSeconds: 120)]
+
         public async Task<IActionResult> OnPostUploadFrontEnd(CancellationToken cancellationToken)
         {
-            var validAccountId = _authHelper.CurrentAccountId();
-            if (validAccountId == 2 || validAccountId == 322)
+            var batPath = @"C:\next-ui\deploy-next-ui.bat";
+
+            var psi = new ProcessStartInfo
             {
-                var batPath = @"C:\next-ui\deploy-next-ui.bat";
+                FileName = batPath,
+                UseShellExecute = true,   // خیلی مهم
+                Verb = "runas",           // اجرای Administrator
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Normal
+            };
 
-                var psi = new ProcessStartInfo
-                {
-                    FileName = batPath,
-                    UseShellExecute = true,   // خیلی مهم
-                    Verb = "runas",           // اجرای Administrator
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden
-                };
-
-                Process.Start(psi);
-
-                TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
-                return RedirectToPage();
-            }
-            return Forbid();
+            Process.Start(psi);
 
+            TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
+            return RedirectToPage();
         }
 
-        /// <summary>
-        /// افزودن آی دی طرف حساب  به  کارگاه
-        /// </summary>
-        /// <returns></returns>
-        [DisableConcurrentExecution(timeoutInSeconds: 120)]
-        public async Task<IActionResult> OnPostContractingPartyToWorkshop()
-        {
-            var workshops = await _context.Workshops.Where(x => x.ContractingPartyId == 0).ToListAsync();
-
-            var worskhopEmployeer = await _context.WorkshopEmployers.Include(x => x.Employer).ToListAsync();
-
-            var contractingParties = await _context.PersonalContractingParties.ToListAsync();
-
-            foreach (var workshop in workshops)
-            {
-                var employers = worskhopEmployeer.Where(x => x.WorkshopId == workshop.id);
-                var contractingPartyIdList = new List<long>();
-                foreach (var employer in employers)
-                {
-                    if (contractingParties.Any(x => x.id == employer.Employer.ContractingPartyId))
-                    {
-                        contractingPartyIdList.Add(employer.Employer.ContractingPartyId);
-                    }
-
-                }
-
-                if (contractingPartyIdList.Count > 0)
-                {
-
-
-                    if (contractingPartyIdList.Count == 1)
-                    {
-                        workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                        await _context.SaveChangesAsync();
-                    }
-                    else
-                    {
-                        var idDistinct = contractingPartyIdList.Distinct().ToList();
-                        if (idDistinct.Count == 1)
-                        {
-                            workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                            await _context.SaveChangesAsync();
-                        }
-                    }
-                }
-            }
-
-
-            ViewData["message"] = "آی دی های طرف حساب اضافه شد";
-            return Page();
-
-        }
-
-        /// <summary>
-        /// دریافت لاگ آپلود فرانت
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult OnGetLog()
-        {
-            var validAccountId = _authHelper.CurrentAccountId();
-            if (validAccountId == 2 || validAccountId == 322)
-            {
-                var logPath = @"C:\next-ui\log.txt";
-                if (!System.IO.File.Exists(logPath))
-                    return Content("Log file not found.");
-
-                var content = System.IO.File.ReadAllText(logPath, Encoding.UTF8);
-                return Content(content);
-            }
-            return Content("شما مجاز به دیدن لاگ نیستید");
-
-        }
-
-
         public async System.Threading.Tasks.Task OnGetCallback(string? transid, string? cardnumber,
             string? tracking_number, string status)
         {
@@ -973,8 +883,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     contract => contract.ContractingPartyId,
                     contractingParty => contractingParty.id,
                     (contract, contractingParty) => new { contract, contractingParty });
-
-
+        
+        
             var remoteContractsQuery = query
                 .Where(x => x.contractingParty.Employers
                     .Any(e => e.WorkshopEmployers

ServiceHost/Conventions/ParameterBindingConvention.cs

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