remove organization assignment logic in device and services modules
This commit is contained in:
@@ -22,7 +22,6 @@ from apps.core.mixins.admin_mixin import AdminFilterMixin
|
||||
from apps.core.mixins.search_mixin import DynamicSearchMixin
|
||||
from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
|
||||
from apps.pos_device import models as pos_models
|
||||
from apps.pos_device.services.services import get_organization_by_stake_holder
|
||||
from apps.pos_device.web.api.v1.serilaizers import device as device_serializer
|
||||
from apps.pos_device.web.api.v1.viewsets.client import POSClientViewSet
|
||||
from apps.product.models import Broker
|
||||
@@ -238,7 +237,7 @@ class DeviceAssignmentViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
|
||||
client_org.save()
|
||||
|
||||
# after pos device assignment, must set owner
|
||||
# as default stake holder
|
||||
# as default stakeholder
|
||||
pos_models.StakeHolders.objects.create(
|
||||
assignment=assignment,
|
||||
device=assignment.device,
|
||||
@@ -381,13 +380,10 @@ class StakeHolderShareAmountViewSet(SoftDeleteMixin, viewsets.ModelViewSet, Dyna
|
||||
organization = get_organization_by_user(request.user)
|
||||
data.update({'registering_organization': organization.id})
|
||||
|
||||
# set assigner and assigned organization in distribution data
|
||||
# set assigner organization in distribution data
|
||||
assigner_organization = get_organization_by_user(request.user)
|
||||
data['distribution'].update({'assigner_organization': assigner_organization.id})
|
||||
|
||||
assigned_organization = get_organization_by_stake_holder(id=data['stakeholders'])
|
||||
data['distribution'].update({'assigned_organization': assigned_organization.id})
|
||||
|
||||
# create distribution
|
||||
if 'distribution' in data.keys():
|
||||
distribution = CustomOperations().custom_create(
|
||||
|
||||
Reference in New Issue
Block a user