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

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

@@ -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 → ob_dj_store-0.0.20.7}/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 → ob_dj_store-0.0.20.7}/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.7
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes