Merge remote-tracking branch 'origin/Main' into Main

CompanyManagment.App.Contracts/Hubs/CheckoutHub.cs

@@ -1,11 +1,24 @@
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using Microsoft.AspNetCore.SignalR;
 
 namespace CompanyManagment.App.Contracts.Hubs;
 
 public class CheckoutHub : Hub
 {
+    private readonly IAuthHelper _authHelper;
 
+    public CheckoutHub(IAuthHelper authHelper)
+    {
+        _authHelper = authHelper;
+    }
+
+    public override async Task OnConnectedAsync()
+    {
+        var accountId = _authHelper.CurrentAccountId();
+        await send(accountId);
+        await base.OnConnectedAsync();
+    }
     public async Task send(long id)
     {
         await Groups.AddToGroupAsync(Context.ConnectionId, GetGroupName(id));

CompanyManagment.Application/CheckoutApplication.cs

@@ -926,7 +926,8 @@ public class CheckoutApplication : ICheckoutApplication
                     ContractEnd = item.ContractEnd,
                     GetWorkDate = item.FirstGetWorkingDay,
                     GetWorkDateHide = item.FirstGetWorkingDay,
-
+                    WorkshopIds = workshopId,
+                    EmployeeId = item.EmployeeId,
                 };
 
                 //دستمزد روزانه بدون تاثیر ساعت کار

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -5352,7 +5352,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             : contractingParty.NationalId;
         var createAcc = new RegisterAccount
         {
-            Fullname = contractingParty.LName,
+            Fullname = contractingPartyFullName,
             Username = userPass,
             Password = userPass,
             Mobile = contractingParty.Phone,

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -162,7 +162,9 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
         var emp = _context.WorkshopEmployers.Where(x => x.WorkshopId == id)
             .Select(x => x.Employer).ToList();
         var contractingPart = emp.Select(x => x.ContractingPartyId).ToList();
-        bool rewardCompute = contractingPart.Any(x=>x == 30804);
+        //سیب سامانه = 30414
+        //30804 = اسقائی
+        bool rewardCompute = contractingPart.Any(x=>x == 30804 || x == 30414);
         return _context.Workshops.Select(x => new EditWorkshop
         {
             Id = x.id,