ob-dj-store 0.0.22.3__tar.gz → 0.0.22.5__tar.gz

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/.isort.cfg

@@ -1,2 +1,2 @@
 [settings]
-known_third_party = PIL,dateutil,dj_database_url,django,django_auto_prefetching,django_countries,django_filters,drf_yasg,factory,faker,import_export,leaflet,mock,ob_dj_otp,phonenumber_field,pilkit,pkg_resources,pycountry,pytest,pytz,requests,rest_framework,rest_framework_gis,rest_framework_nested,setuptools,stripe
+known_third_party = PIL,dateutil,dj_database_url,django,django_auto_prefetching,django_countries,django_filters,drf_yasg,factory,faker,import_export,leaflet,mock,ob_dj_otp,phonenumber_field,pilkit,pkg_resources,pycountry,pytest,pytz,requests,rest_framework,rest_framework_gis,rest_framework_nested,setuptools,stripe,timezone_field

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/PKG-INFO

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

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/Pipfile

@@ -33,6 +33,7 @@ django-import-export = "==2.8.0"
 ob-dj-otp = "==0.0.25"
 stripe = ">=5.0.0"
 us = ">=2.0.0"
+django-timezone-field = "==7.1"
 
 [dev-packages]
 mock = "==4.0.3"

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ca35d3de2cf2dc23c82f7c4ec8deb4c434e8058b8e976f944279b66619ee0c44"
+            "sha256": "ce203ab33ab36c5d1a2a6b9d1312b495db76a2637733ad163a44b976dad30fa2"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -36,11 +36,11 @@
         },
         "asgiref": {
             "hashes": [
-                "sha256:a5ab6582236218e5ef1648f242fd9f10626cfd4de8dc377db215d5d5098e3142",
-                "sha256:f3bba7092a48005b5f5bacd747d36ee4a5a61f4a269a6df590b43144355ebd2c"
+                "sha256:aef8a81283a34d0ab31630c9b7dfe70c812c95eba78171367ca8745e88124734",
+                "sha256:d89f2d8cd8b56dada7d52fa7dc8075baa08fb836560710d38c292a7a3f78c04e"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==3.9.1"
+            "version": "==3.10.0"
         },
         "certifi": {
             "hashes": [
@@ -369,6 +369,15 @@
             "markers": "python_version >= '3.6'",
             "version": "==6.0.0"
         },
+        "django-timezone-field": {
+            "hashes": [
+                "sha256:93914713ed882f5bccda080eda388f7006349f25930b6122e9b07bf8db49c4b4",
+                "sha256:b3ef409d88a2718b566fabe10ea996f2838bc72b22d3a2900c0aa905c761380c"
+            ],
+            "index": "pypi",
+            "markers": "python_version >= '3.8' and python_version < '4.0'",
+            "version": "==7.1"
+        },
         "djangorestframework": {
             "hashes": [
                 "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee",
@@ -1075,11 +1084,11 @@
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36",
-                "sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76"
+                "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466",
+                "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==4.14.1"
+            "version": "==4.15.0"
         },
         "uritemplate": {
             "hashes": [

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -284,6 +284,8 @@ class OrderSerializer(serializers.ModelSerializer):
             "created_at",
             "updated_at",
             "store_name",
+            "tip_percentage",
+            "tip_value",
         )
         extra_kwargs = {
             "customer": {"read_only": True},
@@ -401,8 +403,7 @@ class OrderSerializer(serializers.ModelSerializer):
 
     def _validate_pickup_time(self, store, pickup_time):
         # validate that the pickup_time is always in the future
-
-        if pickup_time < localtime(now()):
+        if pickup_time < localtime(now(), self._get_store().timezone):
             raise serializers.ValidationError(_("Pickup time must be in the future"))
         pickup_time_time = pickup_time.time()
         # validate that the pickup_time is between store's opening hours and closing hours
@@ -615,7 +616,11 @@ class OrderSerializer(serializers.ModelSerializer):
                         attributes=list(item.attribute_choices.all()),
                         notes=item.notes,
                     )
+                if order.tip_percentage:
+                    order.tip_value = order.calculate_tip()
+                    order.save()
                 orders.append(order)
+
             amount = Decimal(
                 sum(map(lambda order: Decimal(order.total_amount) or 0, orders))
             )
@@ -1059,11 +1064,13 @@ class SubCategorySerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     def get_is_available(self, obj) -> bool:
         store_id = self.context["request"].query_params.get("store", None)
         if store_id:
+            local_tz = Store.objects.get(id=store_id).timezone
+            current_time = localtime(now(), local_tz) if local_tz else localtime(now())
             for availability_hours in obj.parent.availability_hours.all():
                 if availability_hours.category == obj.parent:
                     return (
                         availability_hours.from_hour
-                        <= localtime(now()).time()
+                        <= current_time.time()
                         <= availability_hours.to_hour
                     )
         return False
@@ -1095,11 +1102,13 @@ class CategorySerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     def get_is_available(self, obj) -> bool:
         store_id = self.context["request"].query_params.get("store", None)
         if store_id:
+            local_tz = Store.objects.get(id=store_id).timezone
+            current_time = localtime(now(), local_tz) if local_tz else localtime(now())
             for availability_hours in obj.availability_hours.all():
                 if availability_hours.category == obj:
                     return (
                         availability_hours.from_hour
-                        <= localtime(now()).time()
+                        <= current_time.time()
                         <= availability_hours.to_hour
                     )
         return False
@@ -1210,6 +1219,7 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
     shipping_methods = ShippingMethodSerializer(many=True, read_only=True)
     distance = serializers.SerializerMethodField()
     current_day_opening_hours = serializers.SerializerMethodField()
+    timezone = serializers.SerializerMethodField()
 
     class Meta:
         model = Store
@@ -1238,6 +1248,7 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "image",
             "busy_mode",
             "name_arabic",
+            "timezone",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1246,12 +1257,12 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
     def get_is_closed(self, obj):
         if obj.busy_mode:
             return True
-        current_time = localtime(now())
+        current_time = localtime(now(), obj.timezone)
         current_op_hour = obj.current_opening_hours
         if current_op_hour:
             from_hour = current_op_hour.from_hour
             to_hour = current_op_hour.to_hour
-            if current_time.tzinfo.zone != "Asia/Dubai":
+            if current_time.tzinfo != "Asia/Dubai":
                 if obj.currency == "AED":
                     try:
                         current_time += timedelta(hours=1)
@@ -1365,6 +1376,9 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             op_hour = f"{settings.DEFAULT_OPENING_HOURS[0]['from_hour']} - {settings.DEFAULT_OPENING_HOURS[0]['to_hour']}"
         return op_hour
 
+    def get_timezone(self, obj):
+        return str(obj.timezone)
+
     def to_representation(self, instance):
         return super().to_representation(instance)
 
@@ -1403,10 +1417,15 @@ class TaxSerializer(serializers.ModelSerializer):
 
 
 class StoreListSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
+    timezone = serializers.SerializerMethodField()
+
     class Meta:
         model = Store
         fields = "__all__"
 
+    def get_timezone(self, obj):
+        return str(obj.timezone)
+
 
 class GenericSerializer(serializers.Serializer):
     """

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/apis/stores/views.py

@@ -1268,7 +1268,7 @@ class PartnerAuthInfoViewSet(
 class PartnerViewSet(
     mixins.ListModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet,
 ):
-    queryset = Partner.objects.all()
+    queryset = Partner.objects.all().order_by("name")
     permission_classes = [
         permissions.IsAuthenticated,
     ]

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/admin.py

@@ -24,6 +24,7 @@ from ob_dj_store.core.stores.admin_inlines import (
     ProductAttributeInlineAdmin,
     ProductMediaInlineAdmin,
     ProductVariantInlineAdmin,
+    TipAmountInlineAdmin,
 )
 
 
@@ -112,6 +113,7 @@ class StoreAdmin(LeafletGeoAdmin):
                     "pickup_addresses",
                     "image",
                     "currency",
+                    "timezone",
                 )
             },
         ),
@@ -534,6 +536,23 @@ class PartnerAuthInfoAdmin(admin.ModelAdmin):
     list_filter = ["authentication_expires", "partner"]
 
 
+class TipAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "name",
+        "description",
+        "is_active",
+        "country",
+    )
+    search_fields = [
+        "name",
+    ]
+    list_filter = ("country",)
+    inlines = [
+        TipAmountInlineAdmin,
+    ]
+
+
 admin.site.register(models.Store, StoreAdmin)
 admin.site.register(models.ShippingMethod, ShippingMethodAdmin)
 admin.site.register(models.PaymentMethod, PaymentMethodAdmin)
@@ -558,3 +577,4 @@ admin.site.register(models.Partner, PartnerAdmin)
 admin.site.register(models.Discount, DiscountAdmin)
 admin.site.register(models.PartnerAuthInfo, PartnerAuthInfoAdmin)
 admin.site.register(models.CountryPaymentMethod, CountryPaymentMethodAdmin)
+admin.site.register(models.Tip, TipAdmin)

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/admin_inlines.py

@@ -120,3 +120,8 @@ class InventoryOperationInlineAdmin(admin.TabularInline):
 class PartnerEmailDomainInlineAdmin(admin.TabularInline):
     model = models.PartnerEmailDomain
     extra = 1
+
+
+class TipAmountInlineAdmin(admin.TabularInline):
+    model = models.TipAmount
+    extra = 0

ob_dj_store-0.0.22.5/ob_dj_store/core/stores/migrations/0111_auto_20251023_1700.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2025-10-23 14:00
+
+import timezone_field.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0110_auto_20250923_1714"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="store",
+            name="has_daylight_saving_time",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="store",
+            name="timezone",
+            field=timezone_field.fields.TimeZoneField(default="Asia/Kuwait"),
+        ),
+        migrations.AlterField(
+            model_name="tax",
+            name="value",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=5,
+                help_text="Value for the given Payment -> 0.0625",
+                max_digits=7,
+                null=True,
+            ),
+        ),
+    ]

ob_dj_store-0.0.22.5/ob_dj_store/core/stores/migrations/0112_auto_20251027_1739.py

@@ -0,0 +1,98 @@
+# Generated by Django 3.2.8 on 2025-10-27 14:39
+
+import django.db.models.deletion
+import django_countries.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0111_auto_20251023_1700"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Tip",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=150)),
+                ("description", models.TextField(blank=True, null=True)),
+                ("is_applied", models.BooleanField(default=True)),
+                (
+                    "country",
+                    django_countries.fields.CountryField(
+                        blank=True, default="KW", max_length=2, null=True
+                    ),
+                ),
+                ("is_active", models.BooleanField(default=False)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            options={"verbose_name": "Tip", "verbose_name_plural": "Tips",},
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="tip_percentage",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="Percentage value of the tip (e.g., 10 for 10%)",
+                max_digits=5,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="tip_value",
+            field=models.DecimalField(
+                blank=True, decimal_places=2, max_digits=5, null=True
+            ),
+        ),
+        migrations.CreateModel(
+            name="TipAmount",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "percentage",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=2,
+                        help_text="Percentage value of the tip (e.g., 10 for 10%)",
+                        max_digits=5,
+                        null=True,
+                    ),
+                ),
+                (
+                    "tip",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tip_amounts",
+                        to="stores.tip",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Tip Amount",
+                "verbose_name_plural": "Tip Amounts",
+            },
+        ),
+    ]

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/models/__init__.py

@@ -7,7 +7,13 @@ from ob_dj_store.core.stores.models._feedback import (
     FeedbackConfig,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory, InventoryOperations
-from ob_dj_store.core.stores.models._order import Order, OrderHistory, OrderItem
+from ob_dj_store.core.stores.models._order import (
+    Order,
+    OrderHistory,
+    OrderItem,
+    Tip,
+    TipAmount,
+)
 from ob_dj_store.core.stores.models._partner import (
     Discount,
     Partner,
@@ -85,4 +91,6 @@ __all__ = [
     "PartnerOTPAuth",
     "Discount",
     "CountryPaymentMethod",
+    "Tip",
+    "TipAmount",
 ]

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/models/_order.py

@@ -1,10 +1,11 @@
-from decimal import Decimal
+from decimal import ROUND_HALF_UP, Decimal
 
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from django_countries.fields import CountryField
 
 from ob_dj_store.core.stores.managers import OrderItemManager, OrderManager
 from ob_dj_store.utils.model import DjangoModelCleanMixin
@@ -92,6 +93,16 @@ class Order(DjangoModelCleanMixin, models.Model):
     init_data = models.JSONField(null=True, blank=True)
     offer_redeemed = models.BooleanField(default=False)
     offer_id = models.IntegerField(null=True, blank=True, default=None)
+    tip_percentage = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("Percentage value of the tip (e.g., 10 for 10%)"),
+    )
+    tip_value = models.DecimalField(
+        max_digits=5, decimal_places=2, null=True, blank=True,
+    )
     # TODO: add pick_up_time maybe ?
     # audit fields
     created_at = models.DateTimeField(auto_now_add=True)
@@ -156,6 +167,17 @@ class Order(DjangoModelCleanMixin, models.Model):
                 return self.OrderType.WALLET.value
         return self.OrderType.PHYSICAL.value
 
+    def calculate_tip(self):
+        """
+        Returns the tip amount based on a total order amount.
+        """
+        if not self.tip_percentage:
+            return Decimal("0.00")
+        tip_value = (self.total_amount * self.tip_percentage / Decimal("100")).quantize(
+            Decimal("0.01"), rounding=ROUND_HALF_UP
+        )
+        return tip_value
+
     def save(self, **kwargs):
         if not self.pk and self.shipping_address:
             self.immutable_shipping_address = self.shipping_address.to_immutable()
@@ -277,3 +299,38 @@ class OrderHistory(DjangoModelCleanMixin, models.Model):
 
     def __str__(self):
         return f"OrderHistory - {self.status}"
+
+
+class TipAmount(models.Model):
+    percentage = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("Percentage value of the tip (e.g., 10 for 10%)"),
+    )
+    tip = models.ForeignKey(
+        "Tip",
+        related_name="tip_amounts",
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+    )
+
+    class Meta:
+        verbose_name = _("Tip Amount")
+        verbose_name_plural = _("Tip Amounts")
+
+
+class Tip(models.Model):
+    name = models.CharField(max_length=150)
+    description = models.TextField(null=True, blank=True)
+    is_applied = models.BooleanField(default=True)
+    country = CountryField(blank=True, null=True, default="KW")
+    is_active = models.BooleanField(default=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        verbose_name = _("Tip")
+        verbose_name_plural = _("Tips")

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/models/_payment.py

@@ -35,8 +35,8 @@ class Tax(models.Model):
     country = CountryField(help_text=_("The address country."), default="KW")
     value = models.DecimalField(
         blank=True,
-        max_digits=5,
-        decimal_places=3,
+        max_digits=7,
+        decimal_places=5,
         null=True,
         help_text="Value for the given Payment -> 0.0625",
     )

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store/core/stores/models/_store.py

@@ -8,6 +8,7 @@ from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 from phonenumber_field.modelfields import PhoneNumberField
+from timezone_field import TimeZoneField
 
 from ob_dj_store.core.stores.managers import (
     CountryPaymentMethodManager,
@@ -179,6 +180,8 @@ class Store(DjangoModelCleanMixin, models.Model):
     )
     busy_mode = models.BooleanField(default=False)
     is_digital = models.BooleanField(default=False)
+    timezone = TimeZoneField(default="Asia/Kuwait")
+    has_daylight_saving_time = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store.egg-info/PKG-INFO

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

{ob_dj_store-0.0.22.3 → ob_dj_store-0.0.22.5}/ob_dj_store.egg-info/SOURCES.txt

@@ -196,6 +196,8 @@ 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/0110_auto_20250923_1714.py
+ob_dj_store/core/stores/migrations/0111_auto_20251023_1700.py
+ob_dj_store/core/stores/migrations/0112_auto_20251027_1739.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