ob-dj-store 0.0.20.8__tar.gz → 0.0.21__tar.gz

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.7-slim-buster
+FROM python:3.9.23-slim-bullseye
 
 # prevent __pycache__ folder and files
 ENV PYTHONDONTWRITEBYTECODE 1

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.8
+Version: 0.0.21
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/ob_dj_store/apis/stores/filters.py

@@ -239,6 +239,7 @@ class FavoriteFilter(filters.FilterSet):
 class PaymentMethodFilter(filters.FilterSet):
     store = filters.CharFilter(method="by_store")
     is_digital = filters.BooleanFilter(method="by_digital")
+    country = filters.CharFilter(method="by_country")
 
     class Meta:
         models = PaymentMethod
@@ -253,6 +254,12 @@ class PaymentMethodFilter(filters.FilterSet):
             )
         return queryset
 
+    def by_country(self, queryset, name, value):
+        currency = get_currency_by_country(value)
+        if value:
+            queryset = queryset.filter(currency=currency)
+        return queryset
+
 
 class WalletFilter(filters.FilterSet):
     currency = filters.CharFilter(

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -1,7 +1,8 @@
 import calendar
 import logging
 import typing
-from datetime import timedelta
+from collections import OrderedDict
+from datetime import datetime, timedelta
 from decimal import Decimal
 
 import pycountry
@@ -1646,6 +1647,39 @@ class WalletTransactionSerializer(serializers.ModelSerializer):
         ]
 
 
+class GroupedWalletTransactionListSerializer(serializers.ListSerializer):
+    def to_representation(self, data):
+        result_dict = OrderedDict()
+        for wallettransaction in data:
+            year = wallettransaction.created_at.year
+            month = wallettransaction.created_at.month
+            title = f"{datetime(year, month, 1).strftime('%b')}, {year}"
+
+            if title not in result_dict:
+                result_dict[title] = {"title": title, "data": []}
+
+            result_dict[title]["data"].append(
+                self.child.to_representation(wallettransaction)
+            )
+
+        return list(result_dict.values())
+
+
+class WalletTransactionListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = WalletTransaction
+        fields = [
+            "id",
+            "type",
+            "amount",
+            "created_at",
+            "wallet",
+            "is_cashback",
+            "is_refund",
+        ]
+        list_serializer_class = GroupedWalletTransactionListSerializer
+
+
 class ReorderSerializer(serializers.Serializer):
     force_cart = serializers.BooleanField(default=False)
 

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/ob_dj_store/apis/stores/views.py

@@ -60,7 +60,7 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     WalletMediaSerializer,
     WalletSerializer,
     WalletTopUpSerializer,
-    WalletTransactionSerializer,
+    WalletTransactionListSerializer,
 )
 from ob_dj_store.core.stores.gateway.tap.utils import TapException
 from ob_dj_store.core.stores.models import (
@@ -1100,22 +1100,16 @@ class WalletViewSet(
         tags=["Wallet",],
     )
     @action(
-        methods=["GET",],
+        methods=["GET"],
         detail=True,
         url_path="transactions",
-        serializer_class=WalletTransactionSerializer,
+        serializer_class=WalletTransactionListSerializer,
     )
-    def transactions(
-        self, request: Request, *args: typing.Any, **kwargs: typing.Any
-    ) -> Response:
-        queryset = self.get_object().transactions.all().order_by("-created_at")
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            return self.get_paginated_response(serializer.data)
-
-        serializer = self.get_serializer(queryset, many=True)
-        return Response(serializer.data)
+    def transactions(self, request, *args, **kwargs):
+        wallet = self.get_object()
+        queryset = wallet.transactions.all().order_by("-created_at")
+        serializer = WalletTransactionListSerializer(queryset, many=True)
+        return Response({"results": serializer.data})
 
     @swagger_auto_schema(
         operation_summary="List Wallet selection images",

{ob_dj_store-0.0.20.8 → ob_dj_store-0.0.21}/ob_dj_store.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.8
+Version: 0.0.21
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes