quota, distribution, inventory entry, quota sale transaction, product informations, signals ,....
This commit is contained in:
@@ -98,9 +98,9 @@ class UserViewSet(ModelViewSet):
|
||||
Customizing update user & bank account info with
|
||||
permission levels
|
||||
"""
|
||||
serializer = self.serializer_class(data=request.data)
|
||||
serializer = self.serializer_class(data=request.data, instance=self.get_object(), partial=True)
|
||||
if serializer.is_valid():
|
||||
user = serializer.update(self.queryset.get(id=pk), validated_data=request.data)
|
||||
user = serializer.save()
|
||||
|
||||
if 'organization' in request.data.keys(): # noqa
|
||||
organization = CustomOperations().custom_update( # update organization for user
|
||||
|
||||
@@ -138,8 +138,8 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
instance.ownership = validated_data.get('ownership')
|
||||
instance.address = validated_data.get('address')
|
||||
instance.photo = validated_data.get('photo')
|
||||
instance.province = Province.objects.get(id=validated_data.get('province'))
|
||||
instance.city = City.objects.get(id=validated_data.get('city'))
|
||||
instance.province = validated_data.get('province', instance.province)
|
||||
instance.city = validated_data.get('province', instance.province)
|
||||
instance.otp_status = validated_data.get('otp_status')
|
||||
instance.save()
|
||||
|
||||
@@ -213,14 +213,10 @@ class OrganizationSerializer(serializers.ModelSerializer):
|
||||
def update(self, instance, validated_data):
|
||||
""" update user organization information """ # noqa
|
||||
instance.name = validated_data.get('name', instance.name)
|
||||
if validated_data.get('type'):
|
||||
instance.type = validated_data['type']
|
||||
if validated_data.get('province'):
|
||||
instance.province = validated_data['province']
|
||||
if validated_data.get('city'):
|
||||
instance.city = validated_data['city']
|
||||
if validated_data.get('parent_organization'):
|
||||
instance.parent_organization = validated_data['parent_organization']
|
||||
instance.type = validated_data.get('type', instance.type)
|
||||
instance.province = validated_data.get('province', instance.province)
|
||||
instance.city = validated_data.get('city', instance.city)
|
||||
instance.parent_organization = validated_data.get('parent_organization', instance.parent_organization)
|
||||
instance.national_unique_id = validated_data.get('national_unique_id', instance.national_unique_id)
|
||||
instance.save()
|
||||
return instance
|
||||
|
||||
Reference in New Issue
Block a user