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

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

@@ -416,15 +416,23 @@ 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 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 +1186,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.6.dist-info → ob_dj_store-0.0.20.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.6
+Version: 0.0.20.7
 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.7.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=5P8C_mki1qVsTBFppEu9Ys0uE71pdWuYhxUSTPKiV94,65969
 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
@@ -158,7 +158,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.7.dist-info/METADATA,sha256=5VjZm9Hv7Zl1RSBi2yw3-P3dNobmZJ0wYNdxV9F9nUU,2850
+ob_dj_store-0.0.20.7.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+ob_dj_store-0.0.20.7.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.20.7.dist-info/RECORD,,

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

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