feat: remove temporary institution amendment record after saving changes

# Conflicts:
#	0_Framework/Application/Sms/ISmsService.cs
#	CompanyManagment.EFCore/Services/SmsService.cs

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -39,7 +39,7 @@ public class AqayePardakhtPaymentGateway:IPaymentGateway
             amount = command.Amount,
             callback = command.CallBackUrl,
             card_number = command.CardNumber,
-            invoice_id = command.TransactionId,
+            invoice_id = command.InvoiceId,
             mobile = command.Mobile,    
             email = command.Email??"",
             description = command.Description,
@@ -73,7 +73,7 @@ public class AqayePardakhtPaymentGateway:IPaymentGateway
             amount = command.Amount,
             callback = command.CallBackUrl,
             card_number = command.Amount,
-            invoice_id = command.TransactionId,
+            invoice_id = command.InvoiceId,
             mobile = command.Mobile,
             email = command.Email,
             description = command.Email,

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -29,11 +29,9 @@ public class PaymentGatewayResponse
     public int? ErrorCode { get; set; }
 
     [JsonPropertyName("transid")]
-	public string Token { get; set; }
+    public string TransactionId { get; set; }
 
-    public bool IsSuccess { get; set; }
-
-    public string Message { get; set; }
+    public bool IsSuccess => Status == "success";
 }
 
 public class WalletAmountResponse
@@ -49,19 +47,16 @@ public class WalletAmountResponse
 public class CreatePaymentGatewayRequest
 {
     public double Amount { get; set; }
-    public string TransactionId { get; set; }
     public string CallBackUrl { get; set; }
+    public string InvoiceId { get; set; }
     public string CardNumber { get; set; }
     public string Mobile { get; set; }
     public string Email { get; set; }
     public string Description { get; set; }
-    public long FinancialInvoiceId { get; set; }
-    public IDictionary<string, object> ExtraData { get; set; }
 }
 
 public class VerifyPaymentGateWayRequest
 {
-	public string DigitalReceipt { get; set; }
-	public string TransactionId { get; set; }
+    public string TransactionId { get; set; }
     public double Amount { get; set; }
 }

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class SepehrPaymentGateway:IPaymentGateway
-{
-	private readonly HttpClient _httpClient;
-	private const long TerminalId = 99213700;
-
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
-	{
-		_httpClient = httpClient.CreateClient();
-		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
-	}
-
-	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		command.ExtraData ??= new Dictionary<string, object>();
-		command.ExtraData.Add("financialInvoiceId", command.FinancialInvoiceId);
-		var extraData = JsonConvert.SerializeObject(command.ExtraData);
-		var res = await _httpClient.PostAsJsonAsync("GetToken", new
-		{
-			TerminalID = TerminalId,
-			Amount = command.Amount,
-			InvoiceID = command.TransactionId,
-			callbackURL = command.CallBackUrl,
-			payload = extraData
-		}, cancellationToken: cancellationToken);
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-		// گرفتن مقدار AccessToken
-		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
-		var status = json.RootElement.GetProperty("Status").ToString();
-
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status == "0",
-			Token = accessToken
-		};
-	}
-
-	public string GetStartPayUrl(string token)=>
-		$"https://sepehr.shaparak.ir/Payment/Pay?token={token}&terminalId={TerminalId}";
-
-	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-	{
-		var res = await _httpClient.PostAsJsonAsync("Advice", new
-		{
-			digitalreceipt = command.DigitalReceipt,
-			Tid = TerminalId,
-		}, cancellationToken: cancellationToken);
-
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-
-		var message = json.RootElement.GetProperty("Message").GetString();
-		var status = json.RootElement.GetProperty("Status").GetString();
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status.ToLower() == "ok",
-			Message = message
-		};
-
-
-
-	}
-
-	public Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public string GetStartPaySandBoxUrl(string transactionId)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-	{
-		throw new System.NotImplementedException();
-	}
-}

0_Framework/Application/Sms/ISmsService.cs

@@ -28,6 +28,7 @@ public interface ISmsService
     Task<double> GetCreditAmount();
     
     public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
+    public Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
     
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -66,11 +66,4 @@ public interface IAccountApplication
     public bool CheckExistClientAccount(string userName);
     List<AccountViewModel> GetAdminAccountsNew();
 
-    void CameraLogin(CameraLoginRequest request);
-}
-
-public class CameraLoginRequest
-{
-    public string UserName { get; set; }
-    public string Password { get; set; }
 }

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Company.Domain.WorkshopAgg;
 using System.Security.Claims;
-using _0_Framework.Exceptions;
 using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle1Agg;
@@ -804,29 +803,4 @@ public class AccountApplication : IAccountApplication
     {
         return _accountRepository.GetAdminAccountsNew();
     }
-
-    public void CameraLogin(CameraLoginRequest request)
-    {
-        var cameraAccount = _cameraAccountRepository.GetBy(request.UserName);
-
-        if (cameraAccount == null)
-        {
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-        }
-
-        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraAccount.Password, request.Password);
-        
-        if (!result.Verified)
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        
-        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
-        if (cameraAccount.IsActiveSting != "true")
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        _authHelper.CameraSignIn(authViewModel);
-    }
 }

Company.Domain/EmployeeFaceEmbeddingAgg/EmployeeFaceEmbedding.cs

@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public class EmployeeFaceEmbedding
-    {
-        public EmployeeFaceEmbedding()
-        {
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-        }
-
-        public EmployeeFaceEmbedding(string employeeFullName, long employeeId, long workshopId, 
-            List<double> embeddings, EmployeeFaceEmbeddingMetadata metadata)
-        {
-            Id = Guid.NewGuid().ToString();
-            EmployeeFullName = employeeFullName;
-            EmployeeId = employeeId;
-            WorkshopId = workshopId;
-            Embeddings = embeddings;
-            Metadata = metadata;
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-            CreatedAt = DateTime.UtcNow;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.String)]
-        public string Id { get; set; }
-
-        [BsonElement("employeeFullName")]
-        public string EmployeeFullName { get; set; }
-        
-        [BsonElement("employeeId")]
-        public long EmployeeId { get; set; }
-        
-        [BsonElement("workshopId")]
-        public long WorkshopId { get; set; }
-
-        [BsonElement("embeddings")]
-        public List<double> Embeddings { get; set; }
-        
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("embeddingHistory")]
-        public List<EmbeddingHistoryItem> EmbeddingHistory { get; set; }
-        
-        [BsonElement("metadataHistory")]
-        public List<MetadataHistoryItem> MetadataHistory { get; set; }
-
-        [BsonElement("createdAt")]
-        public DateTime CreatedAt { get; set; }
-        
-        [BsonElement("updatedAt")]
-        public DateTime UpdatedAt { get; set; }
-
-        public void UpdateEmbedding(List<double> newEmbedding, double confidence, double refinementPercentage)
-        {
-            if (Embeddings != null)
-            {
-                EmbeddingHistory.Add(new EmbeddingHistoryItem
-                {
-                    Embedding = new List<double>(Embeddings),
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Embeddings = newEmbedding;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateMetadata(EmployeeFaceEmbeddingMetadata newMetadata, double confidence, double refinementPercentage)
-        {
-            if (Metadata != null)
-            {
-                MetadataHistory.Add(new MetadataHistoryItem
-                {
-                    Metadata = Metadata,
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Metadata = newMetadata;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateEmployeeInfo(string employeeFullName, long workshopId)
-        {
-            EmployeeFullName = employeeFullName;
-            WorkshopId = workshopId;
-            UpdatedAt = DateTime.UtcNow;
-        }
-    }
-
-    public class EmployeeFaceEmbeddingMetadata
-    {
-        [BsonElement("avg_eye_distance_normalized")]
-        public double AvgEyeDistanceNormalized { get; set; }
-
-        [BsonElement("avg_eye_to_face_ratio")]
-        public double AvgEyeToFaceRatio { get; set; }
-
-        [BsonElement("avg_face_aspect_ratio")]
-        public double AvgFaceAspectRatio { get; set; }
-
-        [BsonElement("avg_detection_confidence")]
-        public double AvgDetectionConfidence { get; set; }
-
-        [BsonElement("avg_keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints AvgKeypointsNormalized { get; set; }
-
-        [BsonElement("per_image_metadata")]
-        public List<ImageMetadata> PerImageMetadata { get; set; }
-    }
-
-    public class EmployeeFaceEmbeddingKeypoints
-    {
-        [BsonElement("left_eye")]
-        public double[] LeftEye { get; set; }
-
-        [BsonElement("right_eye")]
-        public double[] RightEye { get; set; }
-
-        [BsonElement("nose")]
-        public double[] Nose { get; set; }
-
-        [BsonElement("mouth_left")]
-        public double[] MouthLeft { get; set; }
-
-        [BsonElement("mouth_right")]
-        public double[] MouthRight { get; set; }
-    }
-
-    public class ImageMetadata
-    {
-        [BsonElement("face_aspect_ratio")]
-        public double FaceAspectRatio { get; set; }
-
-        [BsonElement("eye_distance_normalized")]
-        public double EyeDistanceNormalized { get; set; }
-
-        [BsonElement("eye_to_face_ratio")]
-        public double EyeToFaceRatio { get; set; }
-
-        [BsonElement("detection_confidence")]
-        public double DetectionConfidence { get; set; }
-
-        [BsonElement("keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints KeypointsNormalized { get; set; }
-    }
-
-    public class EmbeddingHistoryItem
-    {
-        [BsonElement("embedding")]
-        public List<double> Embedding { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }
-
-    public class MetadataHistoryItem
-    {
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }

Company.Domain/EmployeeFaceEmbeddingAgg/IEmployeeFaceEmbeddingRepository.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public interface IEmployeeFaceEmbeddingRepository
-{
-    Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task<EmployeeFaceEmbedding> GetByIdAsync(string id);
-    Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds);
-    Task DeleteAsync(string id);
-}

Company.Domain/FinancialInvoiceAgg/FinancialInvoice.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Domain;
-using Company.Domain.PaymentTransactionAgg;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-
-namespace Company.Domain.FinancialInvoiceAgg;
-
-public class FinancialInvoice : EntityBase
-{
-
-	public string InvoiceNumber { get; private set; }
-	public string Description { get; set; }
-	public FinancialInvoiceStatus Status { get; private set; }
-	public DateTime? PaidAt { get; private set; }
-	public double Amount { get; private set; }
-	public Guid PublicId { get; private set; }
-	public bool IsActive { get; set; }
-
-	public List<PaymentTransaction> PaymentTransactions { get; private set; } 
-	public long ContractingPartyId { get; private set; }
-
-	public List<FinancialInvoiceItem> Items { get; private set; }
-
-	public FinancialInvoice(double amount, long contractingPartyId, string description)
-	{
-		InvoiceNumber = GenerateInvoiceNumber();
-		Status = FinancialInvoiceStatus.Unpaid;
-		Amount = amount;
-		PublicId = Guid.NewGuid();
-		ContractingPartyId = contractingPartyId;
-		Description = description;
-		IsActive = true;
-		Items = [];
-		PaymentTransactions = [];
-	}
-
-	public void AddItem(FinancialInvoiceItem item)
-	{
-		Items ??= [];
-
-		Items.Add(item);
-	}
-
-	public void SetItems(List<FinancialInvoiceItem> items)
-	{
-		Items = items;
-	}
-
-	public void SetPaid(DateTime paidAt)
-	{
-		Status = FinancialInvoiceStatus.Paid;
-		PaidAt = paidAt;
-	}
-	public void SetUnpaid()
-	{
-		Status = FinancialInvoiceStatus.Unpaid;
-		PaidAt = null;
-	}
-	public void SetCancelled()
-	{
-		Status = FinancialInvoiceStatus.Cancelled;
-		PaidAt = null;
-	}
-	public void SetRefunded()
-	{
-		Status = FinancialInvoiceStatus.Refunded;
-		PaidAt = null;
-	}
-
-	public void DeActivate()
-	{
-		IsActive = false;
-	}
-
-	public void SetInvoiceNumber(string invoiceNumber)
-	{
-		InvoiceNumber = invoiceNumber;
-	}
-
-	private string GenerateInvoiceNumber()
-	{
-		var timestamp = DateTime.Now.ToString("yyyyMMddHHmmss");
-		var random = new Random().Next(1000, 9999);
-		return $"GZ_{timestamp}{random}";
-	}
-
-}
-
-public class FinancialInvoiceItem : EntityBase
-{
-	public string Description { get; private set; }
-	public double Amount { get; private set; }
-	public FinancialInvoiceItemType Type { get; set; }
-	public long EntityId { get; set; }
-	public FinancialInvoice FinancialInvoice { get; set; }
-	public long FinancialInvoiceId { get; set; }
-	public FinancialInvoiceItem(string description, double amount,
-		long financialInvoiceId, FinancialInvoiceItemType type, long entityId)
-	{
-		Description = description;
-		Amount = amount;
-		FinancialInvoiceId = financialInvoiceId;
-		Type = type;
-		EntityId = entityId;
-	}
-}
-

Company.Domain/FinancialInvoiceAgg/IFinancialInvoiceRepository.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-
-namespace Company.Domain.FinancialInvoiceAgg;
-
-public interface IFinancialInvoiceRepository : IRepository<long, FinancialInvoice>
-{
-    EditFinancialInvoice GetDetails(long id);
-    List<FinancialInvoiceViewModel> Search(FinancialInvoiceSearchModel searchModel);
-    Task<FinancialInvoice> GetUnPaidByEntityId(long entityId, FinancialInvoiceItemType financialInvoiceItemType);
-}

Company.Domain/FinancialStatmentAgg/FinancialStatment.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialTransactionAgg;
 
 namespace Company.Domain.FinancialStatmentAgg;

Company.Domain/FinancialStatmentAgg/IFinancialStatmentRepository.cs

@@ -22,8 +22,6 @@ public interface IFinancialStatmentRepository : IRepository<long, FinancialStatm
     Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
     Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
     Task<double> GetClientDebtAmount(long accountId);
-    Task<double> GetClientDebtAmountByContractingPartyId(long contractingPartyId);
-
-	Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
+    Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
     Task<FinancialStatment> GetByContractingPartyId(long contractingPartyId);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -6,7 +6,6 @@ using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.InstitutionContractAgg;
 
@@ -77,4 +76,6 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
+    Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request);
+    Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -252,6 +252,11 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+
+    public void AddAmendment(InstitutionContractAmendment amendment)
+    {
+        Amendments.Add(amendment);
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase
@@ -259,14 +264,15 @@ public class InstitutionContractAmendment : EntityBase
     private InstitutionContractAmendment(){}
     public InstitutionContractAmendment(long institutionContractId,
         List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
-        InstitutionContractAmendmentChange amendmentChange, long lawId)
+        List<InstitutionContractAmendmentChange> amendmentChanges, long lawId)
     {
         InstitutionContractId = institutionContractId;
         Installments = installments is { Count: > 0} ? installments : [];
         Amount = amount;
         HasInstallment = hasInstallment;
-        AmendmentChanges = [amendmentChange];
+        AmendmentChanges = amendmentChanges;
         LawId = lawId;
+        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
     }
 
     public long InstitutionContractId { get; set; }
@@ -280,6 +286,15 @@ public class InstitutionContractAmendment : EntityBase
 
     public long LawId { get; set; }
 
+    
+    public string VerifierPhoneNumber { get; private set; }
+
+    public string VerifierFullName { get; private set; }
+
+    public InstitutionContractVerificationStatus VerificationStatus { get; set; }
+
+    public DateTime VerifyCodeCreation { get; set; }
+    
     public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
     {
         VerifyCode = code;
@@ -287,25 +302,22 @@ public class InstitutionContractAmendment : EntityBase
         VerifierFullName = verifierFullName;
         VerifierPhoneNumber = verifierPhoneNumber;
     }
-
-    public string VerifierPhoneNumber { get; private set; }
-
-    public string VerifierFullName { get; private set; }
-
-    public DateTime VerifyCodeCreation { get; set; }
+    public void Verified()
+    {
+        VerificationStatus = InstitutionContractVerificationStatus.Verified;
+    }
 }
 
 public class InstitutionContractAmendmentChange : EntityBase
 {
     private InstitutionContractAmendmentChange() { }
-    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
-        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
-        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
+    
+    private InstitutionContractAmendmentChange(InstitutionContractAmendmentChangeType changeType,
+        DateTime changeDateGr, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
         bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
-        long? workshopDetailsId)
+        bool? hasRollCallPlan, bool? hasRollCallInPerson,
+        long? currentWorkshopId, int personnelCountDifference)
     {
-        InstitutionContractAmendmentId = institutionContractAmendmentId;
-        InstitutionContractAmendment = institutionContractAmendment;
         ChangeType = changeType;
         ChangeDateGr = changeDateGr;
         HasRollCallPlan = hasRollCallPlan;
@@ -315,9 +327,80 @@ public class InstitutionContractAmendmentChange : EntityBase
         HasInsurancePlan = hasInsurancePlan;
         HasInsurancePlanInPerson = hasInsurancePlanInPerson;
         PersonnelCount = personnelCount;
-        WorkshopDetailsId = workshopDetailsId;
+        PersonnelCountDifference = personnelCountDifference;
+        CurrentWorkshopId = currentWorkshopId;
+        HasRollCallInPerson = hasRollCallInPerson;
     }
 
+    /// <summary>
+    /// تغییر تعداد پرسنل
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreatePersonCountChange(
+        DateTime changeDateGr, int personnelCount, int personnelCountDifference,
+        long currentWorkshopId)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.PersonCount,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: null,
+            hasContractPlan: null,
+            hasContractPlanInPerson: null,
+            hasInsurancePlan: null,
+            hasInsurancePlanInPerson: null,
+            personnelCount: personnelCount,
+            hasRollCallPlan: null,
+            hasRollCallInPerson: null,
+            currentWorkshopId: currentWorkshopId,
+            personnelCountDifference: personnelCountDifference);
+    }
+
+    /// <summary>
+    /// تغییر خدمات
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreateServicesChange(
+        DateTime changeDateGr, long currentWorkshopId, bool hasRollCallPlan, bool hasRollCallInPerson,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
+        bool hasInsurancePlan, bool hasInsurancePlanInPerson)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.Services,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
+            hasContractPlan: hasContractPlan,
+            hasContractPlanInPerson: hasContractPlanInPerson,
+            hasInsurancePlan: hasInsurancePlan,
+            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
+            personnelCount: null,
+            hasRollCallPlan: hasRollCallPlan,
+            hasRollCallInPerson: hasRollCallInPerson,
+            currentWorkshopId: currentWorkshopId,
+            personnelCountDifference: 0);
+    }
+
+    /// <summary>
+    /// ایجاد کارگاه جدید
+    /// </summary>
+    public static InstitutionContractAmendmentChange CreateWorkshopCreatedChange(
+        DateTime changeDateGr, bool hasRollCallPlan, bool hasRollCallInPerson,
+        bool hasCustomizeCheckoutPlan, bool hasContractPlan, bool hasContractPlanInPerson,
+        bool hasInsurancePlan, bool hasInsurancePlanInPerson,int personnelCount)
+    {
+        return new InstitutionContractAmendmentChange(
+            changeType: InstitutionContractAmendmentChangeType.WorkshopCreated,
+            changeDateGr: changeDateGr,
+            hasCustomizeCheckoutPlan: hasCustomizeCheckoutPlan,
+            hasContractPlan: hasContractPlan,
+            hasContractPlanInPerson: hasContractPlanInPerson,
+            hasInsurancePlan: hasInsurancePlan,
+            hasInsurancePlanInPerson: hasInsurancePlanInPerson,
+            personnelCount: personnelCount,
+            hasRollCallPlan: hasRollCallPlan,
+            hasRollCallInPerson: hasRollCallInPerson,
+            currentWorkshopId: null,
+            personnelCountDifference: 0);
+    }
+
+
     public long InstitutionContractAmendmentId { get; private set; }
     public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
     public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
@@ -328,6 +411,8 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// </summary>
     public bool? HasRollCallPlan { get; private set; }
 
+    public bool? HasRollCallInPerson { get; set; }
+
     /// <summary>
     /// پلن فیش غیر رسمی
     /// </summary>
@@ -357,11 +442,17 @@ public class InstitutionContractAmendmentChange : EntityBase
     /// تعداد پرسنل
     /// </summary>
     public int? PersonnelCount { get; private set; }
+    
+    /// <summary>
+    /// مقدار تغییرات تعداد پرسنل
+    /// </summary>
+    public int PersonnelCountDifference { get; set; }
+    
 
     /// <summary>
     /// تعداد کارگاه
     /// </summary>
-    public long? WorkshopDetailsId { get; private set; }
+    public long? CurrentWorkshopId { get; private set; }
 }
 
 public enum InstitutionContractAmendmentChangeType

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopBase.cs

@@ -9,7 +9,7 @@ public class InstitutionContractWorkshopBase:EntityBase
     protected InstitutionContractWorkshopBase(){}
     public InstitutionContractWorkshopBase(string workshopName, bool hasRollCallPlan,bool hasRollCallPlanInPerson,
         bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
-        int personnelCount, double price )
+        int personnelCount, double price,bool isAmendment )
     {
         WorkshopName = workshopName;
         Services = new WorkshopServices(hasInsurancePlan, hasInsurancePlanInPerson,
@@ -17,7 +17,10 @@ public class InstitutionContractWorkshopBase:EntityBase
         PersonnelCount = personnelCount;
         Price = price;
         Employers = [];
+        IsAmendment = isAmendment;
     }
+
+
     /// <summary>
     /// شناسه کارگاه
     /// </summary>
@@ -42,7 +45,11 @@ public class InstitutionContractWorkshopBase:EntityBase
     
 
     public double Price { get; private set; }
-
+    
+    /// <summary>
+    /// جهت نمایش دادن اینکه آیا این کارگاه مربوط به ارتقا قرارداد است یا خیر
+    /// </summary>
+    public bool IsAmendment { get; set; }
     
     public List<InstitutionContractWorkshopDetailEmployer> Employers { get; private set; } = new();
 

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,9 +10,10 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        InstitutionContractWorkshopGroup workshopGroup,long workshopId,bool isAmendment) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
-        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
+        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price,isAmendment)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -31,6 +31,13 @@ public class InstitutionContractWorkshopGroup : EntityBase
         InitialWorkshops = initialWorkshops.ToList();
         LastModifiedDate = DateTime.Now;
     }
+    
+    public void AddAmendmentWorkshops(List<InstitutionContractWorkshopInitial> amendmentDetails)
+    {
+        InitialWorkshops.AddRange(amendmentDetails);
+        LastModifiedDate = DateTime.Now;
+    }
+    
 
     public void UpdateCurrentWorkshops(List<InstitutionContractWorkshopCurrent> updatedDetails)
     {

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -11,9 +11,9 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopInitial(string workshopName, bool hasRollCallPlan, 
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
-        int personnelCount, double price) : base(workshopName, hasRollCallPlan,
+        int personnelCount, double price,bool isAmendment =false) : base(workshopName, hasRollCallPlan,
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
-        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
+        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price,isAmendment)
     {
         WorkshopCreated = false;
     }
@@ -31,7 +31,8 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
         WorkshopCreated = true;
         WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
             Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,
+            IsAmendment);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
@@ -16,7 +17,7 @@ public class InstitutionContractAmendmentTemp
         NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
             x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
             x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
-            x.CurrentWorkshopId, 0)).ToList();
+            x.CurrentWorkshopId, 0,x.Id)).ToList();
         InstitutionContractId = institutionContractId;
     }
 
