diff --git a/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs b/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs index 8baee048..b966a3c6 100644 --- a/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs +++ b/CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs @@ -160,4 +160,6 @@ public class CreateCheckout public TimeSpan TotalPaidLeave { get; set; } public TimeSpan TotalSickLeave { get; set; } + public bool HasLeft { get; set; } + } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs b/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs index ab435f57..9fd90608 100644 --- a/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs +++ b/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs @@ -57,4 +57,12 @@ public class ContractingPartyGetListViewModel /// public ActivationStatus Status { get; set; } + + public string Address { get; set; } + public string PhoneNumber { get; set; } + public string NationalId { get; set; } + public string RepresentativeName { get; set; } + + + } \ No newline at end of file diff --git a/CompanyManagment.Application/CheckoutApplication.cs b/CompanyManagment.Application/CheckoutApplication.cs index bd4fca43..afc9bea7 100644 --- a/CompanyManagment.Application/CheckoutApplication.cs +++ b/CompanyManagment.Application/CheckoutApplication.cs @@ -200,11 +200,11 @@ public class CheckoutApplication : ICheckoutApplication .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList(); command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble()); - - + var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId, - command.WorkshopId, command.ContractStartGr, command.ContractEndGr) - .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList(); + command.WorkshopId, command.ContractStartGr, command.HasLeft ? DateTime.MaxValue : command.ContractEndGr) + .Select(x => + new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList(); command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble()); diff --git a/CompanyManagment.EFCore/Repository/LoanRepository.cs b/CompanyManagment.EFCore/Repository/LoanRepository.cs index 92efc586..366fdde6 100644 --- a/CompanyManagment.EFCore/Repository/LoanRepository.cs +++ b/CompanyManagment.EFCore/Repository/LoanRepository.cs @@ -36,17 +36,10 @@ public class LoanRepository : RepositoryBase, ILoanRepository var startDate = loan.LoanInstallments.MinBy(x => x.InstallmentDate).InstallmentDate; var endDate = loan.LoanInstallments.MaxBy(x => x.InstallmentDate).InstallmentDate; var pc = new PersianCalendar(); - var customizeCheckouts = (await _companyContext.CheckoutSet - .Where(x => x.WorkshopId == loan.WorkshopId && x.EmployeeId == loan.EmployeeId && - startDate<=x.ContractEnd && endDate>=x.ContractEnd) - .Select(x => x.ContractStart).ToListAsync()) - .Select(x => - { - - var year = pc.GetYear(x); - var month = pc.GetMonth(x); - return new { Month = month, Year = year }; - }); + var checkouts = (await _companyContext.CheckoutSet + .Where(x => x.WorkshopId == loan.WorkshopId && x.EmployeeId == loan.EmployeeId && + startDate <= x.ContractEnd && endDate >= x.ContractEnd).AsNoTracking() + .SelectMany(x => x.LoanInstallments).ToListAsync()); var result = new LoanDetailsViewModel() { @@ -60,7 +53,7 @@ public class LoanRepository : RepositoryBase, ILoanRepository Id = x.Id, InstallmentAmount = x.AmountForMonth.ToMoney(), InstallmentDate = x.InstallmentDate.ToFarsi(), - IsPaid = customizeCheckouts.Any(c => c.Month.ToString("00") == x.Month && c.Year.ToString() == x.Year), + IsPaid = checkouts.Any(c => c.EntityId == x.Id), }).ToList() }; diff --git a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs index 5a72e8eb..718ac6a4 100644 --- a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs +++ b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs @@ -567,7 +567,11 @@ public class PersonalContractingPartyRepository : RepositoryBase i.IsActiveString == "true"), NationalIdOrNationalCode = x.contractingParty.IsLegal == "حقیقی" ? x.contractingParty.Nationalcode : x.contractingParty.NationalId, - Status = x.contractingParty.IsActiveString == "true" ? ActivationStatus.Active : ActivationStatus.DeActive + Status = x.contractingParty.IsActiveString == "true" ? ActivationStatus.Active : ActivationStatus.DeActive, + Address = x.contractingParty.Address, + NationalId = x.contractingParty.NationalId, + PhoneNumber = x.contractingParty.Phone, + RepresentativeName = x.contractingParty.RepresentativeFullName }).ToListAsync(); return result; } diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml index 30a37640..fca01fe8 100644 --- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml @@ -230,9 +230,12 @@
-
- -
+
+ +
+
+ +
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml index 6f17ca6b..025f5756 100644 --- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml @@ -230,9 +230,12 @@
-
- -
+
+ +
+
+ +
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs index 9dc85a10..08161c0a 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs @@ -1076,7 +1076,8 @@ public class IndexModel : PageModel // ساعت موظفی پرسنل برای این ماه EmployeeMandatoryHours = mandatoryCompute.EmployeeMandatoryHours, - HasInsuranceChekoutOverTime = workshop.InsuranceCheckoutOvertime + HasInsuranceChekoutOverTime = workshop.InsuranceCheckoutOvertime, + HasLeft = separation.HasLeft }; _checkoutApplication.Create(command); diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml index 12066b96..928e334d 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml @@ -299,10 +299,23 @@
- + + +
- + +
diff --git a/ServiceHost/Pages/contact-us/Index.cshtml b/ServiceHost/Pages/contact-us/Index.cshtml index e3469289..24c73869 100644 --- a/ServiceHost/Pages/contact-us/Index.cshtml +++ b/ServiceHost/Pages/contact-us/Index.cshtml @@ -196,13 +196,13 @@
نشانی گزارشگیر
-
منطقه آزاد انزلی، مجتمع ونوس طبقه اول، قرفه ۵۵۰
+
رشت - خیابان حاجی آباد - روبروی پارکینگ بزرگ حاجی آباد - ابتدای کوچه سپهدار - ساختمان دادماش - طبقه پنجم - واحد 17
شماره تماس
-
۰۱۳۳۲۳۲۸۸۸۶
-
۰۱۳۳۲۳۲۸۸۸۷
-
۰۱۳۳۳۲۴۴۹۲۶
-
۰۱۳۳۳۲۳۸۷۷۷
+
01333238777
+
01333328886
+
01333328887
+