device login
This commit is contained in:
@@ -42,13 +42,13 @@ class POSDeviceViewSet(viewsets.ModelViewSet):
|
||||
|
||||
# check if device exists
|
||||
if 'device_identity' in request.data.keys():
|
||||
device = self.device_queryset.filter(device_identity=request.data['device_identity'])
|
||||
device = self.device_queryset.filter(device_identity=request.data['device_identity']).first()
|
||||
else:
|
||||
device = self.device_queryset.filter(serial=serial).first()
|
||||
|
||||
# activate device
|
||||
if device:
|
||||
if not device.is_activated:
|
||||
if not device.is_activated and not device.pre_registered:
|
||||
device.is_activated = True
|
||||
device.save()
|
||||
|
||||
@@ -71,16 +71,15 @@ class POSDeviceViewSet(viewsets.ModelViewSet):
|
||||
|
||||
pre_device = pos_models.Device.objects.create(
|
||||
serial=serial,
|
||||
sdk=sdk,
|
||||
organization=organization,
|
||||
pre_regitered=True,
|
||||
pre_registered=True,
|
||||
is_activated=False
|
||||
)
|
||||
|
||||
return Response({
|
||||
"message": "device pre-registered",
|
||||
"device_identity": pre_device.device_identity
|
||||
}, status=status.HTTP_200_OK)
|
||||
}, status=status.HTTP_412_PRECONDITION_FAILED)
|
||||
|
||||
@action(
|
||||
methods=['post'],
|
||||
@@ -93,10 +92,11 @@ class POSDeviceViewSet(viewsets.ModelViewSet):
|
||||
def merge_devices(self, request):
|
||||
""" merge pre register device & device has registered by psp user """
|
||||
|
||||
pre_device = self.device_queryset.get(device_identity=request.data['pre_device'])
|
||||
real_device = self.device_queryset.get(device_identity=request.data['real_device'])
|
||||
pre_device = self.device_queryset.get(device_identity=request.data['pre_device_identity'])
|
||||
real_device = self.device_queryset.get(device_identity=request.data['real_device_identity'])
|
||||
|
||||
real_device.device_identity = pre_device.device_identity
|
||||
real_device.is_activated = True
|
||||
real_device.save()
|
||||
|
||||
pre_device.delete()
|
||||
|
||||
Reference in New Issue
Block a user