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

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

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

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

@@ -416,15 +416,24 @@ class OrderSerializer(serializers.ModelSerializer):
                     logger.info(
                         f"The fix for UAE stores timezone failed due to this error {e}"
                     )
+
             if (
                 op_hour.is_open_after_midnight
                 and not op_hour.always_open
-                and pickup_time_time > to_hour
-                or pickup_time_time < from_hour
+                and (pickup_time_time > to_hour and pickup_time_time < from_hour)
             ):
                 raise serializers.ValidationError(
                     _("Pickup time must be between store's opening hours")
                 )
+            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(
+                    _("Pickup time must be between store's opening hours")
+                )
+
         except ObjectDoesNotExist:
             logger.error(f"{store.name} Store doesn't have opening hours for ")
 
@@ -1178,14 +1187,14 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
         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 obj.currency == "AED":
-            #         try:
-            #             current_time += timedelta(hours=1)
-            #         except Exception as e:
-            #             logger.info(
-            #                 f"The fix for UAE stores timezone failed due to this error {e}"
-            #             )
+            if current_time.tzinfo.zone != "Asia/Dubai":
+                if obj.currency == "AED":
+                    try:
+                        current_time += timedelta(hours=1)
+                    except Exception as e:
+                        logger.info(
+                            f"The fix for UAE stores timezone failed due to this error {e}"
+                        )
 
             if current_op_hour.is_open_after_midnight:
                 return True if to_hour < current_time.time() < from_hour else False

ob_dj_store-0.0.20.8/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.6 → ob_dj_store-0.0.20.8}/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.6 → ob_dj_store-0.0.20.8}/ob_dj_store.egg-info/PKG-INFO

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

{ob_dj_store-0.0.20.6 → ob_dj_store-0.0.20.8}/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