add device-identity to stakeholder serializer
This commit is contained in:
@@ -85,6 +85,8 @@ class StakeHoldersSerializer(ModelSerializer):
|
|||||||
instance.organization.bank_information.all().first()
|
instance.organization.bank_information.all().first()
|
||||||
).data
|
).data
|
||||||
|
|
||||||
|
representation['device'] = instance.device.device_identity
|
||||||
|
|
||||||
representation['organization'] = {
|
representation['organization'] = {
|
||||||
'name': instance.organization.name,
|
'name': instance.organization.name,
|
||||||
'id': instance.organization.id
|
'id': instance.organization.id
|
||||||
|
|||||||
@@ -259,36 +259,15 @@ class DeviceAssignmentViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
|
|||||||
def update(self, request, pk=None, *args, **kwargs):
|
def update(self, request, pk=None, *args, **kwargs):
|
||||||
""" edit assignment """
|
""" edit assignment """
|
||||||
assignment = self.get_object()
|
assignment = self.get_object()
|
||||||
|
|
||||||
assignment.delete()
|
assignment.delete()
|
||||||
|
|
||||||
|
# delete assignment & recreate it as new
|
||||||
re_create_assignment = self.create(request, *args, **kwargs)
|
re_create_assignment = self.create(request, *args, **kwargs)
|
||||||
print(re_create_assignment.data)
|
|
||||||
assignment = self.queryset.get(id=re_create_assignment.data['id'])
|
assignment = self.queryset.get(id=re_create_assignment.data['id'])
|
||||||
assignment.organization = pos_models.Organization.objects.get(
|
assignment.organization = pos_models.Organization.objects.get(
|
||||||
id=re_create_assignment.data['client']['organization']['id']
|
id=re_create_assignment.data['client']['organization']['id']
|
||||||
)
|
)
|
||||||
assignment.save()
|
assignment.save()
|
||||||
# if 'client_data' in request.data.keys():
|
|
||||||
# client = CustomOperations().custom_update(
|
|
||||||
# request=request,
|
|
||||||
# view=POSClientViewSet(),
|
|
||||||
# data_key='client_data',
|
|
||||||
# obj_id=request.data['client_data']['id']
|
|
||||||
# )
|
|
||||||
# request.data.update({'client': client['id']})
|
|
||||||
#
|
|
||||||
# serializer = self.serializer_class(data=request.data, instance=assignment, partial=True)
|
|
||||||
# if serializer.is_valid():
|
|
||||||
# assignment = serializer.save()
|
|
||||||
#
|
|
||||||
# if assignment.client.organization:
|
|
||||||
# # update default stake holder for device (assignment)
|
|
||||||
# stake_holder = assignment.stake_holders.filter(default=True).first()
|
|
||||||
# stake_holder.organization = assignment.client.organization
|
|
||||||
# stake_holder.save()
|
|
||||||
#
|
|
||||||
# return Response(serializer.data, status=status.HTTP_200_OK)
|
|
||||||
return re_create_assignment
|
return re_create_assignment
|
||||||
|
|
||||||
@action(
|
@action(
|
||||||
|
|||||||
Reference in New Issue
Block a user