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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.19.9
+Version: 0.0.20.1
 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.1}/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,17 @@ 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 item.inventory.is_snoozed:
+                            unavailable_items.append(item)
+                        elif not item.inventory.is_uncountable:
+                            if (
+                                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 +472,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
@@ -834,10 +851,19 @@ class CartSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         # update or create instance items
         for item in validated_data["items"]:
             attribute_choices = item.pop("attribute_choices", None)
-            cart_item = CartItem.objects.create(
+            logger.info("cart item :", item)
+            cart_item, created = CartItem.objects.get_or_create(
                 cart=instance,
-                **item,
+                pk=item.pop("id", None),
+                defaults={
+                    "cart": instance,
+                    "product_variant": item.pop("product_variant", None),
+                    "store": item.pop("store", None),
+                    "notes": item.pop("notes", None),
+                    "quantity": item.pop("quantity", None),
+                },
             )
+
             if attribute_choices:
                 cart_item.attribute_choices.set(attribute_choices)
             cart_item.save()
@@ -1411,7 +1437,7 @@ class FavoriteSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
                 else:
                     if inventory.is_uncountable:
                         return True
-                    return inventory.quantity > 0
+                    return False
             except ObjectDoesNotExist:
                 return False
         return None

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20.1}/ob_dj_store/core/stores/admin.py

@@ -288,6 +288,7 @@ class CartAdmin(admin.ModelAdmin):
     search_fields = [
         "customer__email",
     ]
+    autocomplete_fields = ["customer"]
 
     def get_queryset(self, request):
         queryset = super().get_queryset(request)
@@ -380,6 +381,7 @@ class OrderAdmin(ImportExportModelAdmin, admin.ModelAdmin):
         "status",
         WeekNumberFilter,  # Include the filter instance instead of the class name
     ]
+    autocomplete_fields = ["customer"]
 
     def get_queryset(self, request):
         queryset = (
@@ -419,6 +421,7 @@ class PaymentAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     search_fields = ["orders__store__name", "user__email"]
     readonly_fields = ("orders",)
     date_hierarchy = "created_at"
+    autocomplete_fields = ["user"]
 
 
 class InventoryAdmin(admin.ModelAdmin):

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20.1}/ob_dj_store/core/stores/admin_inlines.py

@@ -107,12 +107,7 @@ class CartItemInlineAdmin(admin.TabularInline):
 class OrderItemInline(admin.TabularInline):
     model = models.OrderItem
     extra = 0
-    fields = (
-        "product_variant",
-        "quantity",
-        "unit_value",
-        "total_amount",
-    )
+    fields = ("product_variant", "quantity", "unit_value", "total_amount", "notes")
     readonly_fields = (
         "unit_value",
         "total_amount",

{ob_dj_store-0.0.19.9 → ob_dj_store-0.0.20.1}/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
@@ -91,7 +97,8 @@ class Cart(models.Model):
     def fill(self, order):
         from ob_dj_store.core.stores.models._cart import CartItem
 
-        for item in order.items.all():
+        order_items = order.items.all()
+        for item in order_items:
             cart_item = CartItem.objects.create(
                 cart=self,
                 product_variant=item.product_variant,

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