xoliqberdiyev/ibapp-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
behruz-dev
2025-10-07 16:36:21 +05:00
parent 377cc531f6
commit 0a856b05f7
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/apps/orders/models/party.py
View File

@@ -59,23 +59,23 @@ class Party(BaseModel):
def __str__(self): def __str__(self):
return f'P - {self.number}' return f'P - {self.number}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# if self.status in ['NEW', 'CANCELLED', 'DRAFT']: if self.status in ['NEW', 'CANCELLED', 'DRAFT']:
# self.process = 0 self.process = 0
# elif self.status == 'EXPECTED': elif self.status == 'EXPECTED':
# self.process = 25 self.process = 25
# elif self.status == 'PROCESS': elif self.status == 'PROCESS':
# self.process = 50 self.process = 50
# elif self.status == 'PURCHASED': elif self.status == 'PURCHASED':
# self.process = 75 self.process = 75
# elif self.status == 'PARTY_IS_MADE': elif self.status == 'PARTY_IS_MADE':
# self.process = 100 self.process = 100
# if hasattr(self, 'party_amount') and self.party_amount.paid_amount > 0 and self.party_amount.payment_amount > 0: if hasattr(self, 'party_amount') and self.party_amount.paid_amount > 0 and self.party_amount.payment_amount > 0:
# self.payment_percentage = (self.party_amount.paid_amount / self.party_amount.payment_amount) * 100 self.payment_percentage = (self.party_amount.paid_amount / self.party_amount.payment_amount) * 100
# self.party_amount.save() self.party_amount.save()
# else: else:
# self.payment_percentage = 100 self.payment_percentage = 100
# return super().save(*args, **kwargs) return super().save(*args, **kwargs)
class Meta: class Meta:
verbose_name = 'Partiya' verbose_name = 'Partiya'

3
core/apps/orders/serializers/party.py
View File

@@ -428,7 +428,10 @@ class PartyExpenceCreateSerializer(serializers.ModelSerializer):
if expence.party.currency == "uzs": if expence.party.currency == "uzs":
expence.party.party_amount.payment_amount -= expence.price expence.party.party_amount.payment_amount -= expence.price
expence.party.party_amount.paid_amount += expence.price expence.party.party_amount.paid_amount += expence.price
print(expence.party.party_amount.payment_amount)
print(expence.party.party_amount.paid_amount)
expence.party.save() expence.party.save()
expence.party.refresh_from_db()
elif expence.party.currency == 'usd': elif expence.party.currency == 'usd':
expence.party.party_amount.payment_amount -= round(expence.price / usd_value) expence.party.party_amount.payment_amount -= round(expence.price / usd_value)
expence.party.party_amount.paid_amount += round(expence.price / usd_value) expence.party.party_amount.paid_amount += round(expence.price / usd_value)