ob-dj-store 0.0.19.8__py3-none-any.whl → 0.0.20__py3-none-any.whl

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/core/stores/admin.py

@@ -529,6 +529,7 @@ class PartnerAdmin(admin.ModelAdmin):
     inlines = [
         PartnerEmailDomainInlineAdmin,
     ]
+    ordering = ["created_at"]
 
 
 class DiscountAdmin(admin.ModelAdmin):

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,7 +51,11 @@ class Cart(models.Model):
     def total_price(self) -> Decimal:
         total_price = Decimal(0)
         for item in self.items.all():
-            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.8.dist-info → ob_dj_store-0.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.19.8
+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.8.dist-info → ob_dj_store-0.0.20.dist-info}/RECORD

@@ -3,14 +3,14 @@ ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ob_dj_store/apis/stores/filters.py,sha256=zKBXPBoqIyFlSeZOECp97RTWvSLqNPnlPhEp7p8W5tE,9702
 ob_dj_store/apis/stores/urls.py,sha256=7vwogfIGcKS0hHYK3iBXKQwi1kCA_vuHY1eZt8rAspg,2021
 ob_dj_store/apis/stores/views.py,sha256=aE4LFPHzs_CtzZ8K5-vAbDn_51hyhi0KIsi7cV8dpkA,43372
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=j511ztKSljd8ObdmLTndvp31YEBhJalu6exbOuTa7r4,64623
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=IRpWBlEdbPCOX7FnVwxJhq4dXLOB8IcToLK7RM6HxI4,65258
 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
 ob_dj_store/apis/tap/views.py,sha256=vG0rC-PQHCnrbNsPW1gClx0rkaIjALEAuj5cQKmCTo0,2664
 ob_dj_store/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/__init__.py,sha256=-izNGrxNn_nn3IQXd5pkuES9lSF-AHYb14yhNPozYCI,65
-ob_dj_store/core/stores/admin.py,sha256=fGjjpDkPzQM2Fwo5yGzeoeSpX2CW2RJQ4kfftD5NwyM,14503
+ob_dj_store/core/stores/admin.py,sha256=GWFVIzP4pUjY-57QBXrIhbK27JlY6EDatqsM97sGtZo,14533
 ob_dj_store/core/stores/admin_inlines.py,sha256=2K8iDmP4h0CLIOqy3x-ZXXpgYnT2jqL4cg5YFdiho8s,2976
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=lz2CE4PJCI1ViO-CU61LqTr43O41aGRQkbWZUR5Fmfg,9909
@@ -141,7 +141,7 @@ ob_dj_store/core/stores/migrations/0105_store_is_open_after_midnight.py,sha256=8
 ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/models/__init__.py,sha256=VeWrDiIbw94ZDSFD-62rz9iTTW87iPdwDW5jcjxm7bs,2045
 ob_dj_store/core/stores/models/_address.py,sha256=8zV444A8M7P8yqQHjEOCROUykWPQ1ndSdd2IIX8wwWY,2207
-ob_dj_store/core/stores/models/_cart.py,sha256=I5Mv-OkmV3W26GLPpNBAEaDRsbSbfPCJGJ1-MR6fG4Y,7210
+ob_dj_store/core/stores/models/_cart.py,sha256=uImY_F9buKwIQeokl8sooT_AzXHnhD_VFEqmP3Fph2Q,7461
 ob_dj_store/core/stores/models/_favorite.py,sha256=3yyMCoiftGOPAQwkMI2J29r3x6NJsRYri9f8gXiF1e8,3306
 ob_dj_store/core/stores/models/_feedback.py,sha256=eCUVgprNK5hSRKOS4M_pdR7QH2-rqhoYevlpykhCOLg,1472
 ob_dj_store/core/stores/models/_inventory.py,sha256=ZU8xDMQZxLnFehkBEGWr-os4AF1IlCn5XnBxvRq9IAs,4314
@@ -155,7 +155,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.19.8.dist-info/METADATA,sha256=Vr7hVp3_AAw1Px15BPHr-jSfpTzSm7V2mxsbEjQHPnU,2827
-ob_dj_store-0.0.19.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ob_dj_store-0.0.19.8.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.19.8.dist-info/RECORD,,
+ob_dj_store-0.0.20.dist-info/METADATA,sha256=GYWfTNybLOa88W3nVp6a8hrulcHsuT65w1Iw61RNR4M,2825
+ob_dj_store-0.0.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+ob_dj_store-0.0.20.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.20.dist-info/RECORD,,