fix merge

companies/views.py

@@ -18,8 +18,8 @@ from stats.models import StatsLog
 from companies.models import Company
 from companies.serializers import CompanySerializer
 from utils.tag_filters import CompanyTagFilter
-from back_latienda.permissions import IsCreator
 from rest_framework import filters
+from back_latienda.permissions import IsCreator, IsSiteAdmin
 
 from utils import woocommerce
 
@@ -69,11 +69,13 @@ class CompanyViewSet(viewsets.ModelViewSet):
                     # send email to company
                     subject = "Contacto de usuario"
                     email = EmailMessage(subject, company_message, to=[instance.creator.email])
+                    email.content_subtype = "html"
                     email.send()
                     logging.info(f"Email sent to {instance.creator.email} as manager of {instance.name}")
                     # send confirmation email to user
                     subject = 'Confirmación de contacto'
                     email = EmailMessage(subject, message, to=[request.user.email])
+                    email.content_subtype = "html"
                     email.send()
                     logging.info(f"Contact confirmation email sent to {request.user.email}")
                     stats_data = {
@@ -102,10 +104,12 @@ class CompanyViewSet(viewsets.ModelViewSet):
                     })
                     # send email to company
                     email = EmailMessage(subject, company_message, to=[instance.creator.email])
+                    email.content_subtype = "html"
                     email.send()
                     logging.info(f"Email sent to {instance.creator.email} as manager of {instance.name}")
                     # send confirmation email to user
                     email = EmailMessage(subject, user_message, to=[data['email']])
+                    email.content_subtype = "html"
                     email.send()
                     logging.info(f"Contact confirmation email sent to anonymous user {data['email']}")
                     # statslog  data to register interaction
@@ -159,23 +163,37 @@ class CompanyViewSet(viewsets.ModelViewSet):
         return Response(message)
 
 
-@api_view(['GET',])
-@permission_classes([IsAuthenticated,])
+@api_view(['GET'])
+@permission_classes([IsAuthenticated])
 def my_company(request):
-    limit = request.GET.get('limit')
-    offset = request.GET.get('offset')
-    qs = Company.objects.filter(creator=request.user)
-    company_serializer = CompanySerializer(qs, many=True)
-    data = company_serializer.data
-    # RESULTS PAGINATION
-    if limit is not None and offset is not None:
-        limit = int(limit)
-        offset = int(offset)
-        data = data[offset:(limit+offset)]
-    elif limit is not None:
-        limit = int(limit)
-        data = data[:limit]
-    return Response(data=data)
+    if request.user.company:
+        serializer = CompanySerializer(request.user.company)
+        return Response({'company': serializer.data})
+    else:
+        return Response(status=status.HTTP_406_NOT_ACCEPTABLE)
+
+'''
+class MyCompanyViewSet(viewsets.ModelViewSet):
+    model = Company
+    serializer_class = CompanySerializer
+    permission_classes = [IsAuthenticated]
+
+    def get_queryset(self):
+        return self.model.objects.filter(company=self.request.user.company)
+
+    def perform_create(self, serializer):
+        serializer.save(creator=self.request.user)
+'''
+
+class AdminCompanyViewSet(viewsets.ModelViewSet):
+    """ Allows user with role 'SITE_ADMIN' to access all company instances
+    """
+    queryset = Company.objects.all()
+    serializer_class = CompanySerializer
+    permission_classes = [IsSiteAdmin]
+
+    def perform_create(self, serializer):
+        serializer.save(creator=self.request.user)
 
 
 @api_view(['GET',])