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

{ob_dj_store-0.0.20.7 → ob_dj_store-0.0.20.9}/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.7 → ob_dj_store-0.0.20.9}/PKG-INFO

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

{ob_dj_store-0.0.20.7 → ob_dj_store-0.0.20.9}/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.7 → ob_dj_store-0.0.20.9}/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
@@ -427,6 +428,7 @@ class OrderSerializer(serializers.ModelSerializer):
                 )
             if (
                 not op_hour.is_open_after_midnight
+                and not op_hour.always_open
                 and not from_hour <= pickup_time_time <= to_hour
             ):
                 raise serializers.ValidationError(
@@ -1645,6 +1647,27 @@ class WalletTransactionSerializer(serializers.ModelSerializer):
         ]
 
 
+class WalletTransactionListSerializer(serializers.Serializer):
+    def to_representation(self, instance):
+        result_dict = OrderedDict()
+
+        for wallettransaction in instance:
+            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(
+                WalletTransactionSerializer(
+                    wallettransaction, context=self.context
+                ).data
+            )
+
+        return {"Transactions": list(result_dict.values())}
+
+
 class ReorderSerializer(serializers.Serializer):
     force_cart = serializers.BooleanField(default=False)
 

{ob_dj_store-0.0.20.7 → ob_dj_store-0.0.20.9}/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 (
@@ -1103,7 +1103,7 @@ class WalletViewSet(
         methods=["GET",],
         detail=True,
         url_path="transactions",
-        serializer_class=WalletTransactionSerializer,
+        serializer_class=WalletTransactionListSerializer,
     )
     def transactions(
         self, request: Request, *args: typing.Any, **kwargs: typing.Any
@@ -1111,10 +1111,10 @@ class WalletViewSet(
         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)
+            serializer = self.get_serializer(page)
             return self.get_paginated_response(serializer.data)
 
-        serializer = self.get_serializer(queryset, many=True)
+        serializer = self.get_serializer(queryset)
         return Response(serializer.data)
 
     @swagger_auto_schema(

ob_dj_store-0.0.20.9/ob_dj_store/core/stores/gateway/tap/migrations/0008_alter_tappayment_user.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.8 on 2025-07-10 11:25
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("tap", "0007_alter_tappayment_source"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tappayment",
+            name="user",
+            field=models.ForeignKey(
+                help_text="Captured the User ID for both registered users and Guests (Every guest user has a user_id assigned by device_id)",
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

{ob_dj_store-0.0.20.7 → ob_dj_store-0.0.20.9}/ob_dj_store/core/stores/gateway/tap/models.py

@@ -37,7 +37,7 @@ class TapPayment(models.Model):
     source = models.CharField(max_length=100, choices=Sources.choices)
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
-        on_delete=models.DO_NOTHING,
+        on_delete=models.CASCADE,
         help_text=_(
             "Captured the User ID for both registered "
             "users and Guests (Every guest user has a user_id assigned by device_id)"

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

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

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

@@ -71,6 +71,7 @@ ob_dj_store/core/stores/gateway/tap/migrations/0004_tapcustomer.py
 ob_dj_store/core/stores/gateway/tap/migrations/0005_alter_tappayment_payment_url.py
 ob_dj_store/core/stores/gateway/tap/migrations/0006_alter_tappayment_source.py
 ob_dj_store/core/stores/gateway/tap/migrations/0007_alter_tappayment_source.py
+ob_dj_store/core/stores/gateway/tap/migrations/0008_alter_tappayment_user.py
 ob_dj_store/core/stores/gateway/tap/migrations/__init__.py
 ob_dj_store/core/stores/migrations/0001_initial.py
 ob_dj_store/core/stores/migrations/0002_auto_20220422_0205.py