ob-dj-store 0.0.20.6__py3-none-any.whl → 0.0.20.8__py3-none-any.whl

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/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/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.dist-info → ob_dj_store-0.0.20.8.dist-info}/METADATA

@@ -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.dist-info → ob_dj_store-0.0.20.8.dist-info}/RECORD

@@ -3,7 +3,7 @@ ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ob_dj_store/apis/stores/filters.py,sha256=kbKtrg9ba9R5ptN9xOOEo-ZZ2IZbQfGH6BJCGUzF1bc,9510
 ob_dj_store/apis/stores/urls.py,sha256=7vwogfIGcKS0hHYK3iBXKQwi1kCA_vuHY1eZt8rAspg,2021
 ob_dj_store/apis/stores/views.py,sha256=P8hkpMxC080QlPGFXaQXV2wKoo-B0aUg-hToHtMG24s,41612
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=vfCqxP3PqbV9Kni75W30HHEx0ro3_5O3sHgQ3pnUnlU,65704
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=HeUvpFUz8DMOLCmiSEPmitlsoNfjUJq9h2zaXqZKi7w,66013
 ob_dj_store/apis/tap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/tap/serializers.py,sha256=KPrBK4h2-fWvEVf6vOj2ww5-USV9WqpyYicIqoHIiXI,1065
 ob_dj_store/apis/tap/urls.py,sha256=bnOTv6an11kxpo_FdqlhsizlGPLVpNxBjCyKcf3_C9M,367
@@ -22,7 +22,7 @@ ob_dj_store/core/stores/gateway/tap/__init__.py,sha256=5Z6azpb6tmr1nRvKwQWzlYw9r
 ob_dj_store/core/stores/gateway/tap/admin.py,sha256=tGtLg6ttkZXb7JtFPD-5r46pCmb1BsbQpv182KlY3-o,1153
 ob_dj_store/core/stores/gateway/tap/apps.py,sha256=kWwPjuAJeEmEasVDzUbvRsGaQWL-aYe4JDHNLvCVXPs,212
 ob_dj_store/core/stores/gateway/tap/managers.py,sha256=FmnJVWwShbNJPU_USZA2hC8g2W3D_S4J3sxN8JROlRo,817
-ob_dj_store/core/stores/gateway/tap/models.py,sha256=ZbMdglR2a8MhHO-qfOFP7tjxiA8XmZb8IKP5L7TXrZY,4786
+ob_dj_store/core/stores/gateway/tap/models.py,sha256=KfM8s_tFlGIVpaol9CVFjSaCx6zn7wu3l90oWBviV7I,4783
 ob_dj_store/core/stores/gateway/tap/utils.py,sha256=bajB6TH83AVPzm9npshgIZy-PUd0dt4vS4msLs2h998,5206
 ob_dj_store/core/stores/gateway/tap/migrations/0001_initial.py,sha256=U8Cv1zLEb4SB4uX5Jjt6QJi7RkZ46-3TF18NcupHb-8,4778
 ob_dj_store/core/stores/gateway/tap/migrations/0002_auto_20220815_1610.py,sha256=gRsekTbqUH4h5yg5d1zWuai7Wiv6-rfsmjnXundgin8,674
@@ -31,6 +31,7 @@ ob_dj_store/core/stores/gateway/tap/migrations/0004_tapcustomer.py,sha256=tazV01
 ob_dj_store/core/stores/gateway/tap/migrations/0005_alter_tappayment_payment_url.py,sha256=M66KGz3b1R-xkv3GPQKkrKDUrO-2L0mmbcnmDDP_xII,512
 ob_dj_store/core/stores/gateway/tap/migrations/0006_alter_tappayment_source.py,sha256=K-aktQ87sbvSedumIo-dxrJ32CjCwbEWqLyGGzexqhU,655
 ob_dj_store/core/stores/gateway/tap/migrations/0007_alter_tappayment_source.py,sha256=OXK2Esw908DBYlf5rkvqc645gKSOfkUL0RFOmcTrVFM,700
+ob_dj_store/core/stores/gateway/tap/migrations/0008_alter_tappayment_user.py,sha256=oSjhhPOMM37VLWdr25YcR9rm0Zkq6wQQzV64fClYCBI,771
 ob_dj_store/core/stores/gateway/tap/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/migrations/0001_initial.py,sha256=Ny58kubU6qNVr2TYD1p61Sb8jQGgdLjVN5HwywugN8k,2108
 ob_dj_store/core/stores/migrations/0002_auto_20220422_0205.py,sha256=hnfr60m50hyIL2QkPfD8rKWLtfVjW58L9vNkYo72ZII,382
@@ -158,7 +159,7 @@ ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 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.20.6.dist-info/METADATA,sha256=h-SZzXoCLcoEluczxfQpNY88s5EKLHvopyd4_xyATUA,2850
-ob_dj_store-0.0.20.6.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-ob_dj_store-0.0.20.6.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.20.6.dist-info/RECORD,,
+ob_dj_store-0.0.20.8.dist-info/METADATA,sha256=9FsAIsFu8qFF8RmriRXcPKwHq9krgPwQyJx6Ph-E9oQ,2850
+ob_dj_store-0.0.20.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ob_dj_store-0.0.20.8.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.20.8.dist-info/RECORD,,

{ob_dj_store-0.0.20.6.dist-info → ob_dj_store-0.0.20.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any