diff --git a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
index 159fda16..3d4ba428 100644
--- a/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
+++ b/Company.Domain/InstitutionContractAgg/InstitutionContract.cs
@@ -276,7 +276,7 @@ public class InstitutionContract : EntityBase
{
Amendments.Add(amendment);
}
-}
+
public void SetSigningType(InstitutionContractSigningType signingType)
{
SigningType = signingType;
diff --git a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
index 468d1ebc..43928b66 100644
--- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
@@ -259,7 +259,6 @@ public interface IInstitutionContractApplication
///
Task PrintOneAsync(long id);
- Task SetPendingWorkflow(long entityId);
Task GetContractWorkshopsDetails(long id);
@@ -272,34 +271,6 @@ public interface IInstitutionContractApplication
///
///
Task VerifyInstitutionContractManually(long institutionContractId);
-
-
- public string TotalAmount { get; set; }
- ///
- /// ارزش افزوده
- ///
- public string Tax { get; set; }
- ///
- /// مبلغ قابل پرداخت
- ///
- public string PaymentAmount { get; set; }
-
- public string DiscountedAmount { get; set; }
-
- public int DiscountPercetage { get; set; }
-
- public string Obligation { get; set; }
-
- public string OneMonthAmount { get; set; }
-}
-
-public class InstitutionContractResetDiscountForCreateRequest
-{
- public int DiscountPercentage { get; set; }
- public double TotalAmount { get; set; }
- public bool IsInstallment { get; set; }
- public InstitutionContractDuration Duration { get; set; }
- public double OneMonthAmount { get; set; }
}
public class GetInstitutionAmendmentVerificationDetailsViewModel
@@ -319,30 +290,6 @@ public class GetInstitutionAmendmentVerificationDetailsViewModel
}
-
-public class InstitutionContractSetDiscountForExtensionRequest
-{
- public Guid TempId { get; set; }
- public int DiscountPercentage { get; set; }
- public double TotalAmount { get; set; }
- public bool IsInstallment { get; set; }
-}
-public class InstitutionContractResetDiscountForExtensionRequest
-{
- public Guid TempId { get; set; }
- public bool IsInstallment { get; set; }
-}
-
-
-public class InstitutionContractSetDiscountRequest
-{
- public int DiscountPercentage { get; set; }
- public double TotalAmount { get; set; }
- public InstitutionContractDuration Duration { get; set; }
- public double OneMonthAmount { get; set; }
- public bool IsInstallment { get; set; }
-}
-
public class InstitutionContractAmendmentCompleteRequest
{
public Guid TempId { get; set; }
@@ -357,46 +304,3 @@ public class GetInstitutionContractWorkshopsDetails
public List Workshops { get; set; }
}
-
-
-public class InstitutionContractPrintViewModel
-{
- public InstitutionContratVerificationParty FirstParty { get; set; }
- public InstitutionContratVerificationParty SecondParty { get; set; }
- public string ContractNo { get; set; }
- public string CreationDate { get; set; }
- public string ContractStart { get; set; }
- public string ContractEnd { get; set; }
- public List Workshops { get; set; }
- public string TotalPrice { get; set; }
- public string TaxPrice { get; set; }
- public string PaymentPrice { get; set; }
- public string VerifyCode { get; set; }
- public string VerifyDate { get; set; }
- public string VerifyTime { get; set; }
- public string VerifierFullName { get; set; }
- public string VerifierPhoneNumber { get; set; }
- public LawViewModel LawViewModel { get; set; }
- public string Obligation { get; set; }
-}
-
-public class InsertAmendmentTempWorkshopResponse
-{
- public Guid WorkshopTempId { get; set; }
- public string Amount { get; set; }
-}
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
- ///
- ///
- ///
- public List Workshops { get; set; }
-
- public Guid TempId { get; set; }
-
-}
-
-public class InstitutionContractSelectListViewModel : SelectListViewModel;
-
-}
\ No newline at end of file
diff --git a/CompanyManagment.Application/InstitutionContractApplication.cs b/CompanyManagment.Application/InstitutionContractApplication.cs
index edd04758..ad369caf 100644
--- a/CompanyManagment.Application/InstitutionContractApplication.cs
+++ b/CompanyManagment.Application/InstitutionContractApplication.cs
@@ -1537,6 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
}
+
public async Task SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
{
var op = new OperationResult();
@@ -1568,7 +1569,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
- createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
+ createdWorkshop.WorkshopId!.Value, false,createdWorkshop.id);
institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
index a979c6ec..3050b957 100644
--- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
+++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
@@ -3387,13 +3387,13 @@ public class InstitutionContractRepository : RepositoryBasex.Id == amendmentTemp.Id);
await _context.SaveChangesAsync();
diff --git a/ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs b/ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs
index edfc1416..81e32e2b 100644
--- a/ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs
+++ b/ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs
@@ -1,5 +1,6 @@
using _0_Framework.Application;
using AccountManagement.Application.Contracts.Ticket;
+using CompanyManagment.App.Contracts.InstitutionContract;
using CompanyManagment.App.Contracts.InstitutionPlan;
using CompanyManagment.App.Contracts.Workshop;
using Microsoft.AspNetCore.Mvc;
@@ -49,4 +50,7 @@ public class ServiceAmountsManagement : AdminBaseController
return result;
}
+
+
+
}
\ No newline at end of file