diff --git a/CompanyManagment.EFCore/Migrations/20250816131730_Add Public Id to institution contract and contracting party.cs b/CompanyManagment.EFCore/Migrations/20250816131730_Add Public Id to institution contract and contracting party.cs
index c91ec8c6..67966774 100644
--- a/CompanyManagment.EFCore/Migrations/20250816131730_Add Public Id to institution contract and contracting party.cs
+++ b/CompanyManagment.EFCore/Migrations/20250816131730_Add Public Id to institution contract and contracting party.cs
@@ -11,17 +11,7 @@ namespace CompanyManagment.EFCore.Migrations
///
protected override void Up(MigrationBuilder migrationBuilder)
{
- migrationBuilder.AlterColumn(
- name: "RegistrationStatus",
- table: "InstitutionContractTemps",
- type: "int",
- maxLength: 30,
- nullable: false,
- defaultValue: 0,
- oldClrType: typeof(string),
- oldType: "nvarchar(30)",
- oldMaxLength: 30,
- oldNullable: true);
+
migrationBuilder.AddColumn(
name: "PublicId",
diff --git a/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs b/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
index 41c23181..559e1297 100644
--- a/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
+++ b/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
@@ -5586,7 +5586,6 @@ namespace CompanyManagment.EFCore.Migrations
.HasColumnType("uniqueidentifier");
b.Property("RegistrationStatus")
- .IsRequired()
.HasMaxLength(30)
.HasColumnType("nvarchar(30)");
diff --git a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
index ceb723bf..673d0cfe 100644
--- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
+++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
@@ -582,7 +582,7 @@ public class institutionContractController : AdminBaseController
}
[HttpPost("create/workshop-service-calculator")]
- public ActionResult WorkshopServiceCalculator([FromBody]CreateWorkshopTemp command)
+ public ActionResult WorkshopServiceCalculator([FromBody]CreateWorkshopTemp command)
{
var workshopTemp = new WorkshopTempViewModel
{
@@ -596,16 +596,31 @@ public class institutionContractController : AdminBaseController
InsuranceInPerson = command.InsuranceInPerson
};
- return _temporaryClientRegistration.GetInstitutionPlanForWorkshop(workshopTemp);
+ var response = _temporaryClientRegistration.GetInstitutionPlanForWorkshop(workshopTemp);
+
+ var result = new WorkshopServiceCalculatorResponse
+ {
+ TotalAmount = response.OnlineAndInPersonSumAmountDouble
+ };
+ return result;
}
[HttpPost("create/institution-plan-calculator")]
- public async Task> InstitutionPlanCalculator(
+ public async Task> InstitutionPlanCalculator(
[FromBody] InstitutionPlanCalculatorRequest request)
{
var res = await _temporaryClientRegistration.GetTotalPaymentAndWorkshopList(0,
- request.workshopList, paymentModel: request.PaymentModel, contractStartType: request.ContractStartType);
- return res;
+ request.workshopList, paymentModel: request.PaymentModel, contractStartType: request.ContractStartType,duration:request.Duration);
+ var response = new InstitutionPlanCalculatorResponse
+ {
+ Installments = res.MonthlyInstallments,
+ OneTimeTotalAmountWithoutTax = res.OneTimeWithoutTaxPaymentDouble,
+ MonthlyTotalAmountWithoutTax = res.MonthlyWithoutTaxPaymentDouble,
+ OneTimeTotalAmount = res.OneTimeTotalPaymentDouble,
+ MonthlyTotalAmount= res.MonthlyTotalPaymentDouble,
+ TotalTax = res.ValueAddedTaxDouble,
+ };
+ return response;
}
///
@@ -649,8 +664,24 @@ public class institutionContractController : AdminBaseController
}
}
+public class InstitutionPlanCalculatorResponse
+{
+ public double TotalAmountWithTax { get; set; }
+ public double OneTimeTotalAmountWithoutTax { get; set; }
+ public double TotalTax { get; set; }
+ public List Installments { get; set; }
+ public double OneTimeTotalAmount { get; set; }
+ public double MonthlyTotalAmount { get; set; }
+ public double MonthlyTotalAmountWithoutTax { get; set; }
+}
+
+public class WorkshopServiceCalculatorResponse
+{
+ public double TotalAmount { get; set; }
+}
+
public record InstitutionPlanCalculatorRequest(List workshopList,
- string PeriodModel = "12",
+ InstitutionContractDuration Duration = InstitutionContractDuration.TwelveMonths,
string PaymentModel = "OneTime",
string ContractStartType = "currentMonth");