From 187b7406d2f3011ca00c9355ef80cd96100822ce Mon Sep 17 00:00:00 2001
From: gozareshgir <f0604741@gmail.com>
Date: Tue, 27 Jan 2026 14:14:51 +0330
Subject: [PATCH] fix conflict

---
 CompanyManagment.EFCore/Repository/CheckoutRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
index e393dca6..b9e4416f 100644
--- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs
@@ -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 = "-";