@@ -25,17 +26,32 @@ public class InstitutionContractAmendmentTemp
     public Guid Id { get; private set; }
     public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
     public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
+    
+    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
+    
+    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
+    
     public long InstitutionContractId { get; private set; }
+
+    public int MonthDifference { get; set; }
+    public void AddPaymentDetails(InstitutionContractPaymentMonthlyViewModel resMonthly, InstitutionContractPaymentOneTimeViewModel resOneTime, int monthDiff)
+    {
+        MonthlyPayment = resMonthly;
+        OneTimePayment = resOneTime;
+        MonthDifference = monthDiff;
+    }
+
 }
 
 public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
 {
     public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
         bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
-        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
+        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference,Guid prevId) : base(
         workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
         rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
     {
+        Id = prevId;
         PriceDifference = priceDifference;
     }
 

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

@@ -1,6 +1,5 @@
 using System;
 using _0_Framework.Domain;
-using Company.Domain.FinancialInvoiceAgg;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 
 namespace Company.Domain.PaymentTransactionAgg;
@@ -10,25 +9,22 @@ namespace Company.Domain.PaymentTransactionAgg;
 /// </summary>
 public class PaymentTransaction:EntityBase
 {
-	/// <summary>
-	/// سازنده کلاس PaymentTransaction با دریافت اطلاعات تراکنش.
-	/// </summary>
-	/// <param name="contractingPartyId">شناسه طرف قرارداد</param>
-	/// <param name="amount">مبلغ تراکنش</param>
-	/// <param name="contractingPartyName"></param>
-	/// <param name="callBackUrl"></param>
-	/// <param name="gateway"></param>
-	public PaymentTransaction(long contractingPartyId,
+    /// <summary>
+    /// سازنده کلاس PaymentTransaction با دریافت اطلاعات تراکنش.
+    /// </summary>
+    /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
+    /// <param name="amount">مبلغ تراکنش</param>
+    /// <param name="contractingPartyName"></param>
+    /// <param name="callBackUrl"></param>
+    public PaymentTransaction(long contractingPartyId,
         double amount,
-        string contractingPartyName,string callBackUrl,
-        PaymentTransactionGateWay gateway)
+        string contractingPartyName,string callBackUrl)
     {
         ContractingPartyId = contractingPartyId;
         Status = PaymentTransactionStatus.Pending;
         Amount = amount;
         ContractingPartyName = contractingPartyName;
         CallBackUrl = callBackUrl;
-        Gateway = gateway;
     }
 
     /// <summary>
@@ -72,23 +68,13 @@ public class PaymentTransaction:EntityBase
     public string TransactionId { get; private set; }
 
     public string CallBackUrl { get; private set; }
-    public PaymentTransactionGateWay Gateway { get; private set; }
-    public string Rrn { get; private set; }
-    public string DigitalReceipt { get; private set; }
 
-    public FinancialInvoice FinancialInvoice { get; set; }
-    public long? FinancialInvoiceId { get; set; }
-
-
-    public void SetPaid(string cardNumber,string bankName,string rrn,string digitalReceipt)
+    public void SetPaid(string cardNumber,string bankName)
     {
         Status = PaymentTransactionStatus.Success;
         TransactionDate = DateTime.Now;
         CardNumber = cardNumber;
         BankName = bankName;
-        Rrn = rrn;
-        DigitalReceipt = digitalReceipt;
-
     }
     public void SetFailed()
     {
@@ -99,5 +85,4 @@ public class PaymentTransaction:EntityBase
     {
         TransactionId = transactionId;
     }
-}
-
+}

CompanyManagement.Infrastructure.Mongo/EmployeeFaceEmbeddingRepo/EmployeeFaceEmbeddingRepository.cs

@@ -1,60 +0,0 @@
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using MongoDB.Driver;
-
-namespace CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
-
-public class EmployeeFaceEmbeddingRepository : IEmployeeFaceEmbeddingRepository
-{
-    private readonly IMongoCollection<EmployeeFaceEmbedding> _employeeFaceEmbeddings;
-
-    public EmployeeFaceEmbeddingRepository(IMongoDatabase database)
-    {
-        _employeeFaceEmbeddings = database.GetCollection<EmployeeFaceEmbedding>("EmployeeFaces");
-    }
-
-    public async Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.InsertOneAsync(employeeFaceEmbedding);
-    }
-
-    public async Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.ReplaceOneAsync(
-            x => x.Id == employeeFaceEmbedding.Id, 
-            employeeFaceEmbedding);
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByIdAsync(string id)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.Id == id)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.EmployeeId == employeeId)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.WorkshopId == workshopId)
-            .ToListAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => workshopIds.First()==x.WorkshopId)
-            .ToListAsync();
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _employeeFaceEmbeddings.DeleteOneAsync(x => x.Id == id);
-    }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDto.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingDto
-{
-    public string Id { get; set; }
-    public string EmployeeFullName { get; set; }
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-    public List<double> Embeddings { get; set; }
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDtos.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingMetadataDto
-{
-    public double AvgEyeDistanceNormalized { get; set; }
-    public double AvgEyeToFaceRatio { get; set; }
-    public double AvgFaceAspectRatio { get; set; }
-    public double AvgDetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto AvgKeypointsNormalized { get; set; }
-    public List<ImageMetadataDto> PerImageMetadata { get; set; }
-}
-
-public class EmployeeFaceEmbeddingKeypointsDto
-{
-    public double[] LeftEye { get; set; }
-    public double[] RightEye { get; set; }
-    public double[] Nose { get; set; }
-    public double[] MouthLeft { get; set; }
-    public double[] MouthRight { get; set; }
-}
-
-public class ImageMetadataDto
-{
-    public double FaceAspectRatio { get; set; }
-    public double EyeDistanceNormalized { get; set; }
-    public double EyeToFaceRatio { get; set; }
-    public double DetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto KeypointsNormalized { get; set; }
-}
-
-public class EmbeddingHistoryItemDto
-{
-    public List<double> Embedding { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-
-public class MetadataHistoryItemDto
-{
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/IEmployeeFaceEmbeddingApplication.cs

@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-/// <summary>
-/// سرویس مدیریت Embedding چهره کارکنان
-/// این سرویس فقط برای دریافت و ارسال داده است و هیچ command-driven نیست
-/// </summary>
-public interface IEmployeeFaceEmbeddingApplication
-{
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id);
-
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه کارمند
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس شناسه کارگاه
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس لیست شناسه کارگاه‌ها
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds);
-
-    /// <summary>
-    /// ذخیره یا به‌روزرسانی embedding
-    /// اگر Id وجود داشته باشد، به‌روزرسانی می‌شود، در غیر این صورت ایجاد می‌شود
-    /// </summary>
-    Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto);
-
-    /// <summary>
-    /// حذف embedding
-    /// </summary>
-    Task DeleteAsync(string id);
-}
-

CompanyManagment.App.Contracts/FinancialInvoice/CreateFinancialInvoice.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public class CreateFinancialInvoice
-{
-    public double Amount { get; set; }
-    public long ContractingPartyId { get; set; }
-    public string Description { get; set; }
-    public List<CreateFinancialInvoiceItem>? Items { get; set; }
-}
-
-public class CreateFinancialInvoiceItem
-{
-    public string Description { get; set; }
-    public double Amount { get; set; }
-    public FinancialInvoiceItemType Type { get; set; }
-    public long EntityId { get; set; }
-}

CompanyManagment.App.Contracts/FinancialInvoice/EditFinancialInvoice.cs

@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public class EditFinancialInvoice
-{
-    public long Id { get; set; }
-    public string InvoiceNumber { get; set; }
-    public string Description { get; set; }
-    public double Amount { get; set; }
-    public FinancialInvoiceStatus Status  { get; set; }
-    
-    public List<EditFinancialInvoiceItem>? Items { get; set; }
-}
-
-public class EditFinancialInvoiceItem
-{
-    public long Id { get; set; }
-    public string Description { get; set; }
-    public double Amount { get; set; }
-    public FinancialInvoiceItemType Type { get; set; }
-    public long EntityId { get; set; }
-}

CompanyManagment.App.Contracts/FinancialInvoice/FinancialInvoiceItemType.cs

@@ -1,25 +0,0 @@
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public enum FinancialInvoiceItemType
-{
-	/// <summary>
-	/// قسط قرارداد خرید از موسسه
-	/// </summary>
-	BuyInstitutionContractInstallment,
-	/// <summary>
-	/// خرید قرارداد از موسسه
-	/// </summary>
-	BuyInstitutionContract,
-	/// <summary>
-	///قسط ارتقا قرارداد موسسه
-	/// </summary>
-	AmendmentInstitutionContractInstallment,
-	/// <summary>
-	/// ارتقا قرارداد موسسه
-	/// </summary>
-	AmendmentInstitutionContract,
-	/// <summary>
-	/// بدهی قبلی
-	/// </summary>
-	PreviousDebt,
-}

CompanyManagment.App.Contracts/FinancialInvoice/FinancialInvoiceSearchModel.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public class FinancialInvoiceSearchModel
-{
-    public string? Description { get; set; }
-    public FinancialInvoiceStatus? Status { get; set; }
-    public long? ContractingPartyId { get; set; }
-    public string? FromDate { get; set; }
-    public string? ToDate { get; set; }
-    public double? MinAmount { get; set; }
-    public double? MaxAmount { get; set; }
-}

CompanyManagment.App.Contracts/FinancialInvoice/FinancialInvoiceStatus.cs

@@ -1,21 +0,0 @@
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public enum FinancialInvoiceStatus
-{
-    /// <summary>
-    /// پرداخت نشده
-    /// </summary>
-    Unpaid = 0,
-    /// <summary>
-    /// پرداخت شده کامل
-    /// </summary>
-    Paid = 1,
-    /// <summary>
-    /// فاکتور لغو شده
-    /// </summary>
-    Cancelled = 4,
-    /// <summary>
-    /// // بازپرداخت شده (در صورت برگشت وجه)
-    /// </summary>
-    Refunded = 5,
-}

CompanyManagment.App.Contracts/FinancialInvoice/FinancialInvoiceViewModel.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public class FinancialInvoiceViewModel
-{
-    public long Id { get; set; }
-    public string InvoiceNumber { get; set; }
-    public string Description { get; set; }
-    public string Status { get; set; }
-    public string PaidAt { get; set; }
-    public double Amount { get; set; }
-    public Guid PublicId { get; set; }
-    public long ContractingPartyId { get; set; }
-    public string ContractingPartyName { get; set; }
-    public string CreationDate { get; set; }
-    public int ItemsCount { get; set; }
-}

CompanyManagment.App.Contracts/FinancialInvoice/IFinancialInvoiceApplication.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.FinancialInvoice;
-
-public interface IFinancialInvoiceApplication
-{
-    OperationResult Create(CreateFinancialInvoice command);
-    OperationResult Edit(EditFinancialInvoice command);
-    OperationResult SetPaid(long id, DateTime paidAt);
-    OperationResult SetUnpaid(long id);
-    OperationResult SetCancelled(long id);
-    OperationResult SetRefunded(long id);
-    EditFinancialInvoice GetDetails(long id);
-    List<FinancialInvoiceViewModel> Search(FinancialInvoiceSearchModel searchModel);
-}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionVerificationDetailsWorkshopsViewModel.cs

@@ -4,6 +4,8 @@ public class GetInstitutionVerificationDetailsWorkshopsViewModel
 {
     public string Name { get; set; }
     public int PersonnelCount { get; set; }
+    
+    public WorkshopServicesViewModel OldServices { get; set; }
     public WorkshopServicesViewModel Services { get; set; }
     public string Price { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -213,7 +213,7 @@ public interface IInstitutionContractApplication
     
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<OperationResult<OtpResultViewModel>> SendVerifyOtp(Guid id);
-    Task<OperationResult<string>> VerifyOtpAndMakeGateway(Guid publicId, string code, string callbackUrl);
+    Task<OperationResult> VerifyOtp(Guid publicId, string code);
     Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId);
 
     #region Extension
@@ -244,7 +244,7 @@ public interface IInstitutionContractApplication
     #endregion
 
     Task<OperationResult> ResendVerifyLink(long institutionContractId);
-
+    Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request);
     /// <summary>
     /// دیتای پرینت قرارداد مالی
     /// </summary>
@@ -252,7 +252,33 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId);
+}
+
+public class GetInstitutionAmendmentVerificationDetailsViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string AmendmentCreationDate { get; set; }
+    public string AmendmentStart { get; set; }
+    public string AmendmentEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public List<InstitutionContractInstallmentViewModel> Installments { get; set; }
+    public bool IsInstallment { get; set; }
+    
+}
+
+public class InstitutionContractAmendmentCompleteRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+    public long LawId { get; set; }
+
+
 }
 
 public class InstitutionContractPrintViewModel

CompanyManagment.App.Contracts/InstitutionContract/InsitutionContractAmendmentPaymentResponse.cs

@@ -1,11 +1,28 @@
+using System.Collections.Generic;
+
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 public class InsitutionContractAmendmentPaymentResponse
 {
+    public List<InsitutionContractAmendmentPaymentWorkshopResponse> workshops { get; set; }
     public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
     public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }
     public string OneMonthAmount { get; set; }
     public string TotalAmount { get; set; }
+}
+
+public class InsitutionContractAmendmentPaymentWorkshopResponse
+{
+    public string WorkshopName { get; set; }
+    public WorkshopServicesViewModel OldServices { get; set; }
+    public WorkshopServicesViewModel NewServices { get; set; }
+
+    public bool IsNewWorkshop { get; set; }
+
+    public int PrevPersonnelCount { get; set; }
+    public int NewPersonnelCount { get; set; }
+
+    public double Price { get; set; }
 }

CompanyManagment.App.Contracts/PaymentTransaction/CreatePaymentTransaction.cs

@@ -17,14 +17,4 @@ public class CreatePaymentTransaction
     /// مسیر برگشت پس از پرداخت
     /// </summary>
     public string CallBackUrl { get; set; }
-
-    /// <summary>
-    /// نوع درگاه
-    /// </summary>
-    public PaymentTransactionGateWay Gateway { get; set; }
-}
-public enum PaymentTransactionGateWay
-{
-	AqayePardakht = 1,
-	SepehrPay = 2
 }

CompanyManagment.App.Contracts/PaymentTransaction/IPaymentTransactionApplication.cs

@@ -49,7 +49,7 @@ public interface IPaymentTransactionApplication
     /// <param name="cardNumber"></param>
     /// <param name="bankName"></param>
     /// <returns></returns>
