From b4ec056ec6b997b95445d7478216516797981edc Mon Sep 17 00:00:00 2001 From: mostafa7171 Date: Sat, 24 Jan 2026 22:18:58 +0330 Subject: [PATCH] update for wage --- panel/KillHouse/views.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/panel/KillHouse/views.py b/panel/KillHouse/views.py index 6b18090..579e1c1 100644 --- a/panel/KillHouse/views.py +++ b/panel/KillHouse/views.py @@ -19747,9 +19747,15 @@ class KillHouseLock(APIView): kill_house = KillHouse.objects.filter(kill_house_operator__user=user, trash=False).first() kill_house_purchase = KillHousePurchaseRequest.objects.filter(kill_house=kill_house).first() total_unpaid_wage = get_finance_info(kill_house)['total_price'] - slaughter_transactions = InternalTransaction.objects.filter(Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), - status='completed', - trash=False) + if kill_house.killer and kill_house.type=='public': + slaughter_transactions = InternalTransaction.objects.filter(kill_house=kill_house,parent_kill_house=kill_house, + status='completed', + trash=False) + else: + slaughter_transactions = InternalTransaction.objects.filter( + Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), + status='completed', + trash=False) total_paid_wage = slaughter_transactions.aggregate(total=Sum('amount'))[ 'total'] or 0