admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
SamSys
2025-12-22 13:24:53 +03:30
parent f13688ccb2
commit 68b42c98d6
5 changed files with 14 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Company.Domain/InstitutionContractAgg/InstitutionContract.cs
View File

@@ -276,7 +276,7 @@ public class InstitutionContract : EntityBase
{
Amendments.Add(amendment);
}
}
public void SetSigningType(InstitutionContractSigningType signingType)
{
SigningType = signingType;

96
CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
View File

@@ -259,7 +259,6 @@ public interface IInstitutionContractApplication
/// <returns></returns>
Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
Task<OperationResult> SetPendingWorkflow(long entityId);
Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id);
@@ -272,34 +271,6 @@ public interface IInstitutionContractApplication
/// <returns></returns>
/// </summary>
Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
public string TotalAmount { get; set; }
/// <summary>
/// ارزش افزوده
/// </summary>
public string Tax { get; set; }
/// <summary>
/// مبلغ قابل پرداخت
/// </summary>
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<InstitutionContractListWorkshop> 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<GetInstitutionVerificationDetailsWorkshopsViewModel> 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
{
/// <summary>
///
/// </summary>
public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
public Guid TempId { get; set; }
}
public class InstitutionContractSelectListViewModel : SelectListViewModel;
}

3
CompanyManagment.Application/InstitutionContractApplication.cs
View File

@@ -1537,6 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
}
public async Task<OperationResult> 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);

14
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -3387,13 +3387,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
request.IsInstallment,changes,request.LawId);
institutionContract.AddAmendment(amendment);
await _smsService.SendInstitutionAmendmentVerificationLink(
institutionContract.VerifierPhoneNumber,
institutionContract.ContractingPartyName,
institutionContract.PublicId,
institutionContract.ContractingPartyId,
institutionContract.id
);
//await _smsService.SendInstitutionAmendmentVerificationLink(
// institutionContract.VerifierPhoneNumber,
// institutionContract.ContractingPartyName,
// institutionContract.PublicId,
// institutionContract.ContractingPartyId,
// institutionContract.id
// );
await _institutionAmendmentTemp.DeleteOneAsync(x=>x.Id == amendmentTemp.Id);
await _context.SaveChangesAsync();

4
ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs
View File

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