ob-dj-store 0.0.20.1__py3-none-any.whl → 0.0.20.5__py3-none-any.whl

ob_dj_store/apis/stores/filters.py

@@ -49,11 +49,7 @@ class StoreFilter(filters.FilterSet):
         return queryset.filter(address__country=value)
 
     def by_shipping_methods_names(self, queryset, name, value):
-        return queryset.filter(
-            shipping_methods__name__in=[
-                value,
-            ]
-        )
+        return queryset.filter(shipping_methods__name__in=[value,])
 
     def by_open_stores(self, queryset, name, value):
         if value:
@@ -186,9 +182,7 @@ class CategoryFilter(filters.FilterSet):
 
     def by_type(self, queryset, name, value):
         return (
-            queryset.filter(
-                subcategories__products__type=value,
-            )
+            queryset.filter(subcategories__products__type=value,)
             .prefetch_related(
                 Prefetch(
                     "subcategories",
@@ -198,9 +192,7 @@ class CategoryFilter(filters.FilterSet):
                 ),
                 Prefetch(
                     "subcategories__products",
-                    queryset=Product.objects.filter(
-                        is_active=True,
-                    ).distinct(),
+                    queryset=Product.objects.filter(is_active=True,).distinct(),
                 ),
             )
             .distinct()
@@ -241,10 +233,7 @@ class FavoriteFilter(filters.FilterSet):
             product_variants__inventories__store__pk=value
         ).values_list("id", flat=True)
         content_type = ContentType.objects.get_for_model(Product)
-        return queryset.filter(
-            content_type=content_type,
-            object_id__in=products_ids,
-        )
+        return queryset.filter(content_type=content_type, object_id__in=products_ids,)
 
 
 class PaymentMethodFilter(filters.FilterSet):
@@ -267,10 +256,7 @@ class PaymentMethodFilter(filters.FilterSet):
 
 class WalletFilter(filters.FilterSet):
     currency = filters.CharFilter(
-        method="by_currency",
-        validators=[
-            validate_currency,
-        ],
+        method="by_currency", validators=[validate_currency,],
     )
     country = filters.CharFilter(method="by_country")
 

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

@@ -329,8 +329,7 @@ class OrderSerializer(serializers.ModelSerializer):
         return store
 
     def _validate_user_address(
-        self,
-        attrs,
+        self, attrs,
     ):
         if "shipping_address" not in attrs:
             raise ValidationError(
@@ -362,7 +361,7 @@ class OrderSerializer(serializers.ModelSerializer):
             raise serializers.ValidationError(errors)
         email = gift_details.get("email")
         phone_number = gift_details.get("phone_number")
-
+        user = self.context["request"].user
         if email and phone_number:
             raise serializers.ValidationError(
                 _("Both Email and Phone number cannot be provided.")
@@ -376,7 +375,12 @@ class OrderSerializer(serializers.ModelSerializer):
                 validate_email(email)
             except ValidationError:
                 raise serializers.ValidationError(_("Invalid Email format."))
+        try:
+            if not gift_details["currency"]:
+                gift_details["currency"] = get_currency_by_country(user.country.code)
 
+        except Exception:
+            raise serializers.ValidationError("Currency is required")
         if not pycountry.currencies.get(alpha_3=gift_details["currency"]):
             raise serializers.ValidationError("Gift currency is not valid")
         try:
@@ -412,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
             ):
@@ -731,9 +731,7 @@ class CartItemSerializer(
             "is_multi_variant",
         )
         extra_kwargs = {
-            "store": {
-                "required": True,
-            },
+            "store": {"required": True,},
         }
 
     def get_is_multi_variant(self, obj):
@@ -774,9 +772,9 @@ class CartItemSerializer(
         favorites = Favorite.objects.favorites_for_object(
             obj.product_variant.product, user
         )
-        customization = [
-            obj.product_variant,
-        ] + [attribute_choice for attribute_choice in obj.attribute_choices.all()]
+        customization = [obj.product_variant,] + [
+            attribute_choice for attribute_choice in obj.attribute_choices.all()
+        ]
         for favorite in favorites:
             content_objects = [
                 instance.content_object for instance in favorite.extras.all()
@@ -1167,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},
@@ -1181,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:
@@ -1812,9 +1809,7 @@ class PartnerAuthInfoSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
                     status=OneTruePairing.Statuses.init,
                     created_at__gte=timeout,
                 ).get(
-                    email=attrs["email"],
-                    partner_otp_auth__partner=partner,
-                    user=user,
+                    email=attrs["email"], partner_otp_auth__partner=partner, user=user,
                 )
                 self.context["otp"] = otp
             except ObjectDoesNotExist as e:
@@ -1851,11 +1846,7 @@ class PartnerAuthInfoSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             otp.status = OneTruePairing.Statuses.used
             otp.save()
         partner_auth_info = PartnerAuthInfo.objects.update_or_create(
-            user=user,
-            defaults={
-                "partner": partner,
-                "email": validated_data["email"],
-            },
+            user=user, defaults={"partner": partner, "email": validated_data["email"],},
         )
         return partner_auth_info