-    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName, string rrn, string digitalReceipt);
+    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName);
 
     Task<OperationResult> SetTransactionId(long id, string transactionId);
 }

CompanyManagment.Application/EmployeeFaceEmbeddingApplication.cs

@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-namespace CompanyManagment.Application;
-
-public class EmployeeFaceEmbeddingApplication : IEmployeeFaceEmbeddingApplication
-{
-    private readonly IEmployeeFaceEmbeddingRepository _repository;
-
-    public EmployeeFaceEmbeddingApplication(IEmployeeFaceEmbeddingRepository repository)
-    {
-        _repository = repository;
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id)
-    {
-        var entity = await _repository.GetByIdAsync(id);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId)
-    {
-        var entity = await _repository.GetByEmployeeIdAsync(employeeId);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId)
-    {
-        var entities = await _repository.GetByWorkshopIdAsync(workshopId);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        var entities = await _repository.GetByWorkshopIdsAsync(workshopIds);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto)
-    {
-        if (string.IsNullOrWhiteSpace(dto.Id))
-        {
-            // ایجاد جدید
-            var metadata = MapMetadataFromDto(dto.Metadata);
-            var entity = new EmployeeFaceEmbedding(
-                dto.EmployeeFullName,
-                dto.EmployeeId,
-                dto.WorkshopId,
-                dto.Embeddings,
-                metadata
-            );
-
-            await _repository.CreateAsync(entity);
-            return entity.Id;
-        }
-        else
-        {
-            // به‌روزرسانی
-            var entity = await _repository.GetByIdAsync(dto.Id);
-            if (entity == null)
-                throw new Exception($"EmployeeFaceEmbedding با شناسه {dto.Id} یافت نشد");
-
-            entity.UpdateEmployeeInfo(dto.EmployeeFullName, dto.WorkshopId);
-            entity.UpdateEmbedding(dto.Embeddings, 0, 0);
-            entity.UpdateMetadata(MapMetadataFromDto(dto.Metadata), 0, 0);
-
-            await _repository.UpdateAsync(entity);
-            return entity.Id;
-        }
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _repository.DeleteAsync(id);
-    }
-
-    #region Mapping Methods
-
-    private EmployeeFaceEmbeddingDto MapToDto(EmployeeFaceEmbedding entity)
-    {
-        return new EmployeeFaceEmbeddingDto
-        {
-            Id = entity.Id,
-            EmployeeFullName = entity.EmployeeFullName,
-            EmployeeId = entity.EmployeeId,
-            WorkshopId = entity.WorkshopId,
-            Embeddings = entity.Embeddings,
-            Metadata = MapMetadataToDto(entity.Metadata)
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadataDto MapMetadataToDto(EmployeeFaceEmbeddingMetadata metadata)
-    {
-        if (metadata == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadataDto
-        {
-            AvgEyeDistanceNormalized = metadata.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = metadata.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = metadata.AvgFaceAspectRatio,
-            AvgDetectionConfidence = metadata.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsToDto(metadata.AvgKeypointsNormalized),
-            PerImageMetadata = metadata.PerImageMetadata?.Select(x => new ImageMetadataDto
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsToDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypointsDto MapKeypointsToDto(EmployeeFaceEmbeddingKeypoints keypoints)
-    {
-        if (keypoints == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypointsDto
-        {
-            LeftEye = keypoints.LeftEye,
-            RightEye = keypoints.RightEye,
-            Nose = keypoints.Nose,
-            MouthLeft = keypoints.MouthLeft,
-            MouthRight = keypoints.MouthRight
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadata MapMetadataFromDto(EmployeeFaceEmbeddingMetadataDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadata
-        {
-            AvgEyeDistanceNormalized = dto.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = dto.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = dto.AvgFaceAspectRatio,
-            AvgDetectionConfidence = dto.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsFromDto(dto.AvgKeypointsNormalized),
-            PerImageMetadata = dto.PerImageMetadata?.Select(x => new ImageMetadata
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsFromDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypoints MapKeypointsFromDto(EmployeeFaceEmbeddingKeypointsDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypoints
-        {
-            LeftEye = dto.LeftEye,
-            RightEye = dto.RightEye,
-            Nose = dto.Nose,
-            MouthLeft = dto.MouthLeft,
-            MouthRight = dto.MouthRight
-        };
-    }
-
-    #endregion
-}
-

CompanyManagment.Application/FinancialInvoiceApplication.cs

@@ -1,214 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
-using _0_Framework.InfraStructure;
-using Company.Domain.FinancialInvoiceAgg;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-using CompanyManagment.EFCore;
-
-namespace CompanyManagment.Application;
-
-public class FinancialInvoiceApplication : RepositoryBase<long, FinancialInvoice>, IFinancialInvoiceApplication
-{
-    private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
-    private readonly CompanyContext _context;
-
-    public FinancialInvoiceApplication(IFinancialInvoiceRepository financialInvoiceRepository, CompanyContext context) : base(context)
-    {
-        _financialInvoiceRepository = financialInvoiceRepository;
-        _context = context;
-    }
-
-    public OperationResult Create(CreateFinancialInvoice command)
-    {
-        var operation = new OperationResult();
-
-        if (command.Amount <= 0)
-            return operation.Failed("مبلغ فاکتور باید بزرگتر از صفر باشد");
-
-        if (command.ContractingPartyId <= 0)
-            return operation.Failed("طرف قرارداد نامعتبر است");
-
-        if (string.IsNullOrWhiteSpace(command.Description))
-            return operation.Failed("توضیحات فاکتور الزامی است");
-
-        var financialInvoice = new FinancialInvoice(command.Amount, command.ContractingPartyId, command.Description);
-
-        if (command.Items != null && command.Items.Any())
-        {
-            foreach (var item in command.Items)
-            {
-                if (string.IsNullOrWhiteSpace(item.Description))
-                    return operation.Failed("توضیحات آیتم الزامی است");
-
-                if (item.Amount <= 0)
-                    return operation.Failed("مبلغ آیتم باید بزرگتر از صفر باشد");
-
-                var invoiceItem = new FinancialInvoiceItem(item.Description, item.Amount, 
-                    financialInvoice.id, item.Type, item.EntityId);
-                
-                financialInvoice.AddItem(invoiceItem);
-            }
-        }
-
-        _financialInvoiceRepository.Create(financialInvoice);
-        _financialInvoiceRepository.SaveChanges();
-
-        return operation.Succcedded();
-    }
-
-    public OperationResult Edit(EditFinancialInvoice command)
-    {
-        var operation = new OperationResult();
-        var financialInvoice = _financialInvoiceRepository.Get(command.Id);
-
-        if (financialInvoice == null)
-            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-        if (financialInvoice.Status == FinancialInvoiceStatus.Paid)
-            return operation.Failed("امکان ویرایش فاکتور پرداخت شده وجود ندارد");
-
-        if (string.IsNullOrWhiteSpace(command.Description))
-            return operation.Failed("توضیحات فاکتور الزامی است");
-
-        // Update description
-        financialInvoice.Description = command.Description;
-
-        // Update items if provided
-        if (command.Items != null)
-        {
-            // Clear existing items
-            if (financialInvoice.Items != null)
-            {
-                financialInvoice.Items.Clear();
-            }
-            else
-            {
-                financialInvoice.SetItems([]);
-            }
-
-            // Add updated items
-            foreach (var item in command.Items)
-            {
-                if (string.IsNullOrWhiteSpace(item.Description))
-                    return operation.Failed("توضیحات آیتم الزامی است");
-
-                if (item.Amount <= 0)
-                    return operation.Failed("مبلغ آیتم باید بزرگتر از صفر باشد");
-
-                var invoiceItem = new FinancialInvoiceItem(item.Description, item.Amount,
-                    financialInvoice.id, item.Type, item.EntityId);
-                
-                financialInvoice.AddItem(invoiceItem);
-            }
-        }
-
-        _financialInvoiceRepository.SaveChanges();
-        return operation.Succcedded();
-    }
-
-    public OperationResult SetPaid(long id, DateTime paidAt)
-    {
-        var operation = new OperationResult();
-        var financialInvoice = _financialInvoiceRepository.Get(id);
-
-        if (financialInvoice == null)
-            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-        if (financialInvoice.Status == FinancialInvoiceStatus.Paid)
-            return operation.Failed("فاکتور قبلاً پرداخت شده است");
-
-        if (financialInvoice.Status == FinancialInvoiceStatus.Cancelled)
-            return operation.Failed("امکان پرداخت فاکتور لغو شده وجود ندارد");
-
-        financialInvoice.SetPaid(paidAt);
-        _financialInvoiceRepository.SaveChanges();
-
-        return operation.Succcedded();
-    }
-
-    public OperationResult SetUnpaid(long id)
-    {
-        var operation = new OperationResult();
-        var financialInvoice = _financialInvoiceRepository.Get(id);
-
-        if (financialInvoice == null)
-            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-        financialInvoice.SetUnpaid();
-        _financialInvoiceRepository.SaveChanges();
-
-        return operation.Succcedded();
-    }
-
-    public OperationResult SetCancelled(long id)
-    {
-        var operation = new OperationResult();
-        var financialInvoice = _financialInvoiceRepository.Get(id);
-
-        if (financialInvoice == null)
-            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-        if (financialInvoice.Status == FinancialInvoiceStatus.Paid)
-            return operation.Failed("امکان لغو فاکتور پرداخت شده وجود ندارد");
-
-        financialInvoice.SetCancelled();
-        _financialInvoiceRepository.SaveChanges();
-
-        return operation.Succcedded();
-    }
-
-    public OperationResult SetRefunded(long id)
-    {
-        var operation = new OperationResult();
-        var financialInvoice = _financialInvoiceRepository.Get(id);
-
-        if (financialInvoice == null)
-            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-        if (financialInvoice.Status != FinancialInvoiceStatus.Paid)
-            return operation.Failed("فقط فاکتورهای پرداخت شده قابل بازپرداخت هستند");
-
-        financialInvoice.SetRefunded();
-        _financialInvoiceRepository.SaveChanges();
-
-        return operation.Succcedded();
-    }
-
-    public EditFinancialInvoice GetDetails(long id)
-    {
-        return _financialInvoiceRepository.GetDetails(id);
-    }
-
-    public List<FinancialInvoiceViewModel> Search(FinancialInvoiceSearchModel searchModel)
-    {
-        return _financialInvoiceRepository.Search(searchModel);
-    }
-
-    //public OperationResult Remove(long id)
-    //{
-    //    var operation = new OperationResult();
-        
-    //    try
-    //    {
-    //        var financialInvoice = _financialInvoiceRepository.Get(id);
-            
-    //        if (financialInvoice == null)
-    //            return operation.Failed("فاکتور مورد نظر یافت نشد");
-
-    //        if (financialInvoice.Status == FinancialInvoiceStatus.Paid)
-    //            return operation.Failed("امکان حذف فاکتور پرداخت شده وجود ندارد");
-
-    //        // Remove the entity using the context directly since Remove method might not be available
-    //        _context.FinancialInvoiceSet.Remove(financialInvoice);
-    //        _financialInvoiceRepository.SaveChanges();
-            
-    //        return operation.Succcedded();
-    //    }
-    //    catch (Exception ex)
-    //    {
-    //        return operation.Failed("خطا در حذف فاکتور");
-    //    }
-    //}
-}

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -2,12 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Enums;
-using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Application.Sms;
 using _0_Framework.Application.UID;
 using _0_Framework.Exceptions;
@@ -15,20 +13,16 @@ using AccountManagement.Application.Contracts.Account;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.empolyerAgg;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.LeftWorkAgg;
-using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
-using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
-using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.EFCore.Migrations;
@@ -56,9 +50,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IAccountApplication _accountApplication;
     private readonly ISmsService _smsService;
     private readonly IUidService _uidService;
-    private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
-    private readonly IPaymentGateway _paymentGateway;
-    private readonly IPaymentTransactionRepository _paymentTransactionRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -68,8 +59,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IFinancialStatmentApplication financialStatmentApplication, IWorkshopApplication workshopApplication,
         IContractingPartyTempRepository contractingPartyTempRepository,
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
-        IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
-        IFinancialInvoiceRepository financialInvoiceRepository,IHttpClientFactory httpClientFactory, IPaymentTransactionRepository paymentTransactionRepository)
+        IAccountApplication accountApplication, ISmsService smsService, IUidService uidService)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -85,9 +75,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _accountApplication = accountApplication;
         _smsService = smsService;
         _uidService = uidService;
-        _financialInvoiceRepository = financialInvoiceRepository;
-        _paymentTransactionRepository = paymentTransactionRepository;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
     }
 
     public OperationResult Create(CreateInstitutionContract command)
@@ -1073,16 +1060,11 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             await _financialStatmentRepository.CreateAsync(financialStatement);
         }
 
-        double invoiceAmount;
-        string invoiceItemDescription;
-        FinancialInvoiceItemType invoiceItemType;
-        long invoiceItemEntityId;
-		if (command.IsInstallment)
+        if (command.IsInstallment)
         {
             var installments =
                 CalculateInstallment(command.TotalAmount, (int)command.Duration, command.ContractStartFa, true);
 
-
             // دریافت مبلغ اولین قسط
             //این کار برای این هست که اولین قسط باید با تاریخ امروز باشد و باید به وضعیت مالی بدهی ایجاد شود که یوزر اولین بدهی را وارد کند
             var firstInstallmentAmount = installments.First().Amount;
@@ -1093,41 +1075,25 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             // ایجاد قسط جدید با تاریخ امروز 
             var todayInstallment = new InstitutionContractInstallment(DateTime.Today, firstInstallmentAmount, "");
 
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
+
+            financialStatement.AddFinancialTransaction(financialTransaction);
 
             // اضافه کردن قسط جدید به ابتدای لیست
             installments.Insert(0, todayInstallment);
 
             entity.SetInstallments(installments);
-
-            await _institutionContractRepository.SaveChangesAsync();
-
-            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-	            "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
-
-            financialStatement.AddFinancialTransaction(financialTransaction);
-            invoiceAmount = firstInstallmentAmount;
-            invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {entity.ContractNo}";
-            invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-            invoiceItemEntityId = todayInstallment.Id;
         }
         else
         {
             var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
                 "پرداخت کل سرویس", "debt", "بابت خدمات", command.TotalAmount, 0, 0);
             financialStatement.AddFinancialTransaction(financialTransaction);
-            invoiceAmount = command.TotalAmount;
-            invoiceItemDescription = $"پرداخت کل قرارداد شماره {entity.ContractNo}";
-            invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
-            invoiceItemEntityId = entity.id;
-		}
-
-        var financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {entity.ContractNo}");
-        var financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0,invoiceItemType, invoiceItemEntityId);
-		financialInvoice.AddItem(financialInvoiceItem);
+        }
 
 
-        await _financialInvoiceRepository.CreateAsync(financialInvoice);
-		await _institutionContractRepository.CreateAsync(entity);
+        await _institutionContractRepository.CreateAsync(entity);
         await _institutionContractRepository.SaveChangesAsync();
 
         var mainContactInfo = new CreateContactInfo
@@ -1266,9 +1232,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return new OperationResult<OtpResultViewModel>().Succcedded(result);
     }
 
-    public async Task<OperationResult<string>> VerifyOtpAndMakeGateway(Guid publicId, string code,string callbackUrl)
+    public async Task<OperationResult> VerifyOtp(Guid publicId, string code)
     {
-        var op = new OperationResult<string>();
+        var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetByPublicIdAsync(publicId);
         if (institutionContract == null)
         {
@@ -1289,67 +1255,32 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (institutionContract.VerifyCode != code)
             return op.Failed("کد وارد شده صحیح نمی باشد");
 
-        var dbTransaction = await _institutionContractRepository.BeginTransactionAsync();
+        var transaction = await _institutionContractRepository.BeginTransactionAsync();
+        institutionContract.SetPendingWorkflow();
 
-        long entityId = 0;
-        FinancialInvoiceItemType financialInvoiceItemType;
-        if (institutionContract.IsInstallment)
+        var phone = institutionContract.ContactInfoList.FirstOrDefault(x =>
+            x.SendSms && x.Position == "طرف قرارداد" && x.PhoneType == "شماره همراه");
+        if (phone !=null)
         {
-            entityId = institutionContract.Installments.MinBy(x => x.InstallmentDateGr).Id;
-            financialInvoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-        }
-        else
-        {
-            entityId = institutionContract.id;
-            financialInvoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
+            var userPass = contractingParty.IsLegal == "حقیقی"
+                ? contractingParty.Nationalcode
+                : contractingParty.NationalId;
+            var createAcc = new RegisterAccount
+            {
+                Fullname = contractingParty.LName,
+                Username = userPass,
+                Password = userPass,
+                Mobile = phone.PhoneNumber,
+                NationalCode = userPass
+            };
+            var res = _accountApplication.RegisterClient(createAcc);
+            if (res.IsSuccedded) 
+                CreateContractingPartyAccount(contractingParty.id, res.SendId);
         }
 
-        var financialInvoice =await _financialInvoiceRepository.GetUnPaidByEntityId(entityId, financialInvoiceItemType);
-        var amount = financialInvoice.Amount;
-        
-        var transaction = new PaymentTransaction(institutionContract.ContractingPartyId, amount,
-            institutionContract.ContractingPartyName, "https://client.gozareshgir.ir",
-            PaymentTransactionGateWay.SepehrPay);
-        await _paymentTransactionRepository.CreateAsync(transaction);
-        await _financialInvoiceRepository.SaveChangesAsync();
-
-        var createPayment = new CreatePaymentGatewayRequest()
-        {
-            Amount = amount,
-            TransactionId = transaction.id.ToString(),
-            CallBackUrl = callbackUrl,
-            FinancialInvoiceId = financialInvoice.id,
-        };
-        var gatewayResponse = await _paymentGateway.Create(createPayment);
-        if(!gatewayResponse.IsSuccess)
-            return op.Failed("خطا در ایجاد درگاه پرداخت: " + gatewayResponse.Message + gatewayResponse.ErrorCode);
-        
-
-        // institutionContract.SetPendingWorkflow();
-        //
-        // var phone = institutionContract.ContactInfoList.FirstOrDefault(x =>
-        //     x.SendSms && x.Position == "طرف قرارداد" && x.PhoneType == "شماره همراه");
-        // if (phone !=null)
-        // {
-        //     var userPass = contractingParty.IsLegal == "حقیقی"
-        //         ? contractingParty.Nationalcode
-        //         : contractingParty.NationalId;
-        //     var createAcc = new RegisterAccount
-        //     {
-        //         Fullname = contractingParty.LName,
-        //         Username = userPass,
-        //         Password = userPass,
-        //         Mobile = phone.PhoneNumber,
-        //         NationalCode = userPass
-        //     };
-        //     var res = _accountApplication.RegisterClient(createAcc);
-        //     if (res.IsSuccedded) 
-        //         CreateContractingPartyAccount(contractingParty.id, res.SendId);
-        // }
-
-        await dbTransaction.CommitAsync();
+        await transaction.CommitAsync();
         await _institutionContractRepository.SaveChangesAsync();
-        return op.Succcedded(gatewayResponse.Token);
+        return op.Succcedded();
     }
 
     public async Task<InstitutionContractWorkshopDetailViewModel> GetWorkshopInitialDetails(long workshopDetailsId)
@@ -1456,22 +1387,14 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public async Task<OperationResult> SetPendingWorkflow(long entityId)
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id, long amendmentId)
     {
-        var op = new OperationResult();
-        var institutionContract = _institutionContractRepository.Get(entityId);
-        if (institutionContract == null)
-        {
-            return op.Failed("قرارداد مالی یافت نشد");
-        }
+        return await _institutionContractRepository.GetAmendmentVerificationDetails(id,amendmentId);
+    }
 
-        if (institutionContract.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
-        {
-            return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
-        }
-        institutionContract.SetPendingWorkflow();
-        await _institutionContractRepository.SaveChangesAsync();
-        return op.Succcedded();
+    public async Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request)
+    {
+        await _institutionContractRepository.AmendmentComplete(request);
     }
 
 

CompanyManagment.Application/PaymentTransactionApplication.cs

@@ -50,7 +50,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
             command.ContractingPartyId,
             command.Amount,
             contractingPartyName,
-            command.CallBackUrl,command.Gateway);
+            command.CallBackUrl);
 
         await _paymentTransactionRepository.CreateAsync(entity);
         await _paymentTransactionRepository.SaveChangesAsync();
@@ -87,7 +87,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         return op.Succcedded();
     }
 
-    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName, string rrn, string digitalReceipt)
+    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName)
     {
         var op = new OperationResult();
 
@@ -97,7 +97,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         {
             return op.Failed("تراکنش مورد نظر یافت نشد");
         }
-        paymentTransaction.SetPaid(cardNumber, bankName,rrn, digitalReceipt);
+        paymentTransaction.SetPaid(cardNumber, bankName);
         _paymentTransactionRepository.SaveChanges();
 
         return op.Succcedded();

CompanyManagment.EFCore/CompanyContext.cs

@@ -45,7 +45,6 @@ using Company.Domain.FileEmployerAgg;
 using Company.Domain.FileState;
 using Company.Domain.FileTiming;
 using Company.Domain.FileTitle;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.FineAgg;
@@ -205,13 +204,12 @@ public class CompanyContext : DbContext
     
     public DbSet<AuthorizedBankDetails> AuthorizedBankDetails { get; set; }
     
-    public DbSet<FinancialInvoice> FinancialInvoices { get; set; }
+    
+    #endregion
 
-	#endregion
+    #region Pooya
 
-	#region Pooya
-
-	public DbSet<EmployeeDocumentItem> EmployeeDocumentItems { get; set; }
+    public DbSet<EmployeeDocumentItem> EmployeeDocumentItems { get; set; }
     public DbSet<EmployeeDocuments> EmployeeDocuments { get; set; }
 
     public DbSet<WorkshopSubAccount> WorkshopSubAccounts { get; set; }

CompanyManagment.EFCore/CompanyManagment.EFCore.csproj

@@ -13,7 +13,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="16.11.230815" />
     <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
-    <PackageReference Include="Parbad.Gateway.Sepehr" Version="1.7.0" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
   </ItemGroup>
 

CompanyManagment.EFCore/Mapping/FinancialInvoiceItemMapping.cs

@@ -1,17 +0,0 @@
-using Company.Domain.FinancialInvoiceAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class FinancialInvoiceItemMapping : IEntityTypeConfiguration<FinancialInvoiceItem>
-{
-	public void Configure(EntityTypeBuilder<FinancialInvoiceItem> builder)
-	{
-		builder.Property(x=>x.Description).HasMaxLength(800);
-		builder.Property(x => x.Type).HasConversion<string>().HasMaxLength(50);
-
-		builder.HasOne(x => x.FinancialInvoice).WithMany(x => x.Items)
-			.HasForeignKey(x => x.FinancialInvoiceId);
-	}
-}

CompanyManagment.EFCore/Mapping/FinancialInvoiceMapping.cs

@@ -1,25 +0,0 @@
-using Company.Domain.FinancialInvoiceAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class FinancialInvoiceMapping:IEntityTypeConfiguration<FinancialInvoice>
-{
-    public void Configure(EntityTypeBuilder<FinancialInvoice> builder)
-    {
-        builder.HasKey(x => x.id);
-
-        builder.Property(x => x.Status).HasConversion<string>().HasMaxLength(20);
-        builder.Property(x => x.PaidAt).IsRequired(false);
-        builder.Property(x => x.Description).HasMaxLength(800);
-        builder.Property(x => x.InvoiceNumber).HasMaxLength(22);
-        
-        builder.HasMany(x => x.Items).WithOne(x => x.FinancialInvoice)
-            .HasForeignKey(x => x.FinancialInvoiceId).IsRequired().OnDelete(DeleteBehavior.Cascade);
-		builder.HasMany(x => x.PaymentTransactions).WithOne(x => x.FinancialInvoice)
-            .HasForeignKey(x => x.FinancialInvoiceId).IsRequired(false).OnDelete(DeleteBehavior.NoAction);
-
-
-    }
-}

CompanyManagment.EFCore/Mapping/FinancialTransactionMapping.cs

@@ -14,7 +14,7 @@ public class FinancialTransactionMapping : IEntityTypeConfiguration<FinancialTra
         builder.Property(x => x.TdateFa);
         builder.Property(x => x.TdateFa).HasMaxLength(10);
         builder.Property(x => x.TypeOfTransaction).HasMaxLength(10);
-        builder.Property(x => x.DescriptionOption).HasMaxLength(100);
+        builder.Property(x => x.DescriptionOption).HasMaxLength(50);
         builder.Property(x => x.Description).HasMaxLength(600);
         builder.Property(x => x.Deptor);
         builder.Property(x => x.Creditor);

CompanyManagment.EFCore/Mapping/InstitutionContractAmendmentMapping.cs

@@ -14,6 +14,8 @@ public class InstitutionContractAmendmentMapping:IEntityTypeConfiguration<Instit
         builder.Property(x => x.VerifyCode).HasMaxLength(10);
         builder.Property(x => x.VerifierFullName).HasMaxLength(100);
         builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
+        
+        builder.Property(x=>x.VerificationStatus).HasConversion<string>().HasMaxLength(50);
 
         builder.HasOne(x => x.InstitutionContract)
             .WithMany(x => x.Amendments)

CompanyManagment.EFCore/Mapping/PaymentTransactionMapping.cs

@@ -15,12 +15,8 @@ public class PaymentTransactionMapping:IEntityTypeConfiguration<PaymentTransacti
         builder.Property(x => x.CardNumber).HasMaxLength(25);
         builder.Property(x => x.BankName).HasMaxLength(50);
         builder.Property(x => x.Status).HasConversion<string>().HasMaxLength(35);
-        builder.Property(x => x.Gateway).HasConversion<string>().HasMaxLength(35);
         builder.Property(x => x.ContractingPartyName).HasMaxLength(255);
         builder.Property(x => x.CallBackUrl).HasMaxLength(500);
-        builder.Property(x => x.Rrn).HasMaxLength(50);
-        builder.Property(x => x.DigitalReceipt).HasMaxLength(50);
-        
 
     }
 }

