ob-dj-store 0.0.22.2__py3-none-any.whl → 0.0.22.4__py3-none-any.whl

ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -401,8 +401,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
@@ -1059,11 +1058,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 +1096,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 +1213,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 +1242,7 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "image",
             "busy_mode",
             "name_arabic",
+            "timezone",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1246,12 +1251,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 +1370,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 +1411,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/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/core/stores/admin.py

@@ -112,6 +112,7 @@ class StoreAdmin(LeafletGeoAdmin):
                     "pickup_addresses",
                     "image",
                     "currency",
+                    "timezone",
                 )
             },
         ),

ob_dj_store/core/stores/migrations/0110_auto_20250923_1714.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.8 on 2025-09-23 14:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0109_wallettransaction_cashback_type"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="productvariant",
+            options={
+                "ordering": ("order_value",),
+                "verbose_name": "Product Variation",
+                "verbose_name_plural": "Product Variations",
+            },
+        ),
+        migrations.AddField(
+            model_name="productvariant",
+            name="order_value",
+            field=models.PositiveSmallIntegerField(default=1, verbose_name="ordering"),
+        ),
+    ]

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/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/core/stores/models/_product.py

@@ -447,6 +447,9 @@ class ProductVariant(DjangoModelCleanMixin, models.Model):
     image_thumbnail_medium = models.ImageField(
         upload_to="product_variant_media/", null=True, blank=True
     )
+    order_value = models.PositiveSmallIntegerField(
+        verbose_name=_("ordering"), default=1
+    )
     # Audit fields
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -456,6 +459,7 @@ class ProductVariant(DjangoModelCleanMixin, models.Model):
     class Meta:
         verbose_name = _("Product Variation")
         verbose_name_plural = _("Product Variations")
+        ordering = ("order_value",)
 
     def __str__(self):
         return f"Variation {self.product.name} {self.name} (PK={self.pk})"

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/core/stores/models/_wallet.py

@@ -122,15 +122,22 @@ class Wallet(models.Model):
         )
 
         provider = payment_method.payment_provider
-        if provider == settings.TAP_ALL:
-            return (payment.tap_payment.payment_url, payment.tap_payment.charge_id)
-        elif provider == settings.STRIPE:
-            return (
-                payment.stripe_payment.payment_url,
-                payment.stripe_payment.payment_intent_id,
-            )
-        else:
-            logger.warning(f"Unsupported payment provider: {provider}")
+        logger.info(f"Payment ID: {payment.id}")
+        logger.info(f"Payment provider: {provider}")
+        try:
+            if provider == settings.STRIPE:
+                logger.info(
+                    f"Stripe payment info: {payment.stripe_payment.payment_intent_id}"
+                )
+                return (
+                    payment.stripe_payment.payment_url,
+                    payment.stripe_payment.payment_intent_id,
+                )
+            else:
+                logger.info(f"TAP payment info: {payment.tap_payment.charge_id}")
+                return (payment.tap_payment.payment_url, payment.tap_payment.charge_id)
+        except Exception as e:
+            logger.warning(f"Error returning payment details")
             return (None, None)
 
 

{ob_dj_store-0.0.22.2.dist-info → ob_dj_store-0.0.22.4.dist-info}/METADATA

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

{ob_dj_store-0.0.22.2.dist-info → ob_dj_store-0.0.22.4.dist-info}/RECORD

@@ -2,8 +2,8 @@ ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/filters.py,sha256=JeUtcicJ3cFnZc71aUMEwn2jaVj1oNQsZOCZfdxGDu8,10338
 ob_dj_store/apis/stores/urls.py,sha256=W9sNJ7ST9pGnfVCf7GmduDO-_zK9MGTI6ybV8n-lzSc,2111
-ob_dj_store/apis/stores/views.py,sha256=cwDFNY2rtTfjl_F9PpR5zOJy2DPmGidOjIlJ9fsgSYI,42744
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=rJ3oWg0GqbZ8OoPWRTxcuPkIRYPQPfK4TH4UH4vsjns,69192
+ob_dj_store/apis/stores/views.py,sha256=E9msGnkPEFjMTqU9jn-6rnCof3pivoHLesZda6D1BBs,42761
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=Rm-ay0ZwfkcChoy7lXZDbfyn5h2qPUVaEFATkVMeHvc,69783
 ob_dj_store/apis/stripe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stripe/serializers.py,sha256=SX3yKVNbDvE5LL35DF9XoC8sjwGkCSdKz_JUVWsJDLg,5949
 ob_dj_store/apis/stripe/urls.py,sha256=IHH9sX3d74KDUlXkYnIAwYRC6zEvUaOTSFsJGJfiAjA,723
@@ -14,7 +14,7 @@ ob_dj_store/apis/tap/urls.py,sha256=bnOTv6an11kxpo_FdqlhsizlGPLVpNxBjCyKcf3_C9M,
 ob_dj_store/apis/tap/views.py,sha256=sWqNT3nnEFXwRlVokoZREpCOwMQtyd_ZzrvUtQ6c5L0,2620
 ob_dj_store/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/__init__.py,sha256=-izNGrxNn_nn3IQXd5pkuES9lSF-AHYb14yhNPozYCI,65
