ob-dj-store 0.0.19.9__tar.gz → 0.0.20__tar.gz

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20}/PKG-INFO

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

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -396,7 +396,7 @@ class OrderSerializer(serializers.ModelSerializer):
 
     def _validate_pickup_time(self, store, pickup_time):
         # validate that the pickup_time is always in the future
-        print("pickup :", pickup_time)
+
         if pickup_time < localtime(now()):
             raise serializers.ValidationError(_("Pickup time must be in the future"))
         pickup_time_time = pickup_time.time()
@@ -440,6 +440,7 @@ class OrderSerializer(serializers.ModelSerializer):
             attrs["extra_infos"] = {}
         stores = Store.objects.filter(store_items__cart=user.cart).distinct()
         gift_details = attrs["extra_infos"].get("gift_details", None)
+        unavailable_items = []
         if gift_details:
             self._validate_digital_product(gift_details, attrs)
             currency = gift_details["currency"]
@@ -451,7 +452,14 @@ class OrderSerializer(serializers.ModelSerializer):
                 if len(stores) > 1:
                     raise ValidationError(_("You cannot order from different stores"))
                 for item in user.cart.items.all():
-                    if not item.inventory:
+                    if item.inventory:
+                        if (
+                            not item.inventory.is_uncountable
+                            and not item.inventory.quantity
+                            or item.inventory.quantity == 0
+                        ):
+                            unavailable_items.append(item)
+                    elif not item.inventory:
                         if language and item.product_variant.product.name_arabic:
                             product_name = item.product_variant.product.name_arabic
                         else:
@@ -461,8 +469,14 @@ class OrderSerializer(serializers.ModelSerializer):
                         message = (
                             f"{product_name} {variant_name} doesn't exist on this store"
                         )
+                        unavailable_items.append(item)
                         raise ValidationError(_(message))
-
+                if unavailable_items:
+                    raise ValidationError(
+                        _(
+                            "The cart has items that are not available in the selected store"
+                        )
+                    )
             if "shipping_method" in attrs:
                 if (
                     attrs["shipping_method"].type

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20}/ob_dj_store/core/stores/models/_cart.py

@@ -1,3 +1,4 @@
+import logging
 from decimal import Decimal
 
 from django.contrib.auth import get_user_model
@@ -10,6 +11,8 @@ from ob_dj_store.core.stores.managers import CartItemManager, CartManager
 from ob_dj_store.core.stores.models._partner import PartnerAuthInfo
 from ob_dj_store.core.stores.utils import round_up_tie
 
+logger = logging.getLogger(__name__)
+
 
 class Cart(models.Model):
     customer = models.OneToOneField(
@@ -48,8 +51,11 @@ class Cart(models.Model):
     def total_price(self) -> Decimal:
         total_price = Decimal(0)
         for item in self.items.all():
-            if item.inventory.quantity and item.inventory.quantity > 0:
-                total_price += item.total_price
+            try:
+                if item.inventory.quantity and item.inventory.quantity > 0:
+                    total_price += item.total_price
+            except AttributeError:
+                logger.error(f"Item {item} has no inventory")
         return total_price
 
     @property

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20}/ob_dj_store.egg-info/PKG-INFO

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