CompanyManagment.EFCore/Migrations/20250715100203_Add financialInvoiceTable.cs

@@ -1,52 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddfinancialInvoiceTable : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "FinancialInvoice",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Month = table.Column<int>(type: "int", nullable: false),
-                    Year = table.Column<int>(type: "int", nullable: false),
-                    Status = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: false),
-                    PaidAt = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    Amount = table.Column<double>(type: "float", nullable: false),
-                    SmsCode = table.Column<string>(type: "nvarchar(122)", maxLength: 122, nullable: true),
-                    FinancialStatementId = table.Column<long>(type: "bigint", nullable: true),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_FinancialInvoice", x => x.id);
-                    table.ForeignKey(
-                        name: "FK_FinancialInvoice_FinancialStatments_FinancialStatementId",
-                        column: x => x.FinancialStatementId,
-                        principalTable: "FinancialStatments",
-                        principalColumn: "id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FinancialInvoice_FinancialStatementId",
-                table: "FinancialInvoice",
-                column: "FinancialStatementId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "FinancialInvoice");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251027112040_Add IsAmendment in institutioncontractWorkshopDetials.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251112143907_addGateways in transaction ")]
-    partial class addGatewaysintransaction
+    [Migration("20251027112040_Add IsAmendment in institutioncontractWorkshopDetials")]
+    partial class AddIsAmendmentininstitutioncontractWorkshopDetials
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3291,6 +3258,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3330,6 +3302,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3345,6 +3320,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3354,8 +3332,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3422,6 +3400,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3487,6 +3468,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4993,11 +4977,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7252,17 +7231,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10782,11 +10750,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251027112040_Add IsAmendment in institutioncontractWorkshopDetials.cs

@@ -0,0 +1,83 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIsAmendmentininstitutioncontractWorkshopDetials : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "WorkshopDetailsId",
+                table: "InstitutionContractAmendmentChange",
+                newName: "CurrentWorkshopId");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopInitials",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopCurrents",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<string>(
+                name: "VerificationStatus",
+                table: "InstitutionContractAmendments",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasRollCallInPerson",
+                table: "InstitutionContractAmendmentChange",
+                type: "bit",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "PersonnelCountDifference",
+                table: "InstitutionContractAmendmentChange",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopInitials");
+
+            migrationBuilder.DropColumn(
+                name: "IsAmendment",
+                table: "InstitutionContractWorkshopCurrents");
+
+            migrationBuilder.DropColumn(
+                name: "VerificationStatus",
+                table: "InstitutionContractAmendments");
+
+            migrationBuilder.DropColumn(
+                name: "HasRollCallInPerson",
+                table: "InstitutionContractAmendmentChange");
+
+            migrationBuilder.DropColumn(
+                name: "PersonnelCountDifference",
+                table: "InstitutionContractAmendmentChange");
+
+            migrationBuilder.RenameColumn(
+                name: "CurrentWorkshopId",
+                table: "InstitutionContractAmendmentChange",
+                newName: "WorkshopDetailsId");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20251106075529_institutioncontractAmendment law id.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251117140111_add invoice number")]
-    partial class addinvoicenumber
+    [Migration("20251106075529_institutioncontractAmendment law id")]
+    partial class institutioncontractAmendmentlawid
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -2830,86 +2797,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("File_Titles", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<long>("ContractingPartyId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<string>("InvoiceNumber")
-                        .HasMaxLength(18)
-                        .HasColumnType("nvarchar(18)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<DateTime?>("PaidAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("PublicId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("FinancialInvoices");
-                });
-
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<long>("EntityId")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("FinancialInvoiceId");
-
-                    b.ToTable("FinancialInvoiceItem");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Property<long>("id")
@@ -3366,11 +3253,17 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasColumnType("bigint");
 
                     b.Property<long>("LawId")
-                        .HasColumnType("bigint");
+                        .HasColumnType("bigint")
+                        .HasColumnName("LawId");
 
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3410,6 +3303,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3425,6 +3321,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3434,8 +3333,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3502,6 +3401,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3567,6 +3469,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -5073,22 +4978,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<long?>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -5103,8 +4992,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("FinancialInvoiceId");
-
                     b.ToTable("PaymentTransactions", (string)null);
                 });
 
@@ -7345,17 +7232,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10038,17 +9914,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileTiming");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("Items")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialTransactionAgg.FinancialTransaction", b =>
                 {
                     b.HasOne("Company.Domain.FinancialStatmentAgg.FinancialStatment", "FinancialStatment")
@@ -10596,16 +10461,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PaymentToEmployee");
                 });
 
-            modelBuilder.Entity("Company.Domain.PaymentTransactionAgg.PaymentTransaction", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("PaymentTransactions")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.NoAction);
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.PenaltyTitle.PenaltyTitle", b =>
                 {
                     b.HasOne("Company.Domain.Petition.Petition", "Petition")
@@ -10896,11 +10751,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");
@@ -11010,13 +10860,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileStates");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Navigation("Items");
-
-                    b.Navigation("PaymentTransactions");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Navigation("FinancialTransactionList");

CompanyManagment.EFCore/Migrations/20251106075529_institutioncontractAmendment law id.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class institutioncontractAmendmentlawid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20251106075938_ignore law id.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251117163856_change descriptionOption max length")]
-    partial class changedescriptionOptionmaxlength
+    [Migration("20251106075938_ignore law id")]
+    partial class ignorelawid
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -2830,86 +2797,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("File_Titles", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<long>("ContractingPartyId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<string>("InvoiceNumber")
-                        .HasMaxLength(22)
-                        .HasColumnType("nvarchar(22)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<DateTime?>("PaidAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("PublicId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("FinancialInvoices");
-                });
-
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<long>("EntityId")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("FinancialInvoiceId");
-
-                    b.ToTable("FinancialInvoiceItem");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Property<long>("id")
@@ -2961,8 +2848,8 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasColumnType("nvarchar(600)");
 
                     b.Property<string>("DescriptionOption")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<long>("FinancialStatementId")
                         .HasColumnType("bigint");
@@ -3365,12 +3252,14 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractId")
                         .HasColumnType("bigint");
 
-                    b.Property<long>("LawId")
-                        .HasColumnType("bigint");
-
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3410,6 +3299,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3425,6 +3317,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3434,8 +3329,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3502,6 +3397,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3567,6 +3465,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -5073,22 +4974,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<long?>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -5103,8 +4988,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("FinancialInvoiceId");
-
                     b.ToTable("PaymentTransactions", (string)null);
                 });
 
@@ -7345,17 +7228,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10038,17 +9910,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileTiming");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("Items")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialTransactionAgg.FinancialTransaction", b =>
                 {
                     b.HasOne("Company.Domain.FinancialStatmentAgg.FinancialStatment", "FinancialStatment")
@@ -10596,16 +10457,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PaymentToEmployee");
                 });
 
-            modelBuilder.Entity("Company.Domain.PaymentTransactionAgg.PaymentTransaction", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("PaymentTransactions")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.NoAction);
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.PenaltyTitle.PenaltyTitle", b =>
                 {
                     b.HasOne("Company.Domain.Petition.Petition", "Petition")
@@ -10896,11 +10747,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");
@@ -11010,13 +10856,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileStates");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Navigation("Items");
-
-                    b.Navigation("PaymentTransactions");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Navigation("FinancialTransactionList");

CompanyManagment.EFCore/Migrations/20251106075938_ignore law id.cs

@@ -5,26 +5,26 @@
 namespace CompanyManagment.EFCore.Migrations
 {
     /// <inheritdoc />
-    public partial class addGatewaysintransaction : Migration
+    public partial class ignorelawid : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AddColumn<string>(
-                name: "Gateway",
-                table: "PaymentTransactions",
-                type: "nvarchar(35)",
-                maxLength: 35,
+            migrationBuilder.AddColumn<long>(
+                name: "LawId",
+                table: "InstitutionContractAmendments",
+                type: "bigint",
                 nullable: false,
-                defaultValue: "");
+                defaultValue: 0L);
+           
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropColumn(
-                name: "Gateway",
-                table: "PaymentTransactions");
+                name: "LawId",
+                table: "InstitutionContractAmendments");
         }
     }
 }

CompanyManagment.EFCore/Migrations/20251106080435_lawId test.Designer.cs

@@ -13,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20251112151518_add rrn and digital receipt")]
-    partial class addrrnanddigitalreceipt
+    [Migration("20251106080435_lawId test")]
+    partial class lawIdtest
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -418,9 +418,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -437,9 +434,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -552,33 +546,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -3291,6 +3258,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3330,6 +3302,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3345,6 +3320,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3354,8 +3332,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3422,6 +3400,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3487,6 +3468,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -4993,19 +4977,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7260,17 +7231,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10790,11 +10750,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Migrations/20251106080435_lawId test.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class lawIdtest : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20251112151518_add rrn and digital receipt.cs

