changte
This commit is contained in:
@@ -1,3 +1,5 @@
|
|||||||
|
import math
|
||||||
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
@@ -17,7 +19,7 @@ class OrderItemCreateSerializer(serializers.Serializer):
|
|||||||
if not product:
|
if not product:
|
||||||
raise serializers.ValidationError("Product not found")
|
raise serializers.ValidationError("Product not found")
|
||||||
data['product'] = product
|
data['product'] = product
|
||||||
data['price'] = product.price * data['quantity']
|
data['price'] = round((data['quantity'] / product.min_quantity) * product.price)
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
@@ -25,7 +27,6 @@ class OrderCreateSerializer(serializers.Serializer):
|
|||||||
items = OrderItemCreateSerializer(many=True)
|
items = OrderItemCreateSerializer(many=True)
|
||||||
payment_type = serializers.ChoiceField(choices=Order.PAYMENT_TYPE)
|
payment_type = serializers.ChoiceField(choices=Order.PAYMENT_TYPE)
|
||||||
delivery_type = serializers.ChoiceField(choices=Order.DELIVERY_TYPE)
|
delivery_type = serializers.ChoiceField(choices=Order.DELIVERY_TYPE)
|
||||||
delivery_price = serializers.IntegerField(required=False)
|
|
||||||
contact_number = serializers.CharField()
|
contact_number = serializers.CharField()
|
||||||
address = serializers.CharField()
|
address = serializers.CharField()
|
||||||
comment = serializers.CharField(required=False)
|
comment = serializers.CharField(required=False)
|
||||||
@@ -38,7 +39,6 @@ class OrderCreateSerializer(serializers.Serializer):
|
|||||||
user=self.context.get('user'),
|
user=self.context.get('user'),
|
||||||
payment_type=validated_data.get('payment_type'),
|
payment_type=validated_data.get('payment_type'),
|
||||||
delivery_type=validated_data.get('delivery_type'),
|
delivery_type=validated_data.get('delivery_type'),
|
||||||
delivery_price=validated_data.get('delivery_price'),
|
|
||||||
contact_number=validated_data.get('contact_number'),
|
contact_number=validated_data.get('contact_number'),
|
||||||
address=validated_data.get('address'),
|
address=validated_data.get('address'),
|
||||||
comment=validated_data.get('comment'),
|
comment=validated_data.get('comment'),
|
||||||
@@ -46,7 +46,6 @@ class OrderCreateSerializer(serializers.Serializer):
|
|||||||
)
|
)
|
||||||
items = []
|
items = []
|
||||||
total_price = 0
|
total_price = 0
|
||||||
total_price += validated_data.get('delivery_price')
|
|
||||||
for item in order_items:
|
for item in order_items:
|
||||||
product = item.get("product")
|
product = item.get("product")
|
||||||
items.append(OrderItem(
|
items.append(OrderItem(
|
||||||
|
|||||||
Reference in New Issue
Block a user