From 0e27b44499ef8db437b6b9f08e53f89d4d1a8570 Mon Sep 17 00:00:00 2001 From: mostafa7171 Date: Sat, 24 Jan 2026 22:02:04 +0330 Subject: [PATCH] update for wage --- panel/KillHouse/views.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/panel/KillHouse/views.py b/panel/KillHouse/views.py index 1285cf8..6b18090 100644 --- a/panel/KillHouse/views.py +++ b/panel/KillHouse/views.py @@ -3175,10 +3175,16 @@ class KillRequestViewSet(viewsets.ModelViewSet): except: recive_date = datetime.strptime(str(request.data['recive_date']), '%Y-%m-%d %H:%M:%S').date() 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 @@ -17528,9 +17534,15 @@ class MarketKillRequestViewSet(viewsets.ModelViewSet): 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( - 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( + kill_house=kill_house, status='completed', + trash=False) total_paid_wage += slaughter_transactions.aggregate(total=Sum('amount'))[ 'total'] or 0