diff --git a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs index 0ee58c91..2e0f87a2 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs @@ -99,10 +99,20 @@ public class InstitutionContractListWorkshop public class WorkshopServicesViewModel { public bool Insurance { get; set; } + public static string InsuranceLabel ="ارسال لیست بیمه"; public bool InsuranceInPerson { get; set; } + public static string InsuranceInPersonLabel ="خدمات حضوری"; public bool Contract { get; set; } + public static string ContractLabel ="قرارداد و تصفیه حساب"; + public bool ContractInPerson { get; set; } + public static string ContractInPersonLabel ="خدمات حضوری"; public bool RollCall { get; set; } + public static string RollCallLabel ="ساعت حضور و غیاب"; + public bool RollCallInPerson { get; set; } + public static string RollCallInPersonLabel ="خدمات مستقیم"; + public bool CustomizeCheckout { get; set; } + public static string CustomizeCheckoutLabel ="فیش غیر رسمی"; } \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs index dfef132f..525c58a6 100644 --- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs +++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs @@ -708,11 +708,11 @@ public class institutionContractController : AdminBaseController return await _institutionContractApplication.GetVerificationDetails(id); } - [HttpPost("/api/institutionContract/Verification")] + [HttpPost("/api/institutionContract/Verify")] [AllowAnonymous] public async Task> Verify([FromBody] InstitutionVerificationRequest command) { - var res = await _institutionContractApplication.Verify(command.Id, command.Code); + var res = await _institutionContractApplication.VerifyOtp(command.Id, command.Code); return res; } @@ -723,14 +723,6 @@ public class institutionContractController : AdminBaseController var res = await _institutionContractApplication.SendVerifyOtp(id); return res; } - - [HttpPost("/api/institutionContract/Verification/{id:guid}/verify-otp")] - public async Task> VerifyOtp([FromBody]VerifyOtpRequest command) - { - var res = await _institutionContractApplication.VerifyOtp(command.PublicId, command.Code); - return res; - } - } public class VerifyOtpRequest