@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addrrnanddigitalreceipt : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "DigitalReceipt",
-                table: "PaymentTransactions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Rrn",
-                table: "PaymentTransactions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DigitalReceipt",
-                table: "PaymentTransactions");
-
-            migrationBuilder.DropColumn(
-                name: "Rrn",
-                table: "PaymentTransactions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251113072842_add financial invoice .cs

@@ -1,226 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addfinancialinvoice : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_FinancialInvoice_FinancialStatments_FinancialStatementId",
-                table: "FinancialInvoice");
-
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_FinancialInvoice",
-                table: "FinancialInvoice");
-
-            migrationBuilder.DropColumn(
-                name: "Month",
-                table: "FinancialInvoice");
-
-            migrationBuilder.DropColumn(
-                name: "SmsCode",
-                table: "FinancialInvoice");
-
-            migrationBuilder.DropColumn(
-                name: "Year",
-                table: "FinancialInvoice");
-
-            migrationBuilder.RenameTable(
-                name: "FinancialInvoice",
-                newName: "FinancialInvoices");
-
-            migrationBuilder.RenameColumn(
-                name: "FinancialStatementId",
-                table: "FinancialInvoices",
-                newName: "FinancialStatmentid");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_FinancialInvoice_FinancialStatementId",
-                table: "FinancialInvoices",
-                newName: "IX_FinancialInvoices_FinancialStatmentid");
-
-            migrationBuilder.AddColumn<long>(
-                name: "FinancialInvoiceId",
-                table: "PaymentTransactions",
-                type: "bigint",
-                nullable: true);
-
-            migrationBuilder.AddColumn<long>(
-                name: "ContractingPartyId",
-                table: "FinancialInvoices",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Description",
-                table: "FinancialInvoices",
-                type: "nvarchar(800)",
-                maxLength: 800,
-                nullable: true);
-
-            migrationBuilder.AddColumn<bool>(
-                name: "IsActive",
-                table: "FinancialInvoices",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "PublicId",
-                table: "FinancialInvoices",
-                type: "uniqueidentifier",
-                nullable: false,
-                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
-
-            migrationBuilder.AddPrimaryKey(
-                name: "PK_FinancialInvoices",
-                table: "FinancialInvoices",
-                column: "id");
-
-            migrationBuilder.CreateTable(
-                name: "FinancialInvoiceItem",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Description = table.Column<string>(type: "nvarchar(800)", maxLength: 800, nullable: true),
-                    Amount = table.Column<double>(type: "float", nullable: false),
-                    Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    EntityId = table.Column<long>(type: "bigint", nullable: false),
-                    FinancialInvoiceId = table.Column<long>(type: "bigint", nullable: false),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_FinancialInvoiceItem", x => x.id);
-                    table.ForeignKey(
-                        name: "FK_FinancialInvoiceItem_FinancialInvoices_FinancialInvoiceId",
-                        column: x => x.FinancialInvoiceId,
-                        principalTable: "FinancialInvoices",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_PaymentTransactions_FinancialInvoiceId",
-                table: "PaymentTransactions",
-                column: "FinancialInvoiceId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FinancialInvoiceItem_FinancialInvoiceId",
-                table: "FinancialInvoiceItem",
-                column: "FinancialInvoiceId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_FinancialInvoices_FinancialStatments_FinancialStatmentid",
-                table: "FinancialInvoices",
-                column: "FinancialStatmentid",
-                principalTable: "FinancialStatments",
-                principalColumn: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_PaymentTransactions_FinancialInvoices_FinancialInvoiceId",
-                table: "PaymentTransactions",
-                column: "FinancialInvoiceId",
-                principalTable: "FinancialInvoices",
-                principalColumn: "id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_FinancialInvoices_FinancialStatments_FinancialStatmentid",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_PaymentTransactions_FinancialInvoices_FinancialInvoiceId",
-                table: "PaymentTransactions");
-
-            migrationBuilder.DropTable(
-                name: "FinancialInvoiceItem");
-
-            migrationBuilder.DropIndex(
-                name: "IX_PaymentTransactions_FinancialInvoiceId",
-                table: "PaymentTransactions");
-
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_FinancialInvoices",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropColumn(
-                name: "FinancialInvoiceId",
-                table: "PaymentTransactions");
-
-            migrationBuilder.DropColumn(
-                name: "ContractingPartyId",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropColumn(
-                name: "Description",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropColumn(
-                name: "IsActive",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropColumn(
-                name: "PublicId",
-                table: "FinancialInvoices");
-
-            migrationBuilder.RenameTable(
-                name: "FinancialInvoices",
-                newName: "FinancialInvoice");
-
-            migrationBuilder.RenameColumn(
-                name: "FinancialStatmentid",
-                table: "FinancialInvoice",
-                newName: "FinancialStatementId");
-
-            migrationBuilder.RenameIndex(
-                name: "IX_FinancialInvoices_FinancialStatmentid",
-                table: "FinancialInvoice",
-                newName: "IX_FinancialInvoice_FinancialStatementId");
-
-            migrationBuilder.AddColumn<int>(
-                name: "Month",
-                table: "FinancialInvoice",
-                type: "int",
-                nullable: false,
-                defaultValue: 0);
-
-            migrationBuilder.AddColumn<string>(
-                name: "SmsCode",
-                table: "FinancialInvoice",
-                type: "nvarchar(122)",
-                maxLength: 122,
-                nullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "Year",
-                table: "FinancialInvoice",
-                type: "int",
-                nullable: false,
-                defaultValue: 0);
-
-            migrationBuilder.AddPrimaryKey(
-                name: "PK_FinancialInvoice",
-                table: "FinancialInvoice",
-                column: "id");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_FinancialInvoice_FinancialStatments_FinancialStatementId",
-                table: "FinancialInvoice",
-                column: "FinancialStatementId",
-                principalTable: "FinancialStatments",
-                principalColumn: "id");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251117140111_add invoice number.cs

@@ -1,59 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addinvoicenumber : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_FinancialInvoices_FinancialStatments_FinancialStatmentid",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropIndex(
-                name: "IX_FinancialInvoices_FinancialStatmentid",
-                table: "FinancialInvoices");
-
-            migrationBuilder.DropColumn(
-                name: "FinancialStatmentid",
-                table: "FinancialInvoices");
-
-            migrationBuilder.AddColumn<string>(
-                name: "InvoiceNumber",
-                table: "FinancialInvoices",
-                type: "nvarchar(18)",
-                maxLength: 18,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "InvoiceNumber",
-                table: "FinancialInvoices");
-
-            migrationBuilder.AddColumn<long>(
-                name: "FinancialStatmentid",
-                table: "FinancialInvoices",
-                type: "bigint",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FinancialInvoices_FinancialStatmentid",
-                table: "FinancialInvoices",
-                column: "FinancialStatmentid");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_FinancialInvoices_FinancialStatments_FinancialStatmentid",
-                table: "FinancialInvoices",
-                column: "FinancialStatmentid",
-                principalTable: "FinancialStatments",
-                principalColumn: "id");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251117142046_change max length for financial invoice number.cs

@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class changemaxlengthforfinancialinvoicenumber : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "InvoiceNumber",
-                table: "FinancialInvoices",
-                type: "nvarchar(22)",
-                maxLength: 22,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(18)",
-                oldMaxLength: 18,
-                oldNullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "InvoiceNumber",
-                table: "FinancialInvoices",
-                type: "nvarchar(18)",
-                maxLength: 18,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(22)",
-                oldMaxLength: 22,
-                oldNullable: true);
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251117163856_change descriptionOption max length.cs

@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class changedescriptionOptionmaxlength : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "DescriptionOption",
-                table: "FinancialTransactions",
-                type: "nvarchar(100)",
-                maxLength: 100,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(50)",
-                oldMaxLength: 50,
-                oldNullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "DescriptionOption",
-                table: "FinancialTransactions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(100)",
-                oldMaxLength: 100,
-                oldNullable: true);
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -2827,86 +2827,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("File_Titles", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<long>("ContractingPartyId")
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<string>("InvoiceNumber")
-                        .HasMaxLength(22)
-                        .HasColumnType("nvarchar(22)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<DateTime?>("PaidAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("PublicId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("FinancialInvoices");
-                });
-
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<double>("Amount")
-                        .HasColumnType("float");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(800)
-                        .HasColumnType("nvarchar(800)");
-
-                    b.Property<long>("EntityId")
-                        .HasColumnType("bigint");
-
-                    b.Property<long>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("FinancialInvoiceId");
-
-                    b.ToTable("FinancialInvoiceItem");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Property<long>("id")
@@ -2958,8 +2878,8 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasColumnType("nvarchar(600)");
 
                     b.Property<string>("DescriptionOption")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<long>("FinancialStatementId")
                         .HasColumnType("bigint");
@@ -3368,6 +3288,11 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("VerificationCreation")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("VerificationStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<string>("VerifierFullName")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -3407,6 +3332,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<long?>("CurrentWorkshopId")
+                        .HasColumnType("bigint");
+
                     b.Property<bool?>("HasContractPlan")
                         .HasColumnType("bit");
 
@@ -3422,6 +3350,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool?>("HasInsurancePlanInPerson")
                         .HasColumnType("bit");
 
+                    b.Property<bool?>("HasRollCallInPerson")
+                        .HasColumnType("bit");
+
                     b.Property<bool?>("HasRollCallPlan")
                         .HasColumnType("bit");
 
@@ -3431,8 +3362,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<int?>("PersonnelCount")
                         .HasColumnType("int");
 
-                    b.Property<long?>("WorkshopDetailsId")
-                        .HasColumnType("bigint");
+                    b.Property<int>("PersonnelCountDifference")
+                        .HasColumnType("int");
 
                     b.HasKey("id");
 
@@ -3499,6 +3430,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -3564,6 +3498,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("InstitutionContractWorkshopGroupId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("IsAmendment")
+                        .HasColumnType("bit");
+
                     b.Property<int>("PersonnelCount")
                         .HasColumnType("int");
 
@@ -5070,22 +5007,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<long?>("FinancialInvoiceId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -5100,8 +5021,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("FinancialInvoiceId");
-
                     b.ToTable("PaymentTransactions", (string)null);
                 });
 
@@ -10035,17 +9954,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileTiming");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoiceItem", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("Items")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialTransactionAgg.FinancialTransaction", b =>
                 {
                     b.HasOne("Company.Domain.FinancialStatmentAgg.FinancialStatment", "FinancialStatment")
@@ -10593,16 +10501,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PaymentToEmployee");
                 });
 
-            modelBuilder.Entity("Company.Domain.PaymentTransactionAgg.PaymentTransaction", b =>
-                {
-                    b.HasOne("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", "FinancialInvoice")
-                        .WithMany("PaymentTransactions")
-                        .HasForeignKey("FinancialInvoiceId")
-                        .OnDelete(DeleteBehavior.NoAction);
-
-                    b.Navigation("FinancialInvoice");
-                });
-
             modelBuilder.Entity("Company.Domain.PenaltyTitle.PenaltyTitle", b =>
                 {
                     b.HasOne("Company.Domain.Petition.Petition", "Petition")
@@ -11007,13 +10905,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("FileStates");
                 });
 
-            modelBuilder.Entity("Company.Domain.FinancialInvoiceAgg.FinancialInvoice", b =>
-                {
-                    b.Navigation("Items");
-
-                    b.Navigation("PaymentTransactions");
-                });
-
             modelBuilder.Entity("Company.Domain.FinancialStatmentAgg.FinancialStatment", b =>
                 {
                     b.Navigation("FinancialTransactionList");

CompanyManagment.EFCore/Repository/FinancialInvoiceRepository.cs

@@ -1,103 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.InfraStructure;
-using Company.Domain.FinancialInvoiceAgg;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-using Microsoft.EntityFrameworkCore;
-
-namespace CompanyManagment.EFCore.Repository;
-
-public class FinancialInvoiceRepository : RepositoryBase<long, FinancialInvoice>, IFinancialInvoiceRepository
-{
-    private readonly CompanyContext _context;
-
-    public FinancialInvoiceRepository(CompanyContext context) : base(context)
-    {
-        _context = context;
-    }
-
-    public EditFinancialInvoice GetDetails(long id)
-    {
-        var financialInvoice = _context.FinancialInvoices
-            .Include(x => x.Items)
-            .FirstOrDefault(x => x.id == id);
-
-        if (financialInvoice == null)
-            return null;
-
-        return new EditFinancialInvoice
-        {
-            Id = financialInvoice.id,
-            Description = financialInvoice.Description,
-            Amount = financialInvoice.Amount,
-            Status =  financialInvoice.Status,
-            InvoiceNumber = financialInvoice.InvoiceNumber,
-            Items = financialInvoice.Items?.Select(x => new EditFinancialInvoiceItem
-            {
-                Id = x.id,
-                Description = x.Description,
-                Amount = x.Amount,
-                Type = x.Type,
-                EntityId = x.EntityId
-            }).ToList()
-        };
-    }
-
-    public List<FinancialInvoiceViewModel> Search(FinancialInvoiceSearchModel searchModel)
-    {
-        var query = _context.FinancialInvoices
-            .Include(x => x.Items)
-            .AsQueryable();
-
-        if (!string.IsNullOrWhiteSpace(searchModel.Description))
-            query = query.Where(x => x.Description.Contains(searchModel.Description));
-
-        if (searchModel.Status.HasValue)
-            query = query.Where(x => x.Status == searchModel.Status.Value);
-
-        if (searchModel.ContractingPartyId.HasValue)
-            query = query.Where(x => x.ContractingPartyId == searchModel.ContractingPartyId.Value);
-
-        if (!string.IsNullOrWhiteSpace(searchModel.FromDate))
-        {
-            var fromDate = searchModel.FromDate.ToGeorgianDateTime();
-            query = query.Where(x => x.CreationDate >= fromDate);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.ToDate))
-        {
-            var toDate = searchModel.ToDate.ToGeorgianDateTime();
-            query = query.Where(x => x.CreationDate <= toDate);
-        }
-
-        if (searchModel.MinAmount.HasValue)
-            query = query.Where(x => x.Amount >= searchModel.MinAmount.Value);
-
-        if (searchModel.MaxAmount.HasValue)
-            query = query.Where(x => x.Amount <= searchModel.MaxAmount.Value);
-
-        return query.OrderByDescending(x => x.id)
-            .Select(x => new FinancialInvoiceViewModel
-            {
-                Id = x.id,
-                Description = x.Description,
-                Status = x.Status.ToString(),
-                PaidAt = x.PaidAt.HasValue ? x.PaidAt.Value.ToFarsi() : "",
-                Amount = x.Amount,
-                PublicId = x.PublicId,
-                ContractingPartyId = x.ContractingPartyId,
-                CreationDate = x.CreationDate.ToFarsi(),
-                ItemsCount = x.Items != null ? x.Items.Count : 0
-            }).ToList();
-    }
-
-    public async Task<FinancialInvoice> GetUnPaidByEntityId(long entityId,
-        FinancialInvoiceItemType financialInvoiceItemType)
-    {
-       return await _context.FinancialInvoices.Include(x => x.Items)
-            .Where(x => x.Status == FinancialInvoiceStatus.Unpaid).FirstOrDefaultAsync(x => x.Items
-                .Any(y => y.Type == financialInvoiceItemType && y.EntityId == entityId));
-    }
-}

CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs

@@ -265,21 +265,7 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
 
     }
 
-    public async Task<double> GetClientDebtAmountByContractingPartyId(long contractingPartyId)
-    {
-
-	    var resStatement = await _context.FinancialStatments.Include(x => x.FinancialTransactionList)
-		    .FirstOrDefaultAsync(x => x.ContractingPartyId == contractingPartyId);
-
-	    if (resStatement == null)
-		    return 0;
-
-	    return resStatement.FinancialTransactionList.Sum(x => x.Deptor) -
-	           resStatement.FinancialTransactionList.Sum(x => x.Creditor);
-
-    }
-
-	public async Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel)
+    public async Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel)
     {
         var contractingParty = await _context.PersonalContractingParties
             .FirstOrDefaultAsync(x=>x.id == contractingPartyId);
@@ -427,6 +413,6 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
 
     public async Task<FinancialStatment> GetByContractingPartyId(long contractingPartyId)
     {
-        return await _context.FinancialStatments.Include(x=>x.FinancialTransactionList).FirstOrDefaultAsync(x => x.ContractingPartyId == contractingPartyId);
+        return await _context.FinancialStatments.FirstOrDefaultAsync(x => x.ContractingPartyId == contractingPartyId);
     }
 }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -14,7 +14,6 @@ using _0_Framework.InfraStructure;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractingPartyAccountAgg;
 using Company.Domain.empolyerAgg;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -24,14 +23,12 @@ using Company.Domain.InstitutionContractExtensionTempAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employer;
-using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -1841,10 +1838,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
     public async Task<InstitutionContract> GetByPublicIdAsync(Guid id)
     {
-        return await _context.InstitutionContractSet
-            .Include(x=>x.ContactInfoList)
-            .Include(x=>x.Installments)
-            .FirstOrDefaultAsync(x => x.PublicId == id);
+        return await _context.InstitutionContractSet.Include(x=>x.ContactInfoList).FirstOrDefaultAsync(x => x.PublicId == id);
     }
 
     #region Extension
@@ -2300,10 +2294,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         }
 
         var today = DateTime.Today;
-        double invoiceAmount;
-        string invoiceItemDescription;
-        FinancialInvoiceItemType invoiceItemType;
-        long invoiceItemEntityId;
         if (request.IsInstallment && payment is InstitutionContractPaymentMonthlyViewModel monthly)
         {
             var installments = monthly.Installments.Select(x =>
@@ -2320,40 +2310,23 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             // ایجاد قسط جدید با تاریخ امروز 
             var todayInstallment = new InstitutionContractInstallment(DateTime.Today, firstInstallmentAmount, "");
 
-           
+            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
+                "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
+
+            financialStatement.AddFinancialTransaction(financialTransaction);
 
             // اضافه کردن قسط جدید به ابتدای لیست
             installments.Insert(0, todayInstallment);
 
             entity.SetInstallments(installments);
-            await SaveChangesAsync();
-            
-            var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-                "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
-
-            financialStatement.AddFinancialTransaction(financialTransaction);
-            invoiceAmount = firstInstallmentAmount;
-            invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {entity.ContractNo}";
-            invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
-            invoiceItemEntityId = todayInstallment.Id;
         }
         else
         {
             var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
                 "پرداخت کل سرویس", "debt", "بابت خدمات", totalAmount, 0, 0);
             financialStatement.AddFinancialTransaction(financialTransaction);
-            invoiceAmount = totalAmount;
-            invoiceItemDescription = $"پرداخت کل قرارداد شماره {entity.ContractNo}";
-            invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
-            invoiceItemEntityId = entity.id;
         }
-        var financialInvoice = new FinancialInvoice(invoiceAmount, contractingParty.id, $"خرید قرارداد مالی شماره {entity.ContractNo}");
-        var financialInvoiceItem = new FinancialInvoiceItem(invoiceItemDescription, invoiceAmount, 0,invoiceItemType, invoiceItemEntityId);
-        financialInvoice.AddItem(financialInvoiceItem);
 
-        await _context.AddAsync(financialInvoice);
-        await SaveChangesAsync();
-        
         foreach (var contactInfo in institutionContractTemp.ContactInfos)
         {
             if (contactInfo.PhoneNumber != null)
@@ -2400,6 +2373,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 x.WorkshopId??0,x.id)).ToList();
 
 
+        await _institutionAmendmentTemp
+            .DeleteManyAsync(x => x.InstitutionContractId == institutionContractId);;
         
         var temp = new InstitutionContractAmendmentTemp(workshops, institutionContractId);
         
@@ -2482,12 +2457,14 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (endDay > startDay)
             monthDiff++;
         
-        var sumOneMonth = institutionContractAmendmentTemp.NewWorkshops.Sum(x => x.PriceDifference);
+        var sumOneMonth = institutionContractAmendmentTemp
+            .NewWorkshops.Sum(x => x.PriceDifference);
         
         var baseAmount = monthDiff * sumOneMonth;
         var tax = baseAmount*0.10;
         var totalPayment = tax+baseAmount;
 
+        
 
         var res = new InsitutionContractAmendmentPaymentResponse()
         {
@@ -2495,6 +2472,41 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             ContractEnd = amendmentEnd.ToFarsi(),
             OneMonthAmount = sumOneMonth.ToMoney(),
             TotalAmount = baseAmount.ToMoney(),
+            workshops = institutionContractAmendmentTemp.NewWorkshops
+                .Select(x=>
+                {
+                    var prevWorkshop  = institutionContractAmendmentTemp.PrevWorkshops
+                        .FirstOrDefault(w=> w.Id == x.Id);
+                    var isNewWorkshop = prevWorkshop == null;
+                    return new InsitutionContractAmendmentPaymentWorkshopResponse()
+                    {
+                        WorkshopName = x.WorkshopName,
+                        IsNewWorkshop = isNewWorkshop,
+                        NewPersonnelCount = x.CountPerson,
+                        PrevPersonnelCount = prevWorkshop?.CountPerson??0,
+                        Price = x.PriceDifference,
+                        OldServices = prevWorkshop != null? new WorkshopServicesViewModel()
+                        {
+                            Contract = prevWorkshop.ContractAndCheckout,
+                            ContractInPerson = prevWorkshop.ContractAndCheckoutInPerson,
+                            CustomizeCheckout = prevWorkshop.CustomizeCheckout,
+                            Insurance = prevWorkshop.Insurance,
+                            InsuranceInPerson = prevWorkshop.InsuranceInPerson,
+                            RollCall = prevWorkshop.RollCall,
+                            RollCallInPerson = prevWorkshop.RollCallInPerson,
+                        }: new WorkshopServicesViewModel(),
+                        NewServices = new WorkshopServicesViewModel()
+                        {
+                            Contract = x.ContractAndCheckout,
+                            ContractInPerson = x.ContractAndCheckoutInPerson,
+                            CustomizeCheckout = x.CustomizeCheckout,
+                            Insurance = x.Insurance,
+                            InsuranceInPerson = x.InsuranceInPerson,
+                            RollCall = x.RollCall,
+                            RollCallInPerson = x.RollCallInPerson,
+                        },
+                    };
+                }).OrderByDescending(x=>x.Price).ToList()
         };
         
         res.OneTime = new InstitutionContractPaymentOneTimeViewModel()