-ob_dj_store/core/stores/admin.py,sha256=aI1t3nIeOw_Vcy2E2LNaAxMRX2GjvVrVeBaH-n4IHco,14362
+ob_dj_store/core/stores/admin.py,sha256=j7c_kDWY4BJrM0xWK1P8WRQSnu7kX6UBXFxfZ5oewj4,14394
 ob_dj_store/core/stores/admin_inlines.py,sha256=9_35VwwRh5w8YU2CRTJ7sENUjF-D-J-o9jXhLEPpS3w,2900
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=Q0PUB_LSz0bufJ0OfgHuvSC-5uAGSsDDlhitisFJqw4,10141
@@ -155,6 +155,8 @@ ob_dj_store/core/stores/migrations/0106_alter_paymentmethod_payment_provider.py,
 ob_dj_store/core/stores/migrations/0107_auto_20250425_2059.py,sha256=XCj2Inlw8e-_6W9wvYeVVV-bGk6lX8_n2FNI5W80XVw,848
 ob_dj_store/core/stores/migrations/0108_alter_paymentmethod_payment_provider.py,sha256=abuqKAhuha8tEdxJy-Tj1RNFOMV63_z5v_qK5LLSNVI,1078
 ob_dj_store/core/stores/migrations/0109_wallettransaction_cashback_type.py,sha256=XA_RtxLjnpsz-i0uKlCyYK-UWL4RR10Q_XeqVd3KX6A,691
+ob_dj_store/core/stores/migrations/0110_auto_20250923_1714.py,sha256=o8a6zt9iyZp7_Km4Wos8OSZ-vn-mVyAIdXvWdCytQaQ,727
+ob_dj_store/core/stores/migrations/0111_auto_20251023_1700.py,sha256=CZcu32ZUREnZcpu0jmEYWKyus8G_TT_ULXm3o_jf8T8,949
 ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/models/__init__.py,sha256=VeWrDiIbw94ZDSFD-62rz9iTTW87iPdwDW5jcjxm7bs,2045
 ob_dj_store/core/stores/models/_address.py,sha256=uf9W4dnlXkEFhhsK75ZsDwWq5R2JEngf7VhBiLEnIVs,2193
@@ -164,15 +166,15 @@ ob_dj_store/core/stores/models/_feedback.py,sha256=5kQ_AD9nkY57UOKo_qHg4_nEQAdFj
 ob_dj_store/core/stores/models/_inventory.py,sha256=_rGlVL5HjOlHQVB8CI0776CPcE5r6szv1w3PjtkYnWM,4306
 ob_dj_store/core/stores/models/_order.py,sha256=_08lqX5p4brCdUilqfbT--6Ao2TMsqnzXaWoV_7IYL8,9758
 ob_dj_store/core/stores/models/_partner.py,sha256=OuYvevUWn1sYHs9PcFf51EUUC1uqytQss8Bx91aMOH8,4732
-ob_dj_store/core/stores/models/_payment.py,sha256=SfAMVrdP2Hfz604AyO8EOjeiOgGMeJ8My0s5U4GZ7Yc,6650
-ob_dj_store/core/stores/models/_product.py,sha256=KUi2hkA4VNCrWwWp3AM_tkubFptpOdiFt0Twzi2wW14,18535
-ob_dj_store/core/stores/models/_store.py,sha256=0K-CNJWuXNqeyULL1J0M9hiNcVla0UNNjdCdN_nzNEE,9833
-ob_dj_store/core/stores/models/_wallet.py,sha256=QktPaDH2gOGDyOqBqY0lXU91gL2_MhHhy2d7GcCO1ZA,6019
+ob_dj_store/core/stores/models/_payment.py,sha256=1Ssz2RbI_kI-n-bejApbH3EMm96Bg19dgiMUjQHj9R4,6650
+ob_dj_store/core/stores/models/_product.py,sha256=rt30n_X9RRGcyqwB-hj1PMEZRQNvzJhc0M-mLkBoPWI,18675
+ob_dj_store/core/stores/models/_store.py,sha256=vz-rVEwWCmz62pRtj3qAR7D3doBH1p2FkOUjKtI4-lo,9992
+ob_dj_store/core/stores/models/_wallet.py,sha256=SjGizV1P3fhCYyxD-X0ts-PjhzdpGVHd5vIz54Rbj8A,6357
 ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/utils/helpers.py,sha256=o7wgypM7mI2vZqZKkhxnTcnHJC8GMQDOuYMnRwXr6tY,2058
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
 ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
-ob_dj_store-0.0.22.2.dist-info/METADATA,sha256=QGoLBwonfeehmzz5Mx-VnKThLe0F7W6mHcd-6AV_ARM,2850
-ob_dj_store-0.0.22.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ob_dj_store-0.0.22.2.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.22.2.dist-info/RECORD,,
+ob_dj_store-0.0.22.4.dist-info/METADATA,sha256=JEtu0JWXnO20S15Hxt2YF4Rt5NbMz_bGkTWzaigtPh4,2850
+ob_dj_store-0.0.22.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ob_dj_store-0.0.22.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.22.4.dist-info/RECORD,,