admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Insurance changes

Browse Source
This commit is contained in:
SamSys
2025-05-10 16:59:59 +03:30
parent 8cc26936cd
commit 5ef277d604
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CompanyManagment.Application/InsuranceListApplication.cs
View File

@@ -503,13 +503,13 @@ public class InsuranceListApplication: IInsuranceListApplication
if (workshop.InsuranceCheckoutFamilyAllowance && employeeHasCheckout)
{
benefitsIncludedNonContinuous = benefitsIncludedNonContinuous + familyAllowance;
benefitsIncludedNonContinuous += familyAllowance;
}
if (workshop.InsuranceCheckoutOvertime && employeeHasCheckout)
{
benefitsIncludedContinuous = benefitsIncludedContinuous + overTimePay;
benefitsIncludedContinuous += overTimePay;
}
var includedAndNotIncluded = benefitsIncludedContinuous + benefitsIncludedNonContinuous;
@@ -579,10 +579,10 @@ public class InsuranceListApplication: IInsuranceListApplication
//جمع مزایای مشمول و دستمزد ماهانه
BenefitsIncludedContinuous = benefitsIncludedContinuous,
//مزایای غیر مشمول
//مزایای غیر مشمول *
BenefitsIncludedNonContinuous = benefitsIncludedNonContinuous,
// جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول
// جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول *
IncludedAndNotIncluded = includedAndNotIncluded,
//حق بیمه سهم بیمه شده
@@ -1480,10 +1480,14 @@ public class InsuranceListApplication: IInsuranceListApplication
//آیا در کارگاه تیک محاسبه اضافه کار یا حق اولاد زده شده است؟
//این مورد زمانی چک می شود که تیک محاسبه در کارگاه زده شده باشد
// در غیر اینصورت بصورت پیشفرض دارای فیش حقوق در نظر گرفته می شود
bool hasWorkshopOverTimeOrFamilyAllowance =
workshop.InsuranceCheckoutFamilyAllowance || workshop.InsuranceCheckoutOvertime;
bool employeeHasCheckout = true;
double familyAllowance = 0;
double overTimePay = 0;
if (hasWorkshopOverTimeOrFamilyAllowance && (leftDate >= startDateGr || employeeData.LeftWorkDateGr == null))
{
var checkout = _checkoutRepository.HasCheckout(workshopId, employeeData.EmployeeId,