@@ -2541,6 +2553,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             };
 
         }
+        
+        institutionContractAmendmentTemp.AddPaymentDetails(res.Monthly, res.OneTime, monthDiff);
+        await _institutionAmendmentTemp
+            .ReplaceOneAsync(x => x.Id == institutionContractAmendmentTemp.Id, institutionContractAmendmentTemp);
+        
+        
+        
         return res;
     }
 
@@ -2579,7 +2598,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 request.Insurance, request.InsuranceInPerson,
                 request.RollCall, request.RollCallInPerson,
                 request.CustomizeCheckout, price,
-                request.WorkshopId,0,price);
+                request.WorkshopId,0,price,Guid.NewGuid());
 
             workshopTemp = newWorkshopTemp;
             
@@ -2591,9 +2610,24 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         }
         else
         {
+            var prevWorkshop = amendmentTemp.PrevWorkshops
+                .FirstOrDefault(x => x.Id == workshopTemp.Id);
+            var differencePrice = 0d;
+            if (prevWorkshop != null)
+            {
+                differencePrice = price - prevWorkshop.Price;
+            }
+            else
+            {
+                differencePrice = price;
+            }
             amendmentTemp.NewWorkshops.Remove(workshopTemp);
         
-            var differencePrice = price - workshopTemp.Price;
+          
+            if (differencePrice<0)
+            {
+                differencePrice = 0;
+            }
             workshopTemp.Edit(request.WorkshopName, request.CountPerson,
                 request.ContractAndCheckout, request.ContractAndCheckoutInPerson,
                 request.Insurance, request.InsuranceInPerson,
@@ -2794,6 +2828,146 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return res;
     }
 
+    public async Task AmendmentComplete(InstitutionContractAmendmentCompleteRequest request)
+    {
+        var amendmentTemp = await _institutionAmendmentTemp
+            .Find(x=>x.Id == request.TempId).FirstOrDefaultAsync();
+        
+        if (amendmentTemp == null)
+            throw new BadRequestException("دیتای وارد شده نامعتبر است");
+        
+        var institutionContract = await _context.InstitutionContractSet
+            .Include(x=>x.Amendments)
+            .Include(x=>x.WorkshopGroup)
+            .ThenInclude(x=>x.CurrentWorkshops)
+            .FirstOrDefaultAsync(x => x.id == amendmentTemp.InstitutionContractId);
+
+
+        List<InstitutionContractInstallment> installments = [];
+        double amount = 0;
+        if (request.IsInstallment)
+        {
+            installments = amendmentTemp.MonthlyPayment.Installments.Select(x=>
+                new InstitutionContractInstallment(x.InstalmentDate.ToGeorgianDateTime(),
+                    x.InstallmentAmountStr.MoneyToDouble(), "")).ToList();
+            amount = amendmentTemp.MonthlyPayment.PaymentAmount.MoneyToDouble();
+        }
+        else
+        {
+            amount = amendmentTemp.OneTimePayment.PaymentAmount.MoneyToDouble();
+        }
+        var newWorkshops = amendmentTemp
+            .NewWorkshops.Where(x=>x.CurrentWorkshopId ==0).ToList();
+        
+            var newWorkshopTempIds = newWorkshops.Select(x=>x.Id).ToList();
+                
+            var changes = newWorkshops.Select(x=>
+                InstitutionContractAmendmentChange.CreateWorkshopCreatedChange(DateTime.Now,x.RollCall,x.RollCallInPerson,x.CustomizeCheckout,
+                x.ContractAndCheckout,x.ContractAndCheckoutInPerson,x.Insurance,x.InsuranceInPerson,x.CountPerson)).ToList();
+
+            var changedWorkshops = amendmentTemp.NewWorkshops
+                .Where(x => !newWorkshopTempIds.Contains(x.Id)).ToList();
+
+            foreach (var changedWorkshop in changedWorkshops)
+            {
+                var prev = amendmentTemp.PrevWorkshops.FirstOrDefault(x => x.Id == changedWorkshop.Id);
+                if (prev == null)
+                    throw new BadRequestException("دیتای وارد شده ناقص ذخیره شده است");
+                
+                // مقایسه مقادیر بولین بین prev و changedWorkshop برای تشخیص تغییرات
+                var changedBooleans = new Dictionary<string, (bool Previous, bool Current)>();
+                
+                if (prev.CustomizeCheckout != changedWorkshop.CustomizeCheckout)
+                    changedBooleans.Add("CustomizeCheckout", (prev.CustomizeCheckout, changedWorkshop.CustomizeCheckout));
+                
+                if (prev.ContractAndCheckout != changedWorkshop.ContractAndCheckout)
+                    changedBooleans.Add("ContractAndCheckout", (prev.ContractAndCheckout, changedWorkshop.ContractAndCheckout));
+                
+                if (prev.ContractAndCheckoutInPerson != changedWorkshop.ContractAndCheckoutInPerson)
+                    changedBooleans.Add("ContractAndCheckoutInPerson", (prev.ContractAndCheckoutInPerson, changedWorkshop.ContractAndCheckoutInPerson));
+                
+                if (prev.Insurance != changedWorkshop.Insurance)
+                    changedBooleans.Add("Insurance", (prev.Insurance, changedWorkshop.Insurance));
+                
+                if (prev.InsuranceInPerson != changedWorkshop.InsuranceInPerson)
+                    changedBooleans.Add("InsuranceInPerson", (prev.InsuranceInPerson, changedWorkshop.InsuranceInPerson));
+                
+                if (prev.RollCall != changedWorkshop.RollCall)
+                    changedBooleans.Add("RollCall", (prev.RollCall, changedWorkshop.RollCall));
+                
+                if (prev.RollCallInPerson != changedWorkshop.RollCallInPerson)
+                    changedBooleans.Add("RollCallInPerson", (prev.RollCallInPerson, changedWorkshop.RollCallInPerson));
+                
+                // اگر تغییری وجود داشته باشد، آن را به لیست تغییرات اضافه کن
+                if (changedBooleans.Any())
+                {
+                    var change = InstitutionContractAmendmentChange.CreateServicesChange(
+                        DateTime.Now,
+                        changedWorkshop.WorkshopId,
+                        changedWorkshop.RollCall,
+                        changedWorkshop.RollCallInPerson,
+                        changedWorkshop.CustomizeCheckout,
+                        changedWorkshop.ContractAndCheckout,
+                        changedWorkshop.ContractAndCheckoutInPerson,
+                        changedWorkshop.Insurance,
+                        changedWorkshop.InsuranceInPerson);
+                    
+                    changes.Add(change);
+                }
+
+                if (changedWorkshop.CountPerson != prev.CountPerson)
+                {
+                    var difference = changedWorkshop.CountPerson - prev.CountPerson;
+                    var change = InstitutionContractAmendmentChange.CreatePersonCountChange(
+                        DateTime.Now,
+                        changedWorkshop.CountPerson,
+                        difference,changedWorkshop.WorkshopId);
+                    
+                    changes.Add(change);
+                }
+            }
+        
+        var amendment = new InstitutionContractAmendment(institutionContract.id,installments,amount,
+            request.IsInstallment,changes,request.LawId);
+        institutionContract.AddAmendment(amendment);
+
+        await _smsService.SendInstitutionAmendmentVerificationLink(
+            institutionContract.VerifierPhoneNumber,
+            institutionContract.ContractingPartyName,
+            institutionContract.PublicId,
+            institutionContract.ContractingPartyId,
+            institutionContract.id
+            );
+        
+        await _institutionAmendmentTemp.DeleteOneAsync(x=>x.Id == amendmentTemp.Id);
+        await _context.SaveChangesAsync();
+
+    }
+
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id,
+        long amendmentId)
+    {
+        var institutionContract = await _context.InstitutionContractSet
+            .Include(x => x.Amendments)
+            .FirstOrDefaultAsync(x => x.PublicId == id);
+        
+        if (institutionContract == null)
+            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
+        
+        var amendment = institutionContract.Amendments
+            .FirstOrDefault(x => x.id == amendmentId);
+        if (amendment == null)
+            throw new NotFoundException("ارتقا یافت نشد");
+
+        if (amendment.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+            throw new BadRequestException("این ارتقا قبلا تایید شده است");
+
+        throw new NotImplementedException();
+
+
+
+    }
+
 
     private InstitutionContractExtensionPaymentResponse CalculateInPersonPayment(
         InstitutionContractExtensionPlanDetail selectedPlan, double baseAmount, double tenPercent,

CompanyManagment.EFCore/Repository/ReportRepository.cs

@@ -802,8 +802,6 @@ public class ReportRepository : IReportRepository
 
 
         };
-
-
         Console.WriteLine("new metod >>>>>: " + watch.Elapsed);
         Console.WriteLine("watchAllProssecd >>>>>: " + watchAllProssec.Elapsed);
 
@@ -1162,14 +1160,13 @@ public class ReportRepository : IReportRepository
 
 
         var allContractCreated = await _context.Contracts
-            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
+            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && allContractLeftworksWorkshopIdList.Contains(x.WorkshopIds))
             .Where(x =>
                 x.ContarctStart <= nextMonthEnd && x.ContractEnd > nextMonthStart && x.IsActiveString == "true")
             .Select(x=> new {x.id, x.EmployeeId, x.WorkshopIds, x.Signature}).ToListAsync();
-        allContractCreated = allContractCreated.Where(x => allContractLeftworksWorkshopIdList.Contains(x.WorkshopIds)).ToList();
 
         #endregion
-
+   
         Console.WriteLine("ajax 1 >>>>>: " + watch.Elapsed);
         var workshops = _context.Workshops.Include(x => x.LeftWorks).Where(x => allContractLeftworksWorkshopIdList.Contains(x.id)).ToList();
         var workshopListResult = workshops
@@ -1253,8 +1250,6 @@ public class ReportRepository : IReportRepository
 
         #region NewChanges
 
-    
-
         //تمام پرسنل فعال برای قراداد در ماه مورد نظر
         var allContractLeftworksList = await _context.LeftWorkList
             .Where(x => workshopList.Contains(x.WorkshopId))
@@ -1297,6 +1292,9 @@ public class ReportRepository : IReportRepository
 
 
 
+
+    
+
         var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
 
 
@@ -1310,7 +1308,6 @@ public class ReportRepository : IReportRepository
             .Where(x =>
                 x.ContarctStart <= nextMonthEnd && x.ContractEnd > nextMonthStart && x.IsActiveString == "true")
             .Select(x=> new {x.id, x.EmployeeId, x.WorkshopIds, x.Signature, x.Employee}).ToListAsync();
-        allContractCreated = allContractCreated.Where(x => workshopList.Contains(x.WorkshopIds)).ToList();
 
 
         var allContractSignedListWorkshopId = new List<(long id, long EmployeeId, long WorkshopId, string Signature, Employee Employee)>();
@@ -1404,7 +1401,7 @@ public class ReportRepository : IReportRepository
                 WorkshopSearches = workshopListResult,
                 EmployeeNotDones = new(),
             };
-      
+
         var badWorkshop = workshopListResult.FirstOrDefault();
         var badWorkshopCreated = allContractSignToBeListWorkshopId.Where(x => x.WorkshopId == badWorkshop.Id);
         var badWorkshopSigned = allContractSigned.Where(x => x.WorkshopId == badWorkshop.Id).Select(x => x.EmployeeId);
@@ -1498,11 +1495,10 @@ public class ReportRepository : IReportRepository
 
   
 
-        var allContractCreated =await _context.CheckoutSet
-            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
+        var allContractCreated = _context.CheckoutSet
+            .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && allContractLeftworkWorkshopIds.Contains(x.WorkshopId))
             .Where(x =>
-                x.ContractStart.Date <= currentMonthEnd.Date && x.ContractEnd.Date > currentMonthStart.Date && x.IsActiveString == "true").ToListAsync();
-        allContractCreated = allContractCreated.Where(x => allContractLeftworkWorkshopIds.Contains(x.WorkshopId)).ToList();
+                x.ContractStart.Date <= currentMonthEnd.Date && x.ContractEnd.Date > currentMonthStart.Date && x.IsActiveString == "true");
 
         var createdContractTople = allContractCreated
             .Select(x => new { x.EmployeeId, x.WorkshopId })
@@ -1645,15 +1641,14 @@ public class ReportRepository : IReportRepository
         //    .Select(x => new { x.EmployeeId, x.WorkshopId }).ToListAsync();
 
         var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
-        var allContractLeftworkWorkshopIds = allContractLeftworks.Select(x => x.WorkshopId).ToList();
 
 
         var allContractCreated =await _context.CheckoutSet
             .Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
             .Where(x =>
                 x.ContractStart <= currentMonthEnd && x.ContractEnd > currentMonthStart && x.IsActiveString == "true")
-            .Select(x => new { x.id, x.EmployeeId, x.WorkshopId, x.Signature, x.EmployeeFullName }).ToListAsync(); 
-        allContractCreated = allContractCreated.Where(x => allContractLeftworkWorkshopIds.Contains(x.WorkshopId)).ToList();
+            .Select(x => new { x.id, x.EmployeeId, x.WorkshopId, x.Signature, x.EmployeeFullName }).ToListAsync();
+
 
         var allContractSignedListWorkshopId = new List<(long id, long EmployeeId, long WorkshopId, string Signature, string EmployeeFullName)>();
 

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -214,22 +214,17 @@ using Company.Domain.AuthorizedBankDetailsAgg;
 using Company.Domain.ContractingPartyBankAccountsAgg;
 using Company.Domain.PaymentInstrumentAgg;
 using Company.Domain.PaymentTransactionAgg;
-using Company.Domain.FinancialInvoiceAgg;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
 using CompanyManagment.App.Contracts.PaymentInstrument;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
 using Company.Domain.AuthorizedPersonAgg;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
 using Company.Domain.LawAgg;
-using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.EFCore.Repository;
-using CompanyManagment.App.Contracts.FinancialInvoice;
 
 namespace PersonalContractingParty.Config;
 
@@ -483,14 +478,7 @@ public class PersonalBootstrapper
         services.AddTransient<IAuthorizedBankDetailsApplication, AuthorizedBankDetailsApplication>();
 
         services
-	        .AddTransient<IInstitutionContractExtenstionTempRepository, InstitutionContractExtenstionTempRepository>();
-        
-        services.AddTransient<IEmployeeFaceEmbeddingRepository, EmployeeFaceEmbeddingRepository>();
-        services.AddTransient<IEmployeeFaceEmbeddingApplication, EmployeeFaceEmbeddingApplication>();
-        
-
-        services.AddTransient<IFinancialInvoiceRepository, FinancialInvoiceRepository>();
-        services.AddTransient<IFinancialInvoiceApplication, FinancialInvoiceApplication>();
+            .AddTransient<IInstitutionContractExtenstionTempRepository, InstitutionContractExtenstionTempRepository>();
         #endregion
 
         #region Pooya

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -2,7 +2,6 @@ using System.Collections.Concurrent;
 using System.Transactions;
 using _0_Framework.Application;
 using _0_Framework.Application.Enums;
-using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Application.Sms;
 using _0_Framework.Exceptions;
 using AccountManagement.Application.Contracts.Account;
@@ -38,8 +37,6 @@ public class institutionContractController : AdminBaseController
     private readonly IWorkshopApplication _workshopApplication;
     private readonly ITemporaryClientRegistrationApplication _temporaryClientRegistration;
     private readonly ITemporaryClientRegistrationApplication _clientRegistrationApplication;
-    private readonly IPaymentGateway _paymentGateway;
-
     private static readonly ConcurrentDictionary<Guid, SemaphoreSlim> _locks 
         = new ConcurrentDictionary<Guid, SemaphoreSlim>();
 
@@ -48,8 +45,7 @@ public class institutionContractController : AdminBaseController
     public institutionContractController(IInstitutionContractApplication institutionContractApplication,
         IPersonalContractingPartyApp contractingPartyApplication, IContactInfoApplication contactInfoApplication,
         IAccountApplication accountApplication, IEmployerApplication employerApplication,
-        IWorkshopApplication workshopApplication, ITemporaryClientRegistrationApplication temporaryClientRegistration,
-        ITemporaryClientRegistrationApplication clientRegistrationApplication,IHttpClientFactory httpClientFactory)
+        IWorkshopApplication workshopApplication, ITemporaryClientRegistrationApplication temporaryClientRegistration, ITemporaryClientRegistrationApplication clientRegistrationApplication)
     {
         _institutionContractApplication = institutionContractApplication;
         _contractingPartyApplication = contractingPartyApplication;
@@ -59,7 +55,6 @@ public class institutionContractController : AdminBaseController
         _workshopApplication = workshopApplication;
         _temporaryClientRegistration = temporaryClientRegistration;
         _clientRegistrationApplication = clientRegistrationApplication;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
     }
 
     /// <summary>
@@ -467,37 +462,11 @@ public class institutionContractController : AdminBaseController
 
     [HttpPost("/api/institutionContract/Verify")]
     [AllowAnonymous]
-    public async Task<ActionResult<OperationResult<string>>> Verify([FromBody] InstitutionVerificationRequest command)
+    public async Task<ActionResult<OperationResult>> Verify([FromBody] InstitutionVerificationRequest command)
     {
-        // URL برای redirect به درگاه پرداخت
-        var paymentRedirectUrl = Url.Action("ProcessPayment", "institutionContract", new { area = "Admin" }, Request.Scheme);
-        var res = await _institutionContractApplication.VerifyOtpAndMakeGateway(command.Id, command.Code, paymentRedirectUrl);
-        
-        if (!res.IsSuccedded)
-            return new OperationResult<string>().Failed(res.Message);
-        
-        var payUrl = _paymentGateway.GetStartPayUrl(res.Data);
-        
-        // URL کامل برای redirect شامل paymentUrl به عنوان query parameter
-        var redirectUrl = $"{paymentRedirectUrl}?paymentUrl={Uri.EscapeDataString(payUrl)}";
-        
-        return new OperationResult<string>().Succcedded(redirectUrl);
+        var res = await _institutionContractApplication.VerifyOtp(command.Id, command.Code);
+        return res;
     }
-
-    [HttpGet("/api/institutionContract/ProcessPayment")]
-    [AllowAnonymous]
-    public IActionResult ProcessPayment([FromQuery] string paymentUrl)
-    {
-        if (string.IsNullOrEmpty(paymentUrl))
-        {
-            return BadRequest("Payment URL is required");
-        }
-        
-        // redirect به درگاه پرداخت
-        return Redirect(paymentUrl);
-    }
-    
-    
     
     [HttpPost("/api/institutionContract/Verification/{id:guid}/send-otp")]
     [AllowAnonymous]
