phzhik/kwork-poizonstore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ yuan_rate_last_updated in GlobalSettings serializer

Browse Source 
* Show raw yuan_rate in GlobalSettings
* Use yuan_rate+yuan_rate_commission sum for Checklist calculations
This commit is contained in:
Phil Zhitnikov 2023-11-23 03:32:54 +04:00
parent ceeae24f69
commit ccd9c60a97
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
store/models.py
View File

@ -81,10 +81,9 @@ class GlobalSettings(models.Model):
self.yuan_rate = rate self.yuan_rate = rate
self.yuan_rate_last_updated = timezone.now() self.yuan_rate_last_updated = timezone.now()
self.save() self.save()
return rate
# Default # Default
return self.yuan_rate return self.yuan_rate + self.yuan_rate_commission
class Category(MPTTModel): class Category(MPTTModel):

5
store/serializers.py
View File

@ -211,14 +211,15 @@ class AnonymousUserChecklistSerializer(ChecklistSerializer):
class GlobalSettingsSerializer(serializers.ModelSerializer): class GlobalSettingsSerializer(serializers.ModelSerializer):
currency = serializers.DecimalField(source='get_yuan_rate', read_only=True, max_digits=10, decimal_places=2) currency = serializers.DecimalField(source='yuan_rate', read_only=True, max_digits=10, decimal_places=2)
yuan_rate_last_updated = serializers.DateTimeField(read_only=True)
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)
commission = serializers.DecimalField(source='commission_rub', max_digits=10, decimal_places=2) commission = serializers.DecimalField(source='commission_rub', max_digits=10, decimal_places=2)
pickup = serializers.CharField(source='pickup_address') pickup = serializers.CharField(source='pickup_address')
class Meta: class Meta:
model = GlobalSettings model = GlobalSettings
fields = ('currency', 'yuan_rate_commission', 'commission', 'chinadelivery', 'pickup', 'time_to_buy') fields = ('currency', 'yuan_rate_last_updated', 'yuan_rate_commission', 'commission', 'chinadelivery', 'pickup', 'time_to_buy')
class PaymentMethodSerializer(serializers.ModelSerializer): class PaymentMethodSerializer(serializers.ModelSerializer):