merge from Fix\Create-Reward-for-kebab-in-checkout
This commit is contained in:
@@ -141,14 +141,14 @@ public class CustomizeCheckoutMandatoryViewModel
|
||||
/// مجموع مطالبات
|
||||
/// </summary>
|
||||
public double TotalClaimsDouble => MonthlySalary + FridayPay + OverTimePay + BaseYearsPay + BonusesPay + NightWorkPay +
|
||||
MarriedAllowance + ShiftPay + FamilyAllowance + LeavePay + RewardPay;
|
||||
MarriedAllowance + ShiftPay + FamilyAllowance + LeavePay + RewardPay;
|
||||
|
||||
/// <summary>
|
||||
/// مجموع کسورات
|
||||
/// </summary>
|
||||
public double TotalDeductionsDouble => FineAbsenceDeduction + InsuranceDeduction + LateToWorkDeduction +
|
||||
EarlyExitDeduction + SalaryAidDeduction + InstallmentDeduction +
|
||||
FineDeduction + TaxDeduction;
|
||||
EarlyExitDeduction + SalaryAidDeduction + InstallmentDeduction +
|
||||
FineDeduction + TaxDeduction;
|
||||
|
||||
/// <summary>
|
||||
/// مجموع مطالبات
|
||||
@@ -163,7 +163,7 @@ public class CustomizeCheckoutMandatoryViewModel
|
||||
/// <summary>
|
||||
/// مجموع پرداختی
|
||||
/// </summary>
|
||||
public double TotalPayment => TotalClaimsDouble - TotalDeductionsDouble;
|
||||
public double TotalPayment => Math.Truncate(TotalClaimsDouble - TotalDeductionsDouble);
|
||||
|
||||
#region Employee Information
|
||||
|
||||
|
||||
@@ -4,4 +4,7 @@ public enum RewardType
|
||||
{
|
||||
None,
|
||||
CreatedByCheckoutForBirthDay,
|
||||
Eid,
|
||||
SinzdahBedar,
|
||||
ChahardahFarvardin
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user