Commit a7a55a9f authored by lizonr1's avatar lizonr1

Add new user_promotions

parent 676998bc
......@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
from App.loyaltyMe.serializers import PlaceSerializer, PromotionSerializer
from App.loyaltyMe.serializers import PromotionSerializer
from App.user.models import UserProfile, UserPromotion
......@@ -53,7 +53,6 @@ class AuthTokenSerializerByEmail(serializers.Serializer):
class UserPromotionSerializer(serializers.HyperlinkedModelSerializer):
user = UserSerializer()
#place = PlaceSerializer()
promotion = PromotionSerializer()
class Meta:
......
......@@ -100,15 +100,3 @@ class UserPromotionViewSet(viewsets.ModelViewSet):
"""
user = self.request.user
return UserPromotion.objects.filter(user=user)
# def get_queryset(self):
# user = self.request.user
# return user.user_promotion_set.all()
# def list(self, request):
# user = request.user
# queryset = UserPromotion.objects.filter(user=user)
# page = self.paginate_queryset(queryset)
# serializer = UserPromotionSerializer(page, many=True, context={'request': request})
# return self.get_paginated_response(serializer.data)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment