fix - remove child_total / not self.instanceto validate in distribution serializer
This commit is contained in:
@@ -149,5 +149,5 @@ class RancherViewSet(viewsets.ModelViewSet, DynamicSearchMixin):
|
|||||||
return Response(serializer.data, status=status.HTTP_200_OK)
|
return Response(serializer.data, status=status.HTTP_200_OK)
|
||||||
else:
|
else:
|
||||||
return Response({
|
return Response({
|
||||||
"message": "rancher has not existence"
|
"message": "دامدار با کد ملی مد نظر وجود ندارد" # noqa
|
||||||
}, status=status.HTTP_404_NOT_FOUND)
|
}, status=status.HTTP_404_NOT_FOUND)
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
|
|||||||
if total + amount > quota.quota_weight:
|
if total + amount > quota.quota_weight:
|
||||||
raise QuotaWeightException()
|
raise QuotaWeightException()
|
||||||
else:
|
else:
|
||||||
if parent_distribution.remaining_weight + amount > parent_distribution.remaining_weight:
|
if amount > parent_distribution.remaining_weight:
|
||||||
raise QuotaWeightException()
|
raise QuotaWeightException()
|
||||||
|
|
||||||
if self.instance:
|
if self.instance:
|
||||||
@@ -80,7 +80,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
|
|||||||
raise APIException("وزن وارد شده کمتر از وزن ورودی به انبار است", code=403) # noqa
|
raise APIException("وزن وارد شده کمتر از وزن ورودی به انبار است", code=403) # noqa
|
||||||
|
|
||||||
if self.instance.parent_distribution:
|
if self.instance.parent_distribution:
|
||||||
if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight:
|
if amount > self.instance.parent_distribution.remaining_weight:
|
||||||
raise QuotaWeightException()
|
raise QuotaWeightException()
|
||||||
|
|
||||||
# if weight is more than distribution remaining weight
|
# if weight is more than distribution remaining weight
|
||||||
@@ -88,7 +88,7 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
|
|||||||
if amount + total > self.instance.quota.quota_weight:
|
if amount + total > self.instance.quota.quota_weight:
|
||||||
raise APIException("وزن وارد شده بیشتر از وزن باقیمانده است", code=403) # noqa
|
raise APIException("وزن وارد شده بیشتر از وزن باقیمانده است", code=403) # noqa
|
||||||
else:
|
else:
|
||||||
if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight:
|
if amount > self.instance.parent_distribution.remaining_weight:
|
||||||
raise QuotaWeightException()
|
raise QuotaWeightException()
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|||||||
Reference in New Issue
Block a user