@@ -572,18 +541,52 @@ public class institutionContractController : AdminBaseController
         var res =await _institutionContractApplication.InsertAmendmentTempWorkshops(request);
         return res;
     }
+    
     [HttpDelete("amendment/remove-temp-workshops/{workshopTempId:guid}")]
     public async Task<ActionResult> RemoveAmendmentWorkshops(Guid workshopTempId)
     {        
         await _institutionContractApplication.RemoveAmendmentWorkshops(workshopTempId);
         return Ok();
     }
+    
     [HttpPost("amendment/payment-details")]
     public async Task<ActionResult<InsitutionContractAmendmentPaymentResponse>> GetAmendmentPaymentDetails([FromBody]InsitutionContractAmendmentPaymentRequest request)
     {
         var res =await _institutionContractApplication.GetAmendmentPaymentDetails(request);
         return res;
     }
+
+    [HttpPost("amendment/complete")]
+    public async Task<ActionResult> AmendmentComplete(
+       [FromBody] InstitutionContractAmendmentCompleteRequest request)
+    {
+        
+         await _institutionContractApplication.AmendmentComplete(request);
+        return Ok();
+
+    }
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("/api/institutionContract/amendment-Verification/{id:guid}/{amendmentId:long}")]
+    [AllowAnonymous]
+    public async Task<GetInstitutionAmendmentVerificationDetailsViewModel> GetAmendmentVerificationDetails(Guid id,long amendmentId)
+    {
+        return await _institutionContractApplication.GetAmendmentVerificationDetails(id,amendmentId);
+    }
+
+    [HttpPost("/api/institutionContract/Verify-amendment")]
+    [AllowAnonymous]
+    public async Task<ActionResult<OperationResult>> VerifyAmendment([FromBody] InstitutionVerificationRequest command)
+    {
+        throw new NotImplementedException();
+        //var res = await _institutionContractApplication.AmendmentVerifyOtp(command.Id, command.Code);
+        //return res;
+    }
+    
     
     
     [HttpGet("edit-old/{id}")]

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

@@ -18,14 +18,9 @@ using System.Text.Json.Serialization;
 using _0_Framework.Application.PaymentGateway;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionPlanAgg;
-using Company.Domain.PaymentTransactionAgg;
 using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.Extensions.Options;
-using Parbad;
-using Parbad.AspNetCore;
-using Parbad.Gateway.Sepehr;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -39,9 +34,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly AccountContext _accountContext;
         private readonly IPaymentGateway _paymentGateway;
         private readonly ITemporaryClientRegistrationApplication _clientRegistrationApplication;
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IOnlinePayment _onlinePayment;
-
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -49,16 +41,14 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
             _context = context;
             _accountContext = accountContext;
-            _httpClientFactory = httpClientFactory;
             _clientRegistrationApplication = clientRegistrationApplication;
-            _onlinePayment = onlinePayment;
-            _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+            _paymentGateway = new AqayePardakhtPaymentGateway(httpClientFactory, appSetting);
         }
 
         public void OnGet()
@@ -73,7 +63,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         }
 
 
-        public async Task<IActionResult> OnPostShiftDate()
+        public IActionResult OnPostShiftDate()
         {
             //var startRollCall = new DateTime(2025, 2, 19);
             //var rollCalls = _context.RollCalls.Where(x => x.ShiftDate >= startRollCall);
@@ -83,119 +73,10 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //var notEndedRollCalls = rollCalls.Where(x => x.EndDate == null).ToList();
             //RefactorAllTheRollCallsOnEsfand(endedRollCalls, notEndedRollCalls);
             //CreateRewardForKebabMahdi().GetAwaiter().GetResult();
-
-            var callBack = Url.Action("Verify", "General", null, Request.Scheme);
-
-
-            var amount = 10000;
-            var transaction = new PaymentTransaction(30427, amount, "سید حسن مصباح", "https://client.gozareshgir.ir", PaymentTransactionGateWay.SepehrPay);
-
-            _context.PaymentTransactions.Add(transaction);
-            await _context.SaveChangesAsync();
-
-			var command = new CreatePaymentGatewayRequest()
-            {
-                TransactionId = transaction.id.ToString(),
-                Amount = amount,
-                CallBackUrl = callBack
-			};
-
-            var createRes = await _paymentGateway.Create(command);
-
-            if (createRes.IsSuccess)
-            {
-	            transaction.SetTransactionId(createRes.Token);
-	            await _context.SaveChangesAsync();
-
-				var payUrl = _paymentGateway.GetStartPayUrl(createRes.Token);
-	            return Redirect(payUrl);
-            }
-            else
-            {
-	            return BadRequest(createRes.Status + "خطا در ارسال به درگاه پرداخت");
-            }
-        }
-
-        private async System.Threading.Tasks.Task CreateDadmehrWorkshopFaceEmbedding()
-        {
-            var basePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "faces");
-
-            if (!Directory.Exists(basePath))
-            {
-                ViewData["message"] = "مسیر پوشه یافت نشد";
-                return;
-            }
-
-            var directories = Directory.GetDirectories(basePath);
-
-            var client = new HttpClient();
-
-            foreach (var mainDirectory in directories)
-            {
-                var subDirectories = Directory.GetDirectories(mainDirectory);
-                var workshopName = Path.GetFileName(mainDirectory);
-                foreach (var directory in subDirectories)
-                {
-                    var directoryName = Path.GetFileName(directory);
-
-                    var employee = await _context.Employees
-                        .FirstOrDefaultAsync(x => x.id == Convert.ToInt64(directoryName));
-                    var fullname = employee != null ? employee.FullName : "نامشخص";
-
-                    var imageFiles = Directory.GetFiles(directory, "*.*")
-                        .Take(2)
-                        .ToArray();
-
-                    if (imageFiles.Length < 2)
-                    {
-                        Console.WriteLine($"تعداد تصاویر کافی برای {directoryName} وجود ندارد");
-                        continue;
-                    }
-
-                    using var formData = new MultipartFormDataContent();
-                    formData.Add(new StringContent(directoryName), "employee_id");
-                    formData.Add(new StringContent(workshopName), "workshop_id");
-                    formData.Add(new StringContent(fullname), "employee_full_name");
-
-                    FileStream file1Stream = null;
-                    FileStream file2Stream = null;
-
-                    try
-                    {
-                        // ارسال فایل اول
-                        file1Stream = new FileStream(imageFiles[0], FileMode.Open, FileAccess.Read);
-                        var file1Content = new StreamContent(file1Stream);
-                        file1Content.Headers.ContentType =
-                            new System.Net.Http.Headers.MediaTypeHeaderValue("image/jpeg");
-                        formData.Add(file1Content, "picture1", Path.GetFileName(imageFiles[0]));
-
-                        // ارسال فایل دوم
-                        file2Stream = new FileStream(imageFiles[1], FileMode.Open, FileAccess.Read);
-                        var file2Content = new StreamContent(file2Stream);
-                        file2Content.Headers.ContentType =
-                            new System.Net.Http.Headers.MediaTypeHeaderValue("image/jpeg");
-                        formData.Add(file2Content, "picture2", Path.GetFileName(imageFiles[1]));
-
-                        var response = await client.PostAsync("http://127.0.0.1:8000/embeddings", formData);
-
-                        if (response.IsSuccessStatusCode)
-                        {
-                            var result = await response.Content.ReadAsStringAsync();
-                            Console.WriteLine($"✓ {directoryName}: {result}");
-                        }
-                        else
-                        {
-                            var error = await response.Content.ReadAsStringAsync();
-                            Console.WriteLine($"✗ {directoryName}: {response.StatusCode} - {error}");
-                        }
-                    }
-                    finally
-                    {
-                        file1Stream?.Dispose();
-                        file2Stream?.Dispose();
-                    }
-                }
-            }
+            SetEntityIdForCheckoutValues();
+            SetEntityIdForCheckoutValuesTemp();
+            ViewData["message"] = "ایجاد شد";
+            return Page();
         }
 
         public IActionResult OnPostShiftDateNew()
@@ -240,14 +121,14 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                 Amount = 1000,
                 Email = "mahanch83@gmail.com",
                 CallBackUrl = Url.Page("/CallBack/Index", null, null, Request.Scheme, Request.Host.Value),
-                TransactionId = "{C771E841-B810-413D-9D4C-9F659575B8CC}",
+                InvoiceId = "{C771E841-B810-413D-9D4C-9F659575B8CC}",
             };
             var createResponse = await _paymentGateway.Create(command, cancellationToken);
 
 
             if (createResponse.Status == "success")
             {
-                return Redirect(_paymentGateway.GetStartPayUrl(createResponse.Token));
+                return Redirect(_paymentGateway.GetStartPayUrl(createResponse.TransactionId));
             }
 
             //TranslateCode(result?.ErrorCode);
@@ -814,7 +695,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                 //TODO: set data for institution price
                 var workshops = item.contractingParty.Employers
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).ToList()
-                    .DistinctBy(x => x.id).ToList();
+                    .DistinctBy(x=>x.id).ToList();
 
                 var initialWorkshop = workshops
                     .Select(w =>
@@ -856,7 +737,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value);
+                        x.WorkshopId.Value,false);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;
@@ -869,56 +750,56 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
                 //var oneMonthSum = current.Sum(x => x.Price);
                 item.contract.SetWorkshopGroup(group);
-                // var totalPaymentAndWorkshopList = await _clientRegistrationApplication.GetTotalPaymentAndWorkshopList(oneMonthSum,duration: InstitutionContractDuration.TwelveMonths,false);
-                //    item.contract.SetAmount(totalPaymentAndWorkshopList.OneTimeTotalPaymentStr.MoneyToDouble(),
-                //      totalPaymentAndWorkshopList.OneTimeValueAddedTaxStr.MoneyToDouble(),totalPaymentAndWorkshopList.DiscountedAmountForOneMonth.MoneyToDouble());
+               // var totalPaymentAndWorkshopList = await _clientRegistrationApplication.GetTotalPaymentAndWorkshopList(oneMonthSum,duration: InstitutionContractDuration.TwelveMonths,false);
+            //    item.contract.SetAmount(totalPaymentAndWorkshopList.OneTimeTotalPaymentStr.MoneyToDouble(),
+              //      totalPaymentAndWorkshopList.OneTimeValueAddedTaxStr.MoneyToDouble(),totalPaymentAndWorkshopList.DiscountedAmountForOneMonth.MoneyToDouble());
             }
 
             var remoteIds = remoteContractsQuery.Select(x => x.contract.id);
-            var inPersonContracts = await query
-                .Where(x => !remoteIds.Contains(x.contractingParty.id)).ToListAsync();
+            var inPersonContracts =await query
+                .Where(x=>!remoteIds.Contains(x.contractingParty.id)).ToListAsync();
             foreach (var item in inPersonContracts)
             {
                 var workshops = item.contractingParty.Employers
                     .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).ToList()
-                    .DistinctBy(x => x.id).ToList();
+                    .DistinctBy(x=>x.id).ToList();
 
                 var initialWorkshop = workshops
                     .Select(w =>
                     {
                         var personnelCount =
                             w.LeftWorks.Count(lw => lw.StartWorkDate <= today && lw.LeftWorkDate >= today);
-
+                        
                         bool hasRollCallPlan = true;
                         bool hasRollCallPlanInPerson = false;
                         bool hasCustomizeCheckoutPlan = w.id == 170;
                         bool hasContractPlan = true;
                         bool hasContractPlanInPerson = true;
-                        bool hasInsurancePlan = true;
+                        bool hasInsurancePlan =true;
                         bool hasInsurancePlanInPerson = true;
-
-                        var initial = InstitutionContractWorkshopInitial.CreateManual(w.WorkshopFullName,
-                            hasRollCallPlan,
-                            hasRollCallPlanInPerson, hasCustomizeCheckoutPlan,
-                            hasContractPlan, hasContractPlanInPerson,
-                            hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, 0,
+                        
+                        var initial = InstitutionContractWorkshopInitial.CreateManual(w.WorkshopFullName, hasRollCallPlan,
+                            hasRollCallPlanInPerson,hasCustomizeCheckoutPlan,
+                            hasContractPlan,hasContractPlanInPerson,
+                            hasInsurancePlan,hasInsurancePlanInPerson,personnelCount,0,
                             w.id, w.WorkshopEmployers.Select(x => x.EmployerId
                             ).ToList());
                         return initial;
                     }).ToList();
 
                 var group = new InstitutionContractWorkshopGroup(item.contract.id, initialWorkshop);
-
+                
                 await _context.AddAsync(group);
                 await _context.SaveChangesAsync();
-
+                
                 initialWorkshop.ForEach(x =>
                 {
                     var workshopId = workshops.First(w => x.WorkshopId.Value == w.id).id;
                     x.SetWorkshopId(workshopId);
                 });
-
+                
                 item.contract.SetWorkshopGroup(group);
+                
             }
 
             await _context.SaveChangesAsync();

ServiceHost/Areas/Camera/Controllers/CameraController.cs

@@ -1,305 +0,0 @@
-using ServiceHost.BaseControllers;
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Hosting;
-using _0_Framework.Application;
-using _0_Framework.Exceptions;
-using AccountManagement.Application.Contracts.Account;
-using AccountManagement.Application.Contracts.CameraAccount;
-using AccountManagement.Domain.TaskAgg;
-using CompanyManagment.App.Contracts.PersonnleCode;
-using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.RollCallEmployee;
-using CompanyManagment.App.Contracts.RollCallService;
-using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-using Microsoft.AspNetCore.Authorization;
-
-namespace ServiceHost.Areas.Camera.Controllers;
-
-public class CameraController : CameraBaseController
-{
-    private readonly IWebHostEnvironment _webHostEnvironment;
-    private readonly IConfiguration _configuration;
-    private readonly IEmployeeApplication _employeeApplication;
-    private readonly IRollCallApplication _rollCallApplication;
-    private readonly IRollCallServiceApplication _rollCallServiceApplication;
-    private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
-    private readonly IAuthHelper _authHelper;
-    private readonly IPersonnelCodeApplication _personnelCodeApplication;
-    private readonly IAccountApplication _accountApplication;
-    private readonly IPasswordHasher _passwordHasher;
-    private readonly ICameraAccountApplication _cameraAccountApplication;
-    private readonly IEmployeeFaceEmbeddingApplication _employeeFaceEmbeddingApplication;
-    private long _workshopId;
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly HttpClient _faceEmbeddingHttpClient;
-
-    public CameraController(IWebHostEnvironment webHostEnvironment,
-        IConfiguration configuration,
-        IEmployeeApplication employeeApplication,
-        IRollCallApplication rollCallApplication,
-        IAuthHelper authHelper,
-        IRollCallServiceApplication rollCallServiceApplication,
-        IRollCallEmployeeApplication rollCallEmployeeApplication,
-        IPersonnelCodeApplication personnelCodeApplication,
-        IAccountApplication accountApplication,
-        IPasswordHasher passwordHasher,
-        ICameraAccountApplication cameraAccountApplication,
-        IEmployeeFaceEmbeddingApplication employeeFaceEmbeddingApplication, IHttpClientFactory httpClientFactory)
-    {
-        _webHostEnvironment = webHostEnvironment;
-        _configuration = configuration;
-        _employeeApplication = employeeApplication;
-        _rollCallApplication = rollCallApplication;
-        _authHelper = authHelper;
-        _rollCallServiceApplication = rollCallServiceApplication;
-        _rollCallEmployeeApplication = rollCallEmployeeApplication;
-        _personnelCodeApplication = personnelCodeApplication;
-        _accountApplication = accountApplication;
-        _passwordHasher = passwordHasher;
-        _cameraAccountApplication = cameraAccountApplication;
-        _employeeFaceEmbeddingApplication = employeeFaceEmbeddingApplication;
-        _httpClientFactory = httpClientFactory;
-        _faceEmbeddingHttpClient = httpClientFactory.CreateClient();
-        _faceEmbeddingHttpClient.BaseAddress = new Uri("http://localhost:8000/");
-        _workshopId= authHelper.GetWorkshopId();
-        
-    }
-
-    [HttpPost("login")]
-    [AllowAnonymous]
-    public IActionResult CameraLogin([FromBody] CameraLoginRequest request)
-    {
-        _accountApplication.CameraLogin(request);
-        return Ok();
-    }
-
-
-    [HttpPost("embedding")]
-    [AllowAnonymous]
-    public async Task<ActionResult<List<EmployeeFaceEmbeddingDto>>> WorkshopEmbedding()
-    {
-        if (!User.Identity?.IsAuthenticated ?? false)
-        {
-            return Unauthorized();
-        }
-        _workshopId = _authHelper.GetWorkshopId(); 
-        var data = await _employeeFaceEmbeddingApplication
-            .GetByWorkshopIdsAsync([_workshopId]);
-        
-        return data;
-    }
-    
-    [HttpPost("flag/{employeeId:long}")]
-    public async Task<IActionResult> GetFlag(long employeeId)
-    {
-        var flagId = _rollCallApplication.Flag(employeeId, _workshopId);
-        return Ok(new
-        {
-            flagId = flagId,
-            status = flagId == 0 ? "enter": "exit"
-        });
-    }
-
-    [HttpPost("exit")]
-    public IActionResult Exit([FromBody]RollCallExitRequest request)
-    {
-        var employeeId = request.EmployeeId;
-        var flagId = request.FlagId;
-        bool rollCallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId,
-            _workshopId);
-        
-        if (!rollCallEmployee)
-        {
-            throw new BadRequestException("پرسنل مورد نظر غیر فعال است");
-        }
-        
-        _faceEmbeddingHttpClient.PostAsync("embeddings/refine",
-            JsonContent.Create(new {
-                employeeId,
-                workshopId = _workshopId,
-                embedding =request.Embeddings ,
-                confidence =request.Confidence ,
-                metadata =new{},
-                
-            }));
-        
-        
-        
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, _workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
-            
-            case "outRegistred-InvalidIncom":
-            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
-            
-        }
-        
-        var res = _rollCallApplication.Edit(flagId);
-        
-        if (res.IsSuccedded)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = true,
-            });
-        }
-
-        throw new BadRequestException(res.Message);
-    }
-
-    [HttpPost("enter")]
-    public IActionResult Enter([FromBody]RollCallEnterRequest request)
-    {
-        var employeeId = request.EmployeeId;
-        var now = DateTime.Now;
-        var command = new CreateRollCall()
-        {
-            WorkshopId = _workshopId,
-            EmployeeId = request.EmployeeId,
-            StartDate = now,
-        };
-        bool rollCallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId,
-            _workshopId);
-        
-        if (!rollCallEmployee)
-        {
-            throw new BadRequestException("پرسنل مورد نظر غیر فعال است");
-        }
-        
-        _faceEmbeddingHttpClient.PostAsync("embeddings/refine",
-            JsonContent.Create(new {
-                employeeId,
-                workshopId = _workshopId,
-                embedding =request.Embeddings ,
-                confidence =request.Confidence ,
-                metadata =new{},
-                
-                
-            }));
-        
-        
-        
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, _workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
-            
-            case "outRegistred-InvalidIncom":
-                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
-            
-        }
-        
-
-        var res = _rollCallApplication.Create(command);
-        if (res.IsSuccedded)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = true,
-            });
-        }
-        else
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-            });
-        }
-    }
-    
-    
-    [HttpGet("SendPersonelCodeToGetEmployeeId")]
-    public IActionResult SendPersonelCodeToGetEmployeeId(long personelCode, long workshopId)
-    {
-        long employeeId = _personnelCodeApplication.GetEmployeeIdByPersonelCode(personelCode, workshopId);
-
-        if (employeeId == 0)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-                message = "کد پرسنلی یافت نشد",
-            });
-        }
-
-        bool rollcallEmployee = _rollCallEmployeeApplication.IsEmployeeRollCallActive(employeeId, workshopId);
-        if (!rollcallEmployee)
-        {
-            return new JsonResult(new
-            {
-                isSuccess = false,
-                message = "پرسنل مورد نظر غیر فعال است",
-            });
-        }
-
-        var repeatStatus = _rollCallApplication.CheckRepeat(employeeId, workshopId);
-        switch (repeatStatus)
-        {
-            case "IncomRegistred-InvalidOut":
-                return new JsonResult(new
-                {
-                    isSuccess = false,
-                    message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
-                });
-            case "outRegistred-InvalidIncom":
-                return new JsonResult(new
-                {
-                    isSuccess = false,
-                    message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
-                });
-        }
-
-        return new JsonResult(new
-        {
-            isSuccess = true,
-            message = "",
-            personId = $"{employeeId}",
-        });
-    }
-
-    [HttpGet("EmployeeFlag")]
-    public IActionResult EmployeeFlag(long employeeId, long workshopId)
-    {
-        var employee = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
-        var employeeFullName = employee?.EmployeeFullName ?? string.Empty;
-        var flagId = _rollCallApplication.Flag(employeeId, workshopId);
-
-        return new JsonResult(new
-        {
-            employeeName = employeeFullName,
-            flag = flagId
-        });
-    }
-    
-
-    [HttpGet("Logout")]
-    public IActionResult Logout()
-    {
-        _accountApplication.Logout();
-        return new JsonResult(new { isSuccess = true });
-    }
-}
-
-public class RollCallExitRequest:RollCallEnterRequest
-{
-    public long FlagId { get; set; }
-}
-public class RollCallEnterRequest
-{
-    public long EmployeeId { get; set; }
-    public List<double> Embeddings { get; set; }
-    public float Confidence { get; set; }
-}
-
-public class CameraFlagRequest
-{
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-}

ServiceHost/Areas/Client/Controllers/FinancialController.cs

@@ -86,15 +86,15 @@ public class FinancialController : ClientBaseController
         {
             CallBackUrl = callbackUrl,
             Amount = balanceAmount.Amount/10,
-            TransactionId = transaction.SendId.ToString(),
+            InvoiceId = transaction.SendId.ToString(),
         };
 
         var gatewayResponse = await _paymentGateway.Create(command, cancellationToken);
 
         if (gatewayResponse.IsSuccess)
         {
-            _ = await _paymentTransactionApplication.SetTransactionId(transaction.SendId, gatewayResponse.Token);
-            return Redirect(_paymentGateway.GetStartPayUrl(gatewayResponse.Token));
+            _ = await _paymentTransactionApplication.SetTransactionId(transaction.SendId, gatewayResponse.TransactionId);
+            return Redirect(_paymentGateway.GetStartPayUrl(gatewayResponse.TransactionId));
         }
 
         if (gatewayResponse.ErrorCode.HasValue)

ServiceHost/BaseControllers/CameraBaseController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ServiceHost.BaseControllers;
 
 
-[ApiExplorerSettings(GroupName = "Camera")]
+//[ApiExplorerSettings(GroupName = "Camera")]
 [Authorize(Policy = "CameraArea")]
 [Area("Camera")]
 [Route("api/[area]/[controller]")]

ServiceHost/Controllers/GeneralController.cs

@@ -1,47 +1,29 @@
 using _0_Framework.Application;
-using _0_Framework.Application.PaymentGateway;
-using Company.Domain.BankAgg;
-using Company.Domain.PaymentTransactionAgg;
-using CompanyManagment.App.Contracts.FinancialStatment;
-using CompanyManagment.App.Contracts.FinancilTransaction;
 using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.EFCore.Migrations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using NuGet.Protocol;
-using Parbad;
 using ServiceHost.BaseControllers;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using System.Net.Http;
-using System.Security.Cryptography;
-using System.Threading;
-using CompanyManagment.App.Contracts.FinancialInvoice;
-using CompanyManagment.App.Contracts.InstitutionContract;
+using _0_Framework.Application.PaymentGateway;
+using Microsoft.Extensions.Options;
+using CompanyManagment.App.Contracts.FinancialStatment;
+using CompanyManagment.App.Contracts.FinancilTransaction;
 
 namespace ServiceHost.Controllers;
 
 public class GeneralController : GeneralBaseController
 {
+
     private readonly IPaymentTransactionApplication _paymentTransactionApplication;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IFinancialStatmentApplication _financialStatmentApplication;
-    private readonly IFinancialInvoiceApplication _financialInvoiceApplication;
-    private readonly IInstitutionContractApplication _institutionContractApplication;
 
-    public GeneralController(IPaymentTransactionApplication paymentTransactionApplication,
-        IHttpClientFactory clientFactory, IFinancialStatmentApplication financialStatmentApplication,
-        IFinancialInvoiceApplication financialInvoiceApplication,
-        IInstitutionContractApplication institutionContractApplication)
+    public GeneralController(IPaymentTransactionApplication paymentTransactionApplication,IHttpClientFactory clientFactory, IFinancialStatmentApplication financialStatmentApplication, IOptions<AppSettingConfiguration> appSetting)
     {
         _paymentTransactionApplication = paymentTransactionApplication;
-        _paymentGateway = new SepehrPaymentGateway(clientFactory);
+        _paymentGateway = new AqayePardakhtPaymentGateway(clientFactory, appSetting);
         _financialStatmentApplication = financialStatmentApplication;
-        _financialInvoiceApplication = financialInvoiceApplication;
-        _institutionContractApplication = institutionContractApplication;
     }
 
     /// <summary>
@@ -65,139 +47,9 @@ public class GeneralController : GeneralBaseController
         });
     }
 
-
-    [HttpGet("/api/callback"), HttpPost("/api/callback")]
-    public async Task<IActionResult> Verify(SepehrGatewayPayResponse payResponse)
-    {
-        if (!long.TryParse(payResponse.invoiceid, out var paymentTransactionId))
-        {
-            return BadRequest("Invalid invoice_id");
-        }
-
-        var transaction = await _paymentTransactionApplication.GetDetails(paymentTransactionId);
-
-        if (transaction == null)
-        {
-            return NotFound("Transaction not found");
-        }
-
-        if (transaction.Status != PaymentTransactionStatus.Pending)
-        {
-            return BadRequest("این تراکنش قبلا پرداخت شده است");
-        }
-
-
-        if (payResponse.respcode != 0)
-        {
-            return await HandleFailedTransaction(transaction);
-        }
-
-        var extraData = JsonConvert.DeserializeObject<IDictionary<string, object>>(payResponse.payload);
-        extraData.TryGetValue("financialInvoiceId", out var financialInvoiceIdObj);
-        if (financialInvoiceIdObj == null ||
-            !long.TryParse(financialInvoiceIdObj.ToString(), out var financialInvoiceId))
-        {
-            return BadRequest("فاکتور مالی نامعتبر است");
-        }
-
-
-        var financialInvoice = _financialInvoiceApplication.GetDetails(financialInvoiceId);
-
-        if (financialInvoice == null)
-        {
-            return BadRequest("فاکتور مالی نامعتبر است");
-        }
-
-        if (financialInvoice.Status != FinancialInvoiceStatus.Unpaid)
-        {
-            return BadRequest("فاکتور مالی نامعتبر است");
-        }
-
-        if (financialInvoice.Amount != transaction.Amount)
-        {
-            return await HandleFailedTransaction(transaction);
-        }
-
-        var verifyCommand = new VerifyPaymentGateWayRequest()
-        {
-            Amount = transaction.Amount,
-            TransactionId = payResponse.invoiceid,
-            DigitalReceipt = payResponse.digitalreceipt
-        };
-
-        var verifyRes = await _paymentGateway.Verify(verifyCommand, CancellationToken.None);
-        _financialInvoiceApplication.SetPaid(financialInvoiceId, DateTime.Now);
-
-        if (verifyRes.IsSuccess)
-        {
-            var command = new CreateFinancialStatment()
-            {
-                ContractingPartyId = transaction.ContractingPartyId,
-                Deptor = 0,
-                Creditor = transaction.Amount,
-                DeptorString = "0",
-                TypeOfTransaction = "credit",
-                DescriptionOption = financialInvoice.Description + "شماره فاکتور" + financialInvoice.InvoiceNumber,
-                Description = "درگاه بانکی",
-            };
-            var statementResult = _financialStatmentApplication.CreateFromBankGateway(command);
-            if (!statementResult.IsSuccedded)
-            {
-                return new JsonResult(statementResult);
-            }
-
-            var setSuccessResult = _paymentTransactionApplication.SetSuccess(paymentTransactionId,
-                payResponse.cardnumber, payResponse.issuerbank, payResponse.rrn.ToString(),
-                payResponse.digitalreceipt);
-
-            if (financialInvoice.Items?.Any(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract) ?? false)
-            {
-                var financialItems = financialInvoice.Items
-                    .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
-                foreach (var editFinancialInvoiceItem in financialItems)
-                {
-                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId);
-                }
-            }
-
-            if (!setSuccessResult.IsSuccedded)
-            {
-                return await HandleFailedTransaction(transaction);
-            }
-
-            return Redirect(BuildCallbackUrl(transaction.CallBackUrl, true, transaction.Id));
-        }
-
-        // در غیر این صورت تراکنش ناموفق است
-        return await HandleFailedTransaction(transaction);
-
-
-        //var data = JsonConvert.SerializeObject(invoice.AdditionalData);
-        //var statics =
-        //JsonConvert.SerializeObject(res);
-
-        //await _onlinePayment.CancelAsync(invoice);
-        //return new JsonResult(new
-        //{
-        //	data,
-        //	statics
-        //});
-
-        //// Check if the invoice is new, or it's already processed before.
-        //if (invoice.Status != PaymentFetchResultStatus.ReadyForVerifying)
-        //{
-        //	// You can also see if the invoice is already verified before.
-        //	var isAlreadyVerified = invoice.IsAlreadyVerified;
-
-        //	return Content("The payment was not successful.");
-        //}
-
-        //// Note: Save the verifyResult.TransactionCode in your database.
-    }
-
-    [HttpPost("/api/callback3232")]
-    public async Task<IActionResult> OnGetCallBack(string? transid, string? cardnumber, string? tracking_number,
-        string bank, string invoice_id, string? status, CancellationToken cancellationToken)
+    [HttpPost("/api/callback")]
+    public async Task<IActionResult> OnGetCallBack(string? transid, string? cardnumber, string? tracking_number, 
+        string bank, string invoice_id, string? status,CancellationToken cancellationToken)
     {
         if (!long.TryParse(invoice_id, out var paymentTransactionId))
         {
@@ -218,15 +70,15 @@ public class GeneralController : GeneralBaseController
         // اگر شماره کارت یا شماره پیگیری خالی باشد، تراکنش ناموفق است
         if (string.IsNullOrWhiteSpace(cardnumber) || string.IsNullOrWhiteSpace(tracking_number))
         {
-            return await HandleFailedTransaction(transaction);
+            return await HandleFailedTransaction(transaction, paymentTransactionId);
         }
 
         var verifyCommand = new VerifyPaymentGateWayRequest()
         {
-            Amount = transaction.Amount / 10,
+            Amount = transaction.Amount/10,
             TransactionId = transid
         };
-        var verifyRes = await _paymentGateway.Verify(verifyCommand, cancellationToken);
+        var verifyRes =await _paymentGateway.Verify(verifyCommand, cancellationToken);
 
         // اگر استاتوس 1 باشد، تراکنش موفق است
         if (verifyRes.IsSuccess)
@@ -240,31 +92,30 @@ public class GeneralController : GeneralBaseController
                 TypeOfTransaction = "credit",
                 DescriptionOption = "بابت قرارداد مابین (روابط کار)",
                 Description = "درگاه بانکی",
+
             };
             var statementResult = _financialStatmentApplication.CreateFromBankGateway(command);
             if (!statementResult.IsSuccedded)
             {
-                return await HandleFailedTransaction(transaction);
+                return await HandleFailedTransaction(transaction, paymentTransactionId);
             }
 
-            var setSuccessResult =
-                _paymentTransactionApplication.SetSuccess(paymentTransactionId, cardnumber, bank, null, null);
+            var setSuccessResult = _paymentTransactionApplication.SetSuccess(paymentTransactionId, cardnumber, bank);
 
             if (!setSuccessResult.IsSuccedded)
             {
                 return new JsonResult(setSuccessResult);
             }
-
             return Redirect(BuildCallbackUrl(transaction.CallBackUrl, true, transaction.Id));
         }
 
         // در غیر این صورت تراکنش ناموفق است
-        return await HandleFailedTransaction(transaction);
+        return await HandleFailedTransaction(transaction, paymentTransactionId);
     }
 
-    private async Task<IActionResult> HandleFailedTransaction(PaymentTransactionDetailsViewModel transaction)
+    private async Task<IActionResult> HandleFailedTransaction(PaymentTransactionDetailsViewModel transaction, long transactionId)
     {
-        var result = _paymentTransactionApplication.SetFailed(transaction.Id);
+        var result = _paymentTransactionApplication.SetFailed(transactionId);
         if (!result.IsSuccedded)
         {
             return new JsonResult(result);
@@ -278,83 +129,6 @@ public class GeneralController : GeneralBaseController
         var statusCode = isSuccess ? "1" : "0";
         return $"{baseUrl}/callback?Status={statusCode}&transactionId={transactionId}";
     }
-}
 
-public class TokenReq
-{
-    public long Amount { get; set; }
 
-    public string CallbackUrl { get; set; }
-
-    [Display(Name = "شماره فاکتور")]
-    [MaxLength(100)]
-    [Required]
-    [Key]
-    // be ezaye har pazirande bayad yekta bashad
-    public string invoiceID { get; set; }
-
-    [Required] public long terminalID { get; set; }
-
-    /*
-     * JSON Bashad
-     * etelaate takmili site harchi
-     * nabayad char khas dashte bashe (*'"xp_%!+- ...)
-     */
-    public string Payload { get; set; } = "";
-    public string email { get; set; }
-}
-
-public class TokenResp
-{
-    // if 0 = success
-    public int Status { get; set; }
-    public string AccessToken { get; set; }
-}
-
-public class PayRequest
-{
-    [Required] [MaxLength(3000)] public string token { get; set; }
-    [Required] public long terminalID { get; set; }
-    public string nationalCode { get; set; }
-}
-
-public class SepehrGatewayPayResponse
-{
-    /* 0 yni movafaq
-     * -1 yni enseraf
-     * -2 yni etmam zaman
-     */
-    public int respcode { get; set; }
-    [Display(Name = "متن نتیجه تراکنش")] public string respmsg { get; set; }
-
-    [Display(Name = "مبلغ کسر شده از مشتری")]
-    public long amount { get; set; }
-
-    [Display(Name = " شماره فاکتور ")] public string invoiceid { get; set; }
-
-    [Display(Name = " اطلاعاتی که پذیرنده ارسال کرد ")]
-    public string payload { get; set; }
-
-    [Display(Name = " شماره ترمینال ")] public long terminalid { get; set; }
-
-    [Display(Name = " شماره پیگیری ")] public long tracenumber { get; set; }
-
-    // bayad negah dari she hatman to db
-    [Display(Name = " شماره سند بانکی ")] public long rrn { get; set; }
-
-    [Display(Name = " زمان و تاریخ پرداخت ")]
-    public string datepaid { get; set; }
-
-    [Display(Name = " رسید دیجیتال ")] public string digitalreceipt { get; set; }
-
-    [Display(Name = " نام بانک صادر کننده کارت ")]
-    public string issuerbank { get; set; }
-
-    [Display(Name = " شماره کارت ")] public string cardnumber { get; set; }
-}
-
-public class AdviceReq
-{
-    [Display(Name = " رسید دیجیتال ")] public string digitalreceipt { get; set; }
-    public long Tid { get; set; }
 }

ServiceHost/Program.cs

@@ -24,15 +24,12 @@ using ServiceHost.Test;
 using System.Text.Json.Serialization;
 using System.Text.Json;
 using _0_Framework.InfraStructure.Mongo;
-using Bogus;
 using CompanyManagment.EFCore.Services;
 using Microsoft.AspNetCore.CookiePolicy;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Diagnostics;
 using MongoDB.Driver;
-using Parbad.Builder;
-using Parbad.Gateway.Sepehr;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
 
@@ -309,29 +306,11 @@ builder.Services.AddCors(options =>
 
 builder.Services.AddExceptionHandler<CustomExceptionHandler>();
 
-var sepehrTerminalId = builder.Configuration.GetValue<long>("SepehrGateWayTerminalId");
-
-builder.Services.AddParbad().ConfigureGateways(gateways =>
-{
-	gateways.AddSepehr().WithAccounts(accounts =>
-	{
-		accounts.AddInMemory(account =>
-		{
-			account.TerminalId = sepehrTerminalId;
-            account.Name="Sepehr Account";
-		});
-	});
-}).ConfigureHttpContext(httpContext=>httpContext.UseDefaultAspNetCore())
-.ConfigureStorage(storage =>
-{
-	storage.UseMemoryCache();
-});
 
 var app = builder.Build();
 app.UseCors("AllowSpecificOrigins");
 
 
-
 #region Mahan
 
 //app.UseStatusCodePagesWithRedirects("/error/{0}");
@@ -345,7 +324,6 @@ if (builder.Environment.IsDevelopment())
     await tester.Test();
 }
 
-
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();

ServiceHost/ServiceHost.csproj

@@ -90,8 +90,6 @@
 	  </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
     <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
-    <PackageReference Include="Parbad.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="Parbad.Storage.Cache" Version="1.5.0" />
     <PackageReference Include="SocialExplorer.FastDBF" Version="1.0.0" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />

ServiceHost/appsettings.Development.json

@@ -41,11 +41,8 @@
   },
   "SmsSettings": {
     "IsTestMode": true,
-    "TestNumbers": [ "09116967898"
-    //, "09116067106", "09114221321"
-    ]
-  },
-  "SepehrGateWayTerminalId": 99213700
+    "TestNumbers": [ "09116967898", "09116067106", "09114221321" ]
+  }
 
 }
 

ServiceHost/appsettings.json

@@ -35,7 +35,5 @@
   "SmsSettings": {
     "IsTestMode": false,
     "TestNumbers": []
-  },
-  "SepehrGateWayTerminalId": 99213700
-
+  }
 }