diff --git a/api/views.py b/api/views.py index 9dde124..dca3829 100644 --- a/api/views.py +++ b/api/views.py @@ -298,12 +298,7 @@ class OrderViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] def get_queryset(self): - user = self.request.user - if not Order.objects.filter(supplier=user).exists(): - Order.objects.create(supplier=user, order_id=f'ORD-8492-{user.id}', date=date.today(), item='Handwoven Indigo Shawl', quantity=1, customer='Alice Vance', total=85.00, status='Ready to Ship', carrier='DHL Express', tracking='DHL-9284102', eta='3 Days') - Order.objects.create(supplier=user, order_id=f'ORD-8488-{user.id}', date=date.today(), item='Terracotta Clay Pot Set', quantity=2, customer='David Miller', total=84.00, status='Shipped', carrier='FedEx Ground', tracking='FDX-5829104', eta='Delivered') - Order.objects.create(supplier=user, order_id=f'ORD-8501-{user.id}', date=date.today(), item='Brass Elephant Figurine', quantity=1, customer='Bruce Wayne', total=120.00, status='Pending Acceptance', carrier='Pending', tracking='Pending', eta='N/A') - return Order.objects.filter(supplier=user) + return Order.objects.filter(supplier=self.request.user) @action(detail=True, methods=['post']) def accept(self, request, pk=None): @@ -330,10 +325,7 @@ class ReturnRequestViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] def get_queryset(self): - user = self.request.user - if not ReturnRequest.objects.filter(supplier=user).exists(): - ReturnRequest.objects.create(supplier=user, return_id=f'RET-019-{user.id}', order_id='ORD-8411', customer='Lillian G.', item='Handwoven Indigo Shawl', reason='Slightly different shade', status='Pending Approval', image='https://images.unsplash.com/photo-1544022613-e87ca75a784a?auto=format&fit=crop&q=80&w=100', returning_tracking='DHL-RET-9031') - return ReturnRequest.objects.filter(supplier=user) + return ReturnRequest.objects.filter(supplier=self.request.user) @action(detail=True, methods=['post']) def action(self, request, pk=None):