MNPC/Rasadyar_Marzaki
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update for wage

Browse Source
This commit is contained in:
mostafa7171
2026-01-24 22:17:42 +03:30
parent e8832df030
commit c0b059ebfc
6 changed files with 909 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
panel/ProvinceOperator/serializers.py
View File

@@ -2568,12 +2568,13 @@ class POSMachineForLiveStockTransactionsSerializer(serializers.ModelSerializer):
class POSDeviceSessionForInspectionSerializer(serializers.ModelSerializer):
pos = POSMachineForInspectionsSerializer(read_only=True)
lat = serializers.FloatField(source='lot', read_only=True)
lng = serializers.FloatField(read_only=True)
guilds_name = serializers.CharField(source='pos.guild.guilds_name', read_only=True)
class Meta:
model = POSDeviceSession
fields = ['key', 'name', 'pos', 'version', 'session_last_seen_date', 'lng', 'lot']
fields = ['lat', 'lng', 'guilds_name']
class POSMachineForServerSerializer(serializers.ModelSerializer):
class Meta:
@@ -4001,18 +4002,42 @@ class TotalWageInformationSerializer(serializers.ModelSerializer):
except:
user = SystemUserProfile.objects.get(key=self.context.get('request').GET['key'])
kill_house = KillHouse.objects.filter(kill_house_operator__user=user, trash=False).first()
# if date1:
# finance_info = get_finance_info(kill_house, date1, date2)
# slaughter_transactions = InternalTransaction.objects.filter(
# Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), date__date__gte=date1,
# date__date__lte=date2, status='completed',
# trash=False)
#
# else:
# finance_info = get_finance_info(kill_house)
# slaughter_transactions = InternalTransaction.objects.filter(
# Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), status='completed',
# trash=False)
if date1:
finance_info = get_finance_info(kill_house, date1, date2)
slaughter_transactions = InternalTransaction.objects.filter(
Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), date__date__gte=date1,
date__date__lte=date2, 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, date__date__gte=date1,
date__date__lte=date2, status='completed',
trash=False)
else:
slaughter_transactions = InternalTransaction.objects.filter(
Q(kill_house=kill_house) | Q(parent_kill_house=kill_house), date__date__gte=date1,
date__date__lte=date2, status='completed',
trash=False)
else:
finance_info = get_finance_info(kill_house)
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