* renamed comission -> commission
This commit is contained in:
parent
c6b7bdf8b4
commit
c464b069ba
|
|
@ -60,7 +60,7 @@ class ChecklistSerializer(serializers.ModelSerializer):
|
||||||
fullprice = serializers.DecimalField(source='full_price', read_only=True, max_digits=10, decimal_places=2)
|
fullprice = serializers.DecimalField(source='full_price', read_only=True, max_digits=10, decimal_places=2)
|
||||||
realprice = serializers.DecimalField(source='real_price', required=False, allow_null=True, max_digits=10,
|
realprice = serializers.DecimalField(source='real_price', required=False, allow_null=True, max_digits=10,
|
||||||
decimal_places=2)
|
decimal_places=2)
|
||||||
comission = serializers.SerializerMethodField('get_comission', read_only=True)
|
commission = serializers.SerializerMethodField('get_commission', read_only=True)
|
||||||
|
|
||||||
buyername = serializers.CharField(source='buyer_name', required=False, allow_null=True)
|
buyername = serializers.CharField(source='buyer_name', required=False, allow_null=True)
|
||||||
buyerphone = serializers.CharField(source='buyer_phone', required=False, allow_null=True)
|
buyerphone = serializers.CharField(source='buyer_phone', required=False, allow_null=True)
|
||||||
|
|
@ -149,7 +149,7 @@ class ChecklistSerializer(serializers.ModelSerializer):
|
||||||
return GlobalSettings.load().delivery_price_CN
|
return GlobalSettings.load().delivery_price_CN
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_comission(obj: Checklist):
|
def get_commission(obj: Checklist):
|
||||||
return GlobalSettings.load().commission_rub
|
return GlobalSettings.load().commission_rub
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
@ -159,7 +159,7 @@ class ChecklistSerializer(serializers.ModelSerializer):
|
||||||
'brand', 'model', 'size',
|
'brand', 'model', 'size',
|
||||||
'image',
|
'image',
|
||||||
'previewimage',
|
'previewimage',
|
||||||
'currency', 'curencycurency2', 'currency3', 'chinadelivery', 'chinadelivery2', 'comission',
|
'currency', 'curencycurency2', 'currency3', 'chinadelivery', 'chinadelivery2', 'commission',
|
||||||
'promo',
|
'promo',
|
||||||
'comment',
|
'comment',
|
||||||
'fullprice', 'realprice',
|
'fullprice', 'realprice',
|
||||||
|
|
@ -199,12 +199,12 @@ class GlobalSettingsPickupSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
|
||||||
class GlobalSettingsPriceSerializer(serializers.ModelSerializer):
|
class GlobalSettingsPriceSerializer(serializers.ModelSerializer):
|
||||||
comission = serializers.DecimalField(source='commission_rub', max_digits=10, decimal_places=2)
|
commission = serializers.DecimalField(source='commission_rub', max_digits=10, decimal_places=2)
|
||||||
chinadelivery = serializers.DecimalField(source='delivery_price_CN', max_digits=10, decimal_places=2)
|
chinadelivery = serializers.DecimalField(source='delivery_price_CN', max_digits=10, decimal_places=2)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = GlobalSettings
|
model = GlobalSettings
|
||||||
fields = ('comission', 'chinadelivery')
|
fields = ('commission', 'chinadelivery')
|
||||||
|
|
||||||
|
|
||||||
class CategorySerializer(serializers.ModelSerializer):
|
class CategorySerializer(serializers.ModelSerializer):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user