diff --git a/core/api/bill.py b/core/api/bill.py index 184dc1e41eeca1fc2fb0ce5ab3c6a368281485ed..661a1dd9a1cd8df60185e83719741c217a4afd07 100644 --- a/core/api/bill.py +++ b/core/api/bill.py @@ -8,10 +8,10 @@ from rest_framework import permissions, authentication class BillListCreate(mixins.ListModelMixin, mixins.CreateModelMixin, generics.GenericAPIView): queryset = Bill.objects.all() serializer_class = BillSerializer - # authentication_classes = [ - # authentication.SessionAuthentication, - # authentication.TokenAuthentication - # ] + authentication_classes = [ + authentication.SessionAuthentication, + authentication.TokenAuthentication + ] permission_classes = (permissions.IsAuthenticated,) def get(self, request, *args, **kwargs): @@ -50,10 +50,10 @@ class BillDetail(mixins.RetrieveModelMixin, generics.GenericAPIView): queryset = Bill.objects.all() serializer_class = BillSerializer - # authentication_classes = [ - # authentication.SessionAuthentication, - # authentication.TokenAuthentication - # ] + authentication_classes = [ + authentication.SessionAuthentication, + authentication.TokenAuthentication + ] permission_classes = (permissions.IsAuthenticated,) lookup_field = "pk" diff --git a/core/models/bill.py b/core/models/bill.py index 349bafa49eb839bf040b7576f7a260109d7a6995..e834fc3eaef61f04bbe609d7443c4607b94da5a3 100644 --- a/core/models/bill.py +++ b/core/models/bill.py @@ -42,12 +42,12 @@ class BillSearchQuerySet(models.QuerySet): qs = self.filter(user=user).filter(lookup) return qs - def searchTitle(self, keyword, user=None): - lookup = Q(title__contains = keyword) - qs = self.filter(lookup) - if user is not None: - qs = self.filter(user=user).filter(lookup) - return qs + # def searchTitle(self, keyword, user=None): + # lookup = Q(title__contains = keyword) + # qs = self.filter(lookup) + # if user is not None: + # qs = self.filter(user=user).filter(lookup) + # return qs # def categorieAmount(self, date, categories, user=None): @@ -65,7 +65,7 @@ class Bill(UUIDModel): user = models.ForeignKey(User, default=1, null=True, on_delete=models.SET_NULL) - title = models.CharField(max_length = 120) + # title = models.CharField(max_length = 120) date = models.DateField(verbose_name="payment time", default = datetime.date.today) @@ -92,4 +92,14 @@ class Bill(UUIDModel): ) - categories = models.SmallIntegerField(verbose_name="bill categories", choices = categories, default=11) \ No newline at end of file + categories = models.SmallIntegerField(verbose_name="bill categories", choices = categories, default=11) + + wallet = ( + (1, "checking account"), + (2, "credit account"), + (3, "cash"), + (4, "savings account"), + (5, "other") + ) + + wallet = models.SmallIntegerField(verbose_name="wallet", choices=wallet, default=3) \ No newline at end of file diff --git a/core/serializers/bill.py b/core/serializers/bill.py index d3dfdff6df4a1f656b7959add1708284d80a8d59..b50cae28c34ee61bad81d2eb766d7b4f6136c154 100644 --- a/core/serializers/bill.py +++ b/core/serializers/bill.py @@ -12,7 +12,7 @@ class BillSerializer(serializers.ModelSerializer): fields = ( 'user', 'url', - 'title', + 'wallet', 'date', 'datetime', 'price',