Merge branch 'Feature/InstitutionContract/add-registration-style' into Main

CompanyManagment.App.Contracts/InstitutionContract/RegistrationWorkflowMainListViewModel.cs

@@ -38,6 +38,8 @@ public class RegistrationWorkflowMainListViewModel
     /// مبلغ
     /// </summary>
     public double Amount { get; set; }
+
+    public long ContractingPartyId { get; set; }
 }
 
 /// <summary>
@@ -69,6 +71,8 @@ public class RegistrationWorkflowItemsViewModel
     /// وضعیت انجام شدن
     /// </summary>
     public bool IsDone { get; set; }
+
+    public long WorkshopDetailsId { get; set; }
 }
 
 /// <summary>

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

@@ -114,4 +114,5 @@ public class ReviewAndPaymentViewModel
     /// شمسی
     /// </summary>
     public string ContractEndFa { get; set; }
+    
 }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -1425,6 +1425,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     DoneWorkshops = x.institutionContract.WorkshopDetails.Count(w => w.WorkshopCreated),
                     TotalWorkshops = x.institutionContract.WorkshopDetails.Count(),
                     UnDoneWorkshops = x.institutionContract.WorkshopDetails.Count(w => !w.WorkshopCreated),
+                    ContractingPartyId = x.contractingParty.id
                 }).ToListAsync();
     }
 
@@ -1490,6 +1491,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 PersonnelCount = workshopDetail.PersonnelCount,
                 WorkshopName = workshopDetail.WorkshopName,
                 Employers = employers,
+                WorkshopDetailsId = workshopDetail.id
             };
         }).ToList();
 

ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs

@@ -53,7 +53,7 @@ namespace ServiceHost.Areas.Admin.Controllers
 
         [HttpPost("create-workshop")]
         public async Task<ActionResult<OperationResult>> CreateWorkshop(
-            CreateWorkshopWorkflowRegistration command)
+            [FromBody]CreateWorkshopWorkflowRegistration command)
         {
             var result = await _workshopApplication.CreateWorkshopWorkflowRegistration(command);
             return result;

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -620,6 +620,7 @@ public class institutionContractController : AdminBaseController
             TotalTax = res.ValueAddedTaxStr,
             ContractStart = res.ContractStartFa,
             ContractEnd = res.ContractEndFa,
+            Discount = res.Discount??"0",
             
         };
         return response;
@@ -677,6 +678,7 @@ public class InstitutionPlanCalculatorResponse
     public string MonthlyTotalAmountWithoutTax { get; set; }
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }
+    public string Discount { get; set; }
 }
 
 public class WorkshopServiceCalculatorResponse