add new field
This commit is contained in:
@@ -1,137 +1,174 @@
|
|||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from core.apps.finance.models import Income
|
from core.apps.finance.models import Income
|
||||||
|
|
||||||
|
|
||||||
class IncomeListSerializer(serializers.ModelSerializer):
|
class IncomeListSerializer(serializers.ModelSerializer):
|
||||||
cash_transaction = serializers.SerializerMethodField(method_name='get_cash_transaction')
|
cash_transaction = serializers.SerializerMethodField(
|
||||||
payment_type = serializers.SerializerMethodField(method_name='get_payment_type')
|
method_name="get_cash_transaction"
|
||||||
project_folder = serializers.SerializerMethodField(method_name='get_project_folder')
|
)
|
||||||
project = serializers.SerializerMethodField(method_name='get_project')
|
payment_type = serializers.SerializerMethodField(method_name="get_payment_type")
|
||||||
counterparty = serializers.SerializerMethodField(method_name='get_counterparty')
|
project_folder = serializers.SerializerMethodField(method_name="get_project_folder")
|
||||||
type_income = serializers.SerializerMethodField(method_name='get_type_income')
|
project = serializers.SerializerMethodField(method_name="get_project")
|
||||||
user = serializers.SerializerMethodField(method_name='get_user')
|
counterparty = serializers.SerializerMethodField(method_name="get_counterparty")
|
||||||
|
type_income = serializers.SerializerMethodField(method_name="get_type_income")
|
||||||
|
user = serializers.SerializerMethodField(method_name="get_user")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Income
|
model = Income
|
||||||
fields = [
|
fields = [
|
||||||
'id', 'cash_transaction', 'payment_type', 'project_folder', 'project',
|
"id",
|
||||||
'counterparty', 'type_income', 'currency', 'price', 'exchange_rate', 'date',
|
"cash_transaction",
|
||||||
'comment', 'file', 'audit', 'user', 'income_chat'
|
"payment_type",
|
||||||
|
"project_folder",
|
||||||
|
"project",
|
||||||
|
"counterparty",
|
||||||
|
"type_income",
|
||||||
|
"currency",
|
||||||
|
"price",
|
||||||
|
"exchange_rate",
|
||||||
|
"date",
|
||||||
|
"comment",
|
||||||
|
"file",
|
||||||
|
"audit",
|
||||||
|
"user",
|
||||||
|
"income_chat",
|
||||||
|
"created_at",
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_cash_transaction(self, obj):
|
def get_cash_transaction(self, obj):
|
||||||
return {
|
return {"id": obj.cash_transaction.id, "name": obj.cash_transaction.name}
|
||||||
'id': obj.cash_transaction.id,
|
|
||||||
'name': obj.cash_transaction.name
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_payment_type(self, obj):
|
def get_payment_type(self, obj):
|
||||||
return {
|
return {"id": obj.payment_type.id, "name": obj.payment_type.name}
|
||||||
'id': obj.payment_type.id,
|
|
||||||
'name': obj.payment_type.name
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_project_folder(self, obj):
|
def get_project_folder(self, obj):
|
||||||
return {
|
return (
|
||||||
'id': obj.project_folder.id,
|
{"id": obj.project_folder.id, "name": obj.project_folder.name}
|
||||||
'name': obj.project_folder.name
|
if obj.project_folder
|
||||||
} if obj.project_folder else None
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
def get_project(self, obj):
|
def get_project(self, obj):
|
||||||
return {
|
return {"id": obj.project.id, "name": obj.project.name} if obj.project else None
|
||||||
'id': obj.project.id,
|
|
||||||
'name': obj.project.name
|
|
||||||
} if obj.project else None
|
|
||||||
|
|
||||||
def get_counterparty(self, obj):
|
def get_counterparty(self, obj):
|
||||||
return {
|
return (
|
||||||
'id': obj.counterparty.id,
|
{"id": obj.counterparty.id, "name": obj.counterparty.name}
|
||||||
'name': obj.counterparty.name
|
if obj.counterparty
|
||||||
} if obj.counterparty else None
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
def get_type_income(self, obj):
|
def get_type_income(self, obj):
|
||||||
return {
|
return (
|
||||||
'id': obj.type_income.id,
|
{"id": obj.type_income.id, "name": obj.type_income.name}
|
||||||
'name': obj.type_income.name
|
if obj.type_income
|
||||||
} if obj.type_income else None
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
def get_user(self, obj):
|
def get_user(self, obj):
|
||||||
return {
|
return (
|
||||||
'id': obj.user.id,
|
{
|
||||||
'full_name': obj.user.full_name,
|
"id": obj.user.id,
|
||||||
} if obj.user else None
|
"full_name": obj.user.full_name,
|
||||||
|
}
|
||||||
|
if obj.user
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class IncomeCreateSerializer(serializers.ModelSerializer):
|
class IncomeCreateSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Income
|
model = Income
|
||||||
fields = [
|
fields = [
|
||||||
'cash_transaction', 'payment_type', 'project_folder', 'project',
|
"cash_transaction",
|
||||||
'counterparty', 'type_income', 'currency', 'price', 'exchange_rate', 'date',
|
"payment_type",
|
||||||
'comment', 'file', 'audit'
|
"project_folder",
|
||||||
|
"project",
|
||||||
|
"counterparty",
|
||||||
|
"type_income",
|
||||||
|
"currency",
|
||||||
|
"price",
|
||||||
|
"exchange_rate",
|
||||||
|
"date",
|
||||||
|
"comment",
|
||||||
|
"file",
|
||||||
|
"audit",
|
||||||
]
|
]
|
||||||
|
|
||||||
def create(self, validated_data):
|
def create(self, validated_data):
|
||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
income = Income.objects.create(
|
income = Income.objects.create(
|
||||||
user=self.context.get('user'),
|
user=self.context.get("user"),
|
||||||
cash_transaction=validated_data['cash_transaction'],
|
cash_transaction=validated_data["cash_transaction"],
|
||||||
payment_type=validated_data['payment_type'],
|
payment_type=validated_data["payment_type"],
|
||||||
project_folder=validated_data.get('project_folder'),
|
project_folder=validated_data.get("project_folder"),
|
||||||
project=validated_data.get('project'),
|
project=validated_data.get("project"),
|
||||||
counterparty=validated_data.get('counterparty'),
|
counterparty=validated_data.get("counterparty"),
|
||||||
type_income=validated_data.get('type_income'),
|
type_income=validated_data.get("type_income"),
|
||||||
currency=validated_data.get('currency'),
|
currency=validated_data.get("currency"),
|
||||||
price=validated_data.get('price') * validated_data.get('exchange_rate') if validated_data.get('exchange_rate') else validated_data.get('price'),
|
price=(
|
||||||
exchange_rate=validated_data.get('exchange_rate'),
|
validated_data.get("price") * validated_data.get("exchange_rate")
|
||||||
date=validated_data.get('date'),
|
if validated_data.get("exchange_rate")
|
||||||
comment=validated_data.get('comment'),
|
else validated_data.get("price")
|
||||||
file=validated_data.get('file'),
|
),
|
||||||
audit=validated_data.get('audit')
|
exchange_rate=validated_data.get("exchange_rate"),
|
||||||
|
date=validated_data.get("date"),
|
||||||
|
comment=validated_data.get("comment"),
|
||||||
|
file=validated_data.get("file"),
|
||||||
|
audit=validated_data.get("audit"),
|
||||||
)
|
)
|
||||||
cash_transaction = income.cash_transaction
|
cash_transaction = income.cash_transaction
|
||||||
payment_type = income.payment_type
|
payment_type = income.payment_type
|
||||||
|
|
||||||
if validated_data.get('currency') == 'uzs':
|
if validated_data.get("currency") == "uzs":
|
||||||
cash_transaction.income_balance_uzs += income.price
|
cash_transaction.income_balance_uzs += income.price
|
||||||
cash_transaction.total_balance_uzs = cash_transaction.income_balance_uzs - cash_transaction.expence_balance_uzs
|
cash_transaction.total_balance_uzs = (
|
||||||
|
cash_transaction.income_balance_uzs
|
||||||
|
- cash_transaction.expence_balance_uzs
|
||||||
|
)
|
||||||
payment_type.total_uzs += income.price
|
payment_type.total_uzs += income.price
|
||||||
|
|
||||||
if income.counterparty:
|
if income.counterparty:
|
||||||
if income.counterparty.debit_uzs != 0:
|
if income.counterparty.debit_uzs != 0:
|
||||||
income.counterparty.debit_uzs -= income.price
|
income.counterparty.debit_uzs -= income.price
|
||||||
income.counterparty.total_debit -= income.price
|
income.counterparty.total_debit -= income.price
|
||||||
|
|
||||||
income.counterparty.kredit_uzs += income.counterparty.debit_uzs - income.price
|
income.counterparty.kredit_uzs += (
|
||||||
|
income.counterparty.debit_uzs - income.price
|
||||||
|
)
|
||||||
income.counterparty.total_kredit += income.price
|
income.counterparty.total_kredit += income.price
|
||||||
else:
|
else:
|
||||||
income.counterparty.kredit_uzs += income.price
|
income.counterparty.kredit_uzs += income.price
|
||||||
income.counterparty.total_kredit += income.price
|
income.counterparty.total_kredit += income.price
|
||||||
income.counterparty.save()
|
income.counterparty.save()
|
||||||
|
|
||||||
elif validated_data.get('currency') == 'usd':
|
elif validated_data.get("currency") == "usd":
|
||||||
cash_transaction.income_balance_usd += income.price
|
cash_transaction.income_balance_usd += income.price
|
||||||
cash_transaction.total_balance_usd = cash_transaction.income_balance_usd - cash_transaction.expence_balance_usd
|
cash_transaction.total_balance_usd = (
|
||||||
|
cash_transaction.income_balance_usd
|
||||||
|
- cash_transaction.expence_balance_usd
|
||||||
|
)
|
||||||
payment_type.total_usd += income.price
|
payment_type.total_usd += income.price
|
||||||
if income.counterparty:
|
if income.counterparty:
|
||||||
if income.counterparty.debit_usd != 0:
|
if income.counterparty.debit_usd != 0:
|
||||||
income.counterparty.debit_usd -= validated_data.get('price')
|
income.counterparty.debit_usd -= validated_data.get("price")
|
||||||
income.counterparty.total_debit -= income.price
|
income.counterparty.total_debit -= income.price
|
||||||
|
|
||||||
income.counterparty.kredit_usd += income.counterparty.debit_usd - validated_data.get('price')
|
income.counterparty.kredit_usd += (
|
||||||
|
income.counterparty.debit_usd - validated_data.get("price")
|
||||||
|
)
|
||||||
income.counterparty.total_kredit += income.price
|
income.counterparty.total_kredit += income.price
|
||||||
else:
|
else:
|
||||||
income.counterparty.kredit_usd += validated_data.get('price')
|
income.counterparty.kredit_usd += validated_data.get("price")
|
||||||
income.counterparty.total_kredit += income.price
|
income.counterparty.total_kredit += income.price
|
||||||
income.counterparty.save()
|
income.counterparty.save()
|
||||||
|
|
||||||
cash_transaction.save()
|
cash_transaction.save()
|
||||||
payment_type.save()
|
payment_type.save()
|
||||||
return income
|
return income
|
||||||
|
|
||||||
|
|
||||||
class IncomeDeleteSerializer(serializers.Serializer):
|
class IncomeDeleteSerializer(serializers.Serializer):
|
||||||
comment = serializers.CharField()
|
comment = serializers.CharField()
|
||||||
@@ -141,47 +178,84 @@ class IncomeUpdateSerializer(serializers.ModelSerializer):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = Income
|
model = Income
|
||||||
fields = [
|
fields = [
|
||||||
'project_folder', 'project', 'price', 'type_income', 'counterparty',
|
"project_folder",
|
||||||
'date', 'comment', 'audit', 'file',
|
"project",
|
||||||
|
"price",
|
||||||
|
"type_income",
|
||||||
|
"counterparty",
|
||||||
|
"date",
|
||||||
|
"comment",
|
||||||
|
"audit",
|
||||||
|
"file",
|
||||||
]
|
]
|
||||||
extra_kwargs = {
|
extra_kwargs = {
|
||||||
'price': {'required': False},
|
"price": {"required": False},
|
||||||
}
|
}
|
||||||
|
|
||||||
def update(self, instance, validated_data):
|
def update(self, instance, validated_data):
|
||||||
old_price = instance.price
|
old_price = instance.price
|
||||||
instance.project_folder = validated_data.get('project_folder', instance.project_folder)
|
instance.project_folder = validated_data.get(
|
||||||
instance.project = validated_data.get('project', instance.project)
|
"project_folder", instance.project_folder
|
||||||
instance.price = validated_data.get('price', instance.price)
|
)
|
||||||
instance.type_income = validated_data.get('type_income', instance.type_income)
|
instance.project = validated_data.get("project", instance.project)
|
||||||
instance.counterparty = validated_data.get('counterparty', instance.counterparty)
|
instance.price = validated_data.get("price", instance.price)
|
||||||
instance.date = validated_data.get('date', instance.date)
|
instance.type_income = validated_data.get("type_income", instance.type_income)
|
||||||
instance.comment = validated_data.get('comment', instance.comment)
|
instance.counterparty = validated_data.get(
|
||||||
instance.audit = validated_data.get('audit', instance.audit)
|
"counterparty", instance.counterparty
|
||||||
instance.file = validated_data.get('file', instance.file)
|
)
|
||||||
if validated_data.get('price'):
|
instance.date = validated_data.get("date", instance.date)
|
||||||
|
instance.comment = validated_data.get("comment", instance.comment)
|
||||||
|
instance.audit = validated_data.get("audit", instance.audit)
|
||||||
|
instance.file = validated_data.get("file", instance.file)
|
||||||
|
if validated_data.get("price"):
|
||||||
cash_transaction = instance.cash_transaction
|
cash_transaction = instance.cash_transaction
|
||||||
payment_type = instance.payment_type
|
payment_type = instance.payment_type
|
||||||
if old_price > validated_data.get('price'):
|
if old_price > validated_data.get("price"):
|
||||||
if instance.currency == 'uzs':
|
if instance.currency == "uzs":
|
||||||
cash_transaction.income_balance_uzs -= (old_price - validated_data.get('price'))
|
cash_transaction.income_balance_uzs -= (
|
||||||
cash_transaction.total_balance_uzs -= (old_price - validated_data.get('price'))
|
old_price - validated_data.get("price")
|
||||||
payment_type.total_uzs -= (old_price - validated_data.get('price')) if payment_type.total_uzs > (old_price - validated_data.get('price')) else 0
|
)
|
||||||
|
cash_transaction.total_balance_uzs -= (
|
||||||
|
old_price - validated_data.get("price")
|
||||||
|
)
|
||||||
|
payment_type.total_uzs -= (
|
||||||
|
(old_price - validated_data.get("price"))
|
||||||
|
if payment_type.total_uzs
|
||||||
|
> (old_price - validated_data.get("price"))
|
||||||
|
else 0
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
cash_transaction.income_balance_usd -= (old_price - validated_data.get('price'))
|
cash_transaction.income_balance_usd -= (
|
||||||
cash_transaction.total_balance_usd -= (old_price - validated_data.get('price'))
|
old_price - validated_data.get("price")
|
||||||
payment_type.total_usd -= (old_price - validated_data.get('price')) if payment_type.total_usd > (old_price - validated_data.get('price')) else 0
|
)
|
||||||
|
cash_transaction.total_balance_usd -= (
|
||||||
|
old_price - validated_data.get("price")
|
||||||
|
)
|
||||||
|
payment_type.total_usd -= (
|
||||||
|
(old_price - validated_data.get("price"))
|
||||||
|
if payment_type.total_usd
|
||||||
|
> (old_price - validated_data.get("price"))
|
||||||
|
else 0
|
||||||
|
)
|
||||||
|
|
||||||
elif old_price < validated_data.get('price'):
|
elif old_price < validated_data.get("price"):
|
||||||
if instance.currency == 'uzs':
|
if instance.currency == "uzs":
|
||||||
cash_transaction.income_balance_uzs += (old_price - validated_data.get('price'))
|
cash_transaction.income_balance_uzs += (
|
||||||
cash_transaction.total_balance_uzs += (old_price - validated_data.get('price'))
|
old_price - validated_data.get("price")
|
||||||
payment_type.total_uzs += (old_price - validated_data.get('price'))
|
)
|
||||||
|
cash_transaction.total_balance_uzs += (
|
||||||
|
old_price - validated_data.get("price")
|
||||||
|
)
|
||||||
|
payment_type.total_uzs += old_price - validated_data.get("price")
|
||||||
else:
|
else:
|
||||||
cash_transaction.income_balance_usd += (old_price - validated_data.get('price'))
|
cash_transaction.income_balance_usd += (
|
||||||
cash_transaction.total_balance_usd += (old_price - validated_data.get('price'))
|
old_price - validated_data.get("price")
|
||||||
payment_type.total_usd += (old_price - validated_data.get('price'))
|
)
|
||||||
|
cash_transaction.total_balance_usd += (
|
||||||
|
old_price - validated_data.get("price")
|
||||||
|
)
|
||||||
|
payment_type.total_usd += old_price - validated_data.get("price")
|
||||||
cash_transaction.save()
|
cash_transaction.save()
|
||||||
payment_type.save()
|
payment_type.save()
|
||||||
instance.save()
|
instance.save()
|
||||||
return instance
|
return instance
|
||||||
|
|||||||
Reference in New Issue
Block a user