ob-dj-store 0.0.20.9__tar.gz → 0.0.21.1__tar.gz

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/PKG-INFO

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

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store/apis/stores/filters.py

@@ -87,6 +87,7 @@ class ProductFilter(filters.FilterSet):
     """Product filters"""
 
     category = filters.CharFilter(method="by_category")
+    q = filters.CharFilter(method="filter_search")
 
     class Meta:
         model = Product
@@ -99,6 +100,12 @@ class ProductFilter(filters.FilterSet):
     def by_category(self, queryset, name, value):
         return queryset.filter(category__name__iexact=value)
 
+    def filter_search(self, queryset, name, value):
+        print("q filter :", value)
+        return queryset.filter(
+            Q(name__icontains=value) | Q(description__icontains=value)
+        ).distinct()[:5]
+
 
 class VariantFilter(filters.FilterSet):
     """Variant filters"""

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -1647,11 +1647,10 @@ class WalletTransactionSerializer(serializers.ModelSerializer):
         ]
 
 
-class WalletTransactionListSerializer(serializers.Serializer):
-    def to_representation(self, instance):
+class GroupedWalletTransactionListSerializer(serializers.ListSerializer):
+    def to_representation(self, data):
         result_dict = OrderedDict()
-
-        for wallettransaction in instance:
+        for wallettransaction in data:
             year = wallettransaction.created_at.year
             month = wallettransaction.created_at.month
             title = f"{datetime(year, month, 1).strftime('%b')}, {year}"
@@ -1660,12 +1659,25 @@ class WalletTransactionListSerializer(serializers.Serializer):
                 result_dict[title] = {"title": title, "data": []}
 
             result_dict[title]["data"].append(
-                WalletTransactionSerializer(
-                    wallettransaction, context=self.context
-                ).data
+                self.child.to_representation(wallettransaction)
             )
 
-        return {"Transactions": list(result_dict.values())}
+        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):

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store/apis/stores/views.py

@@ -1100,22 +1100,16 @@ class WalletViewSet(
         tags=["Wallet",],
     )
     @action(
-        methods=["GET",],
+        methods=["GET"],
         detail=True,
         url_path="transactions",
         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)
-            return self.get_paginated_response(serializer.data)
-
-        serializer = self.get_serializer(queryset)
-        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.21.1/ob_dj_store/core/stores/migrations/0109_wallettransaction_cashback_type.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.8 on 2025-07-31 16:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0108_alter_paymentmethod_payment_provider"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="wallettransaction",
+            name="cashback_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("BY_ORDER", "By Order"),
+                    ("BY_OFFER", "By Offer"),
+                    ("BY_STREAK", "By Streak"),
+                ],
+                max_length=100,
+                null=True,
+            ),
+        ),
+    ]

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store/core/stores/models/_wallet.py

@@ -136,6 +136,11 @@ class WalletTransaction(models.Model):
         CREDIT = "CREDIT", _("credit")
         DEBIT = "DEBIT", _("debit")
 
+    class CashBackType(models.TextChoices):
+        BY_ORDER = "BY_ORDER", _("By Order")
+        BY_OFFER = "BY_OFFER", _("By Offer")
+        BY_STREAK = "BY_STREAK", _("By Streak")
+
     wallet = models.ForeignKey(
         "stores.Wallet", on_delete=models.CASCADE, related_name="transactions",
     )
@@ -150,7 +155,9 @@ class WalletTransaction(models.Model):
     is_cashback = models.BooleanField(default=False)
     is_refund = models.BooleanField(default=False)
     is_redeemed = models.BooleanField(default=False)
-
+    cashback_type = models.CharField(
+        max_length=100, choices=CashBackType.choices, blank=True, null=True
+    )
     objects = WalletTransactionManager()
 
     # Audit

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store.egg-info/PKG-INFO

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

{ob_dj_store-0.0.20.9 → ob_dj_store-0.0.21.1}/ob_dj_store.egg-info/SOURCES.txt

@@ -182,6 +182,7 @@ ob_dj_store/core/stores/migrations/0105_store_is_open_after_midnight.py
 ob_dj_store/core/stores/migrations/0106_alter_paymentmethod_payment_provider.py
 ob_dj_store/core/stores/migrations/0107_auto_20250425_2059.py
 ob_dj_store/core/stores/migrations/0108_alter_paymentmethod_payment_provider.py
+ob_dj_store/core/stores/migrations/0109_wallettransaction_cashback_type.py
 ob_dj_store/core/stores/migrations/__init__.py
 ob_dj_store/core/stores/models/__init__.py
 ob_dj_store/core/stores/models/_address.py