ob-dj-store 0.0.15.4__py3-none-any.whl → 0.0.15.6__py3-none-any.whl

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

@@ -9,11 +9,13 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.gis.geos import Point
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.validators import validate_email
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.utils.module_loading import import_string
 from django.utils.timezone import localtime, now
 from django.utils.translation import gettext_lazy as _
+from phonenumber_field.phonenumber import to_python
 from rest_framework import serializers
 
 from config import settings as store_settings
@@ -250,6 +252,47 @@ class OrderSerializer(serializers.ModelSerializer):
                 {"store": _("Delivery is not supported by this store.")}
             )
 
+    def _validate_digital_product(self, gift_details, attrs):
+        errors = []
+        for key in settings.DIGITAL_PRODUCTS_REQUIRED_KEYS:
+            if not (key in gift_details.keys() and len(str(gift_details.get(key)))):
+                errors.append({key: "This field should be filled."})
+        if len(errors) > 0:
+            raise serializers.ValidationError(errors)
+        email = gift_details.get("email")
+        phone_number = gift_details.get("phone_number")
+
+        if email and phone_number:
+            raise serializers.ValidationError(
+                _("Both Email and Phone number cannot be provided.")
+            )
+        elif not email and not phone_number:
+            raise serializers.ValidationError(_("Email or Phone number is required."))
+        elif phone_number and not to_python(phone_number).is_valid():
+            raise serializers.ValidationError(_("Invalid Phone number format."))
+        elif email:
+            try:
+                validate_email(email)
+            except ValidationError:
+                raise serializers.ValidationError(_("Invalid Email format."))
+
+        if not pycountry.currencies.get(alpha_3=gift_details["currency"]):
+            raise serializers.ValidationError("Gift currency is not valid")
+        try:
+            product = Product.objects.get(id=gift_details["digital_product"])
+        except ObjectDoesNotExist:
+            raise serializers.ValidationError(_("Digital product does not exist!"))
+        if product.type == Product.ProductTypes.PHYSICAL:
+            raise serializers.ValidationError(
+                _("You must not fill extra infos for physical products.")
+            )
+
+        gift_minimun_amount = store_settings.GIFT_MINIMUM_AMOUNT.get(
+            attrs["store"].currency, 5
+        )
+        if gift_details["price"] <= gift_minimun_amount - 1:
+            raise serializers.ValidationError(_("Gift card amount is not valid!"))
+
     def validate(self, attrs):
         user = self.context["request"].user
         attrs["store"] = self._get_store()
@@ -258,28 +301,7 @@ class OrderSerializer(serializers.ModelSerializer):
         stores = Store.objects.filter(store_items__cart=user.cart).distinct()
         gift_details = attrs["extra_infos"].get("gift_details", None)
         if gift_details:
-            errors = []
-            for key in settings.DIGITAL_PRODUCTS_REQUIRED_KEYS:
-                if not (key in gift_details.keys() and len(str(gift_details.get(key)))):
-                    errors.append({key: "This field should be filled."})
-            if len(errors) > 0:
-                raise serializers.ValidationError(errors)
-            if not pycountry.currencies.get(alpha_3=gift_details["currency"]):
-                raise serializers.ValidationError("Gift currency is not valid")
-            try:
-                product = Product.objects.get(id=gift_details["digital_product"])
-            except ObjectDoesNotExist:
-                raise serializers.ValidationError(_("Digital product does not exist!"))
-            if product.type == Product.ProductTypes.PHYSICAL:
-                raise serializers.ValidationError(
-                    _("You must not fill extra infos for physical products.")
-                )
-
-            gift_minimun_amount = store_settings.GIFT_MINIMUM_AMOUNT.get(
-                attrs["store"].currency, 5
-            )
-            if gift_details["price"] <= gift_minimun_amount - 1:
-                raise serializers.ValidationError(_("Gift card amount is not valid!"))
+            self._validate_digital_product(gift_details, attrs)
             currency = gift_details["currency"]
         # The Cart items must not be empty
         elif not user.cart.items.exists():
@@ -722,6 +744,7 @@ class ProductSerializer(FavoriteMixin, serializers.ModelSerializer):
             "id",
             "name",
             "slug",
+            "label",
             "description",
             "product_images",
             "product_variants",
@@ -744,6 +767,7 @@ class ProductListSerializer(serializers.ModelSerializer):
             "id",
             "name",
             "slug",
+            "label",
             "description",
             "product_images",
             "type",

{ob_dj_store-0.0.15.4.dist-info → ob_dj_store-0.0.15.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.15.4
+Version: 0.0.15.6
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob_dj_store-0.0.15.4.dist-info → ob_dj_store-0.0.15.6.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=dl2ncAu871774RP6JrBQpbi46k89GEy_OEE_kkzkPXs,8555
 ob_dj_store/apis/stores/urls.py,sha256=P4d0iamg2R5lTwc5DTIuhLzJTMSH4f5QpHzGR1_PWE0,1676
 ob_dj_store/apis/stores/views.py,sha256=lDMhlAkxt_q0npVkvm2eAxUmZ_Jbm5v9P63_sXFIIzo,38039
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=b2l8lVfJDWG947neiQYNtD9LaWuR41pvgtI-y96-yHw,48758
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=ohA0C_qEmZt2NQ2GXSaDlmPP0fiJREPEbua4czX4c68,49682
 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
@@ -131,7 +131,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.15.4.dist-info/METADATA,sha256=si3FXvGauxwxCJbN2KdHU2VtgBgQJu2_2pcIPQqVM3A,2827
-ob_dj_store-0.0.15.4.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-ob_dj_store-0.0.15.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.15.4.dist-info/RECORD,,
+ob_dj_store-0.0.15.6.dist-info/METADATA,sha256=Si48BUWpsafl_ZvAxOggl2mcBGxnM04MdA8cVgKdJFk,2827
+ob_dj_store-0.0.15.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+ob_dj_store-0.0.15.6.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.15.6.dist-info/RECORD,,

{ob_dj_store-0.0.15.4.dist-info → ob_dj_store-0.0.15.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any