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

* renamed paymentproovement -> paymentprovement

Browse Source
This commit is contained in:
Phil Zhitnikov 2023-07-12 20:03:24 +04:00
parent 0caad35598
commit 6a1e85d524
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
store/models.py
View File

@ -325,7 +325,7 @@ class Checklist(models.Model):
on_delete=models.SET_NULL) on_delete=models.SET_NULL)
images = models.ManyToManyField('Image', verbose_name='Изображения', related_name='+', blank=True) images = models.ManyToManyField('Image', verbose_name='Изображения', related_name='+', blank=True)
payment_proof = models.ManyToManyField('Image', verbose_name='Подтверждение оплаты', related_name='+', blank=True) # paymentproovement payment_proof = models.ManyToManyField('Image', verbose_name='Подтверждение оплаты', related_name='+', blank=True) # paymentprovement
receipt = models.ImageField('Фото чека', upload_to=Image.TYPE_TO_UPLOAD_PATH[Image.DOC], null=True, blank=True) # checkphoto receipt = models.ImageField('Фото чека', upload_to=Image.TYPE_TO_UPLOAD_PATH[Image.DOC], null=True, blank=True) # checkphoto
delivery = models.CharField('Тип доставки', max_length=15, choices=DeliveryType.CHOICES, null=True, blank=True) delivery = models.CharField('Тип доставки', max_length=15, choices=DeliveryType.CHOICES, null=True, blank=True)

4
store/serializers.py
View File

@ -97,7 +97,7 @@ class ChecklistSerializer(serializers.ModelSerializer):
paymenttype = serializers.SlugRelatedField(source='payment_method', slug_field='slug', paymenttype = serializers.SlugRelatedField(source='payment_method', slug_field='slug',
queryset=PaymentMethod.objects.all(), queryset=PaymentMethod.objects.all(),
required=False, allow_null=True) required=False, allow_null=True)
paymentproovement = ImageListSerializer(source='payment_proof', required=False, allow_null=True) paymentprovement = ImageListSerializer(source='payment_proof', required=False, allow_null=True)
checkphoto = Base64ImageField(source='receipt', required=False, allow_null=True) checkphoto = Base64ImageField(source='receipt', required=False, allow_null=True)
trackid = serializers.CharField(source='poizon_tracking', required=False, allow_null=True) trackid = serializers.CharField(source='poizon_tracking', required=False, allow_null=True)
cdek_tracking = serializers.CharField(required=False, allow_null=True) cdek_tracking = serializers.CharField(required=False, allow_null=True)
@ -189,7 +189,7 @@ class ChecklistSerializer(serializers.ModelSerializer):
'fullprice', 'realprice', 'fullprice', 'realprice',
'buyername', 'buyerphone', 'tg', 'buyername', 'buyerphone', 'tg',
'receivername', 'reveiverphone', 'receivername', 'reveiverphone',
'split', 'paymenttype', 'paymentproovement', 'checkphoto', 'split', 'paymenttype', 'paymentprovement', 'checkphoto',
'trackid', 'cdek_tracking', 'cdek_barcode_pdf', 'delivery', 'delivery_display', 'trackid', 'cdek_tracking', 'cdek_barcode_pdf', 'delivery', 'delivery_display',
'startDate', 'currentDate', 'startDate', 'currentDate',
) )