ob-dj-store 0.0.20.3__py3-none-any.whl → 0.0.20.4__py3-none-any.whl

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

@@ -416,13 +416,9 @@ class OrderSerializer(serializers.ModelSerializer):
                     logger.info(
                         f"The fix for UAE stores timezone failed due to this error {e}"
                     )
-            if store.is_open_after_midnight:
-                if to_hour < pickup_time_time < from_hour:
-                    raise serializers.ValidationError(
-                        _("Pickup time must be between store's opening hours")
-                    )
-            elif (
-                not op_hour.always_open
+            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
             ):
@@ -1169,7 +1165,6 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "image",
             "busy_mode",
             "name_arabic",
-            "is_open_after_midnight",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1183,16 +1178,16 @@ 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 obj.is_open_after_midnight:
+            # 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
 
             if current_op_hour.always_open:

ob_dj_store/core/stores/admin.py

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

ob_dj_store/core/stores/admin_inlines.py

@@ -13,6 +13,7 @@ class OpeningHoursInlineAdmin(admin.TabularInline):
         "from_hour",
         "to_hour",
         "always_open",
+        "is_open_after_midnight",
     ]
 
     def get_queryset(self, request):

ob_dj_store/core/stores/migrations/0107_auto_20250425_2059.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.8 on 2025-04-25 17:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0106_alter_paymentmethod_payment_provider"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="store", name="is_open_after_midnight",),
+        migrations.AddField(
+            model_name="openinghours",
+            name="is_open_after_midnight",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="offer_id",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="offer_redeemed",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ob_dj_store/core/stores/models/_order.py

@@ -90,7 +90,8 @@ class Order(DjangoModelCleanMixin, models.Model):
     # Pick up can be now or a later hour during the day. If pickup_time is not set,
     extra_infos = models.JSONField(null=True, blank=True,)
     init_data = models.JSONField(null=True, blank=True)
-
+    offer_redeemed = models.BooleanField(default=False)
+    offer_id = models.IntegerField(null=True, blank=True, default=None)
     # TODO: add pick_up_time maybe ?
     # audit fields
     created_at = models.DateTimeField(auto_now_add=True)

ob_dj_store/core/stores/models/_product.py

@@ -141,7 +141,7 @@ class AvailabilityHours(DjangoModelCleanMixin, models.Model):
     def clean(self) -> None:
         super().clean()
         try:
-            if self.store.is_open_after_midnight:
+            if self.store.current_opening_hours.is_open_after_midnight:
                 return
         except Exception as e:
             logger.info(f"OpeningHours has no store: {e}")

ob_dj_store/core/stores/models/_store.py

@@ -179,7 +179,6 @@ class Store(DjangoModelCleanMixin, models.Model):
     )
     busy_mode = models.BooleanField(default=False)
     is_digital = models.BooleanField(default=False)
-    is_open_after_midnight = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -238,6 +237,7 @@ class OpeningHours(DjangoModelCleanMixin, models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     always_open = models.BooleanField(default=False)
+    is_open_after_midnight = models.BooleanField(default=False)
 
     class Meta:
         ordering = ("weekday", "from_hour")
@@ -252,7 +252,7 @@ class OpeningHours(DjangoModelCleanMixin, models.Model):
     def clean(self) -> None:
         super().clean()
         try:
-            if self.store.is_open_after_midnight:
+            if self.store:
                 return
         except Exception as e:
             logger.info(f"OpeningHours has no store: {e}")

{ob_dj_store-0.0.20.3.dist-info → ob_dj_store-0.0.20.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.3
+Version: 0.0.20.4
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes
@@ -25,6 +25,7 @@ Requires-Dist: djangorestframework-gis
 Requires-Dist: django-filter
 Requires-Dist: django-leaflet
 Requires-Dist: django-countries
+Dynamic: requires-dist
 
 ## OBytes Django Store App
 

{ob_dj_store-0.0.20.3.dist-info → ob_dj_store-0.0.20.4.dist-info}/RECORD

@@ -3,15 +3,15 @@ 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=-wX38Bbdg4XY3wpod5z1gFDrJ6bCG5T1U3GWt9jpZyw,65925
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=vfCqxP3PqbV9Kni75W30HHEx0ro3_5O3sHgQ3pnUnlU,65704
 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
 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=hQ6r-mjdOBifj5sxFzHQIFFPB_CPSJ84CgqXAqwdW04,14408
-ob_dj_store/core/stores/admin_inlines.py,sha256=urX6WQVbIhaM55lVnqZz2q7LbaIEyoFOVPEpKQKDxIE,2866
+ob_dj_store/core/stores/admin.py,sha256=aI1t3nIeOw_Vcy2E2LNaAxMRX2GjvVrVeBaH-n4IHco,14362
+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=4vdWqnfOuTbBgLiPt0yyF4TFzYFzzgLJgRT3iKGWqhk,9877
 ob_dj_store/core/stores/receivers.py,sha256=vduxOB9M6IgQ8E7dYrbC4T0PjOqLCgAVi2PwElTzNhM,3676
@@ -139,6 +139,7 @@ ob_dj_store/core/stores/migrations/0103_alter_paymentmethod_payment_provider.py,
 ob_dj_store/core/stores/migrations/0104_wallettransaction_is_redeemed.py,sha256=1AFAvPFR2G3zwrJoilpdNVUk3xp8jwAxc2a8WQEXc3g,420
 ob_dj_store/core/stores/migrations/0105_store_is_open_after_midnight.py,sha256=8EXutaPuUQjk94hAduLFoYVxPkPLMNCdD8TTmUdqfZ8,412
 ob_dj_store/core/stores/migrations/0106_alter_paymentmethod_payment_provider.py,sha256=BDDfVs0fMifUnSlZ4zIct78F6PvfP5gyrVFyifrCvE4,1092
+ob_dj_store/core/stores/migrations/0107_auto_20250425_2059.py,sha256=XCj2Inlw8e-_6W9wvYeVVV-bGk6lX8_n2FNI5W80XVw,848
 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
@@ -146,17 +147,17 @@ ob_dj_store/core/stores/models/_cart.py,sha256=PVyjkJ0qfq9LGOd_LxnVFaG_g5AyKJGSa
 ob_dj_store/core/stores/models/_favorite.py,sha256=3yyMCoiftGOPAQwkMI2J29r3x6NJsRYri9f8gXiF1e8,3306
 ob_dj_store/core/stores/models/_feedback.py,sha256=5kQ_AD9nkY57UOKo_qHg4_nEQAdFjK4VZjZ_R88q33Q,1456
 ob_dj_store/core/stores/models/_inventory.py,sha256=_rGlVL5HjOlHQVB8CI0776CPcE5r6szv1w3PjtkYnWM,4306
-ob_dj_store/core/stores/models/_order.py,sha256=VWWPgQVcGDcZciRK1ssgVB2rlWTgzwc5Xx8WrWkOJTs,9631
+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=FTV-NmvQjxwwR5C5X7qYWV-ZUIZfqMMEjkBNaS-drLs,6421
-ob_dj_store/core/stores/models/_product.py,sha256=A1C7Z1zchb6jarmT-5Fbabo2HLQPG7zEMHk3WmbGd2k,17803
-ob_dj_store/core/stores/models/_store.py,sha256=FIHL4OdIWkm2UeefQZoYJBScCdkkwHj12iS9UqhcxsI,9856
+ob_dj_store/core/stores/models/_product.py,sha256=E_P0BfJ5A7-aSb_8graCLOL_7PmL1JiBgqwx-mQpiM0,17825
+ob_dj_store/core/stores/models/_store.py,sha256=0K-CNJWuXNqeyULL1J0M9hiNcVla0UNNjdCdN_nzNEE,9833
 ob_dj_store/core/stores/models/_wallet.py,sha256=_qVNn2T0p-IIp4duiRSXLZ1hs9MeOnFrFabSghMWNgw,5341
 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.20.3.dist-info/METADATA,sha256=VH3f8kDLwdvABc0Szf4xSKpOqyfQEl2WIkvxzueZ27A,2827
-ob_dj_store-0.0.20.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ob_dj_store-0.0.20.3.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.20.3.dist-info/RECORD,,
+ob_dj_store-0.0.20.4.dist-info/METADATA,sha256=4gnf7Q1ZGFLZY2FT8Og3ORtWZi1DXGZ0VvsrhwzlpOE,2850
+ob_dj_store-0.0.20.4.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+ob_dj_store-0.0.20.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.20.4.dist-info/RECORD,,

{ob_dj_store-0.0.20.3.dist-info → ob_dj_store-0.0.20.4.dist-info}/WHEEL

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