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

fix conflict

Browse Source
This commit is contained in:
gozareshgir
2026-01-27 14:14:51 +03:30
parent c51bb90a2b
commit 187b7406d2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompanyManagment.EFCore/Repository/CheckoutRepository.cs
View File

@@ -3208,7 +3208,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
var overNightWorkValue = x.NightworkPay > 0 ? x.OverNightWorkValue : "-";
var fridayWorkValue = x.FridayPay > 0 ? x.FridayWorkValue : "-";
var maritalStatus = employees.First(e => e.EmployeeId == x.EmployeeId).MaritalStatus;
var rewardPay = x.RewardPay == null ? "-" : x.RewardPay.ToMoneyCheckZeroNullable();
var rewardPay = x.RewardPay == 0 ? "-" : x.RewardPay.ToMoney();
var rotatingShiftValue = x.ShiftPay > 0 ? x.RotatingShiftValue : "-";
var totalDeduction = "-";
var totalPayment = "-";