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

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

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

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

@@ -362,7 +362,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 +376,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:
@@ -453,12 +458,15 @@ class OrderSerializer(serializers.ModelSerializer):
                     raise ValidationError(_("You cannot order from different stores"))
                 for item in user.cart.items.all():
                     if item.inventory:
-                        if (
-                            not item.inventory.is_uncountable
-                            and not item.inventory.quantity
-                            or item.inventory.quantity == 0
-                        ):
+                        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
@@ -848,10 +856,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()
@@ -1425,7 +1442,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.20 → ob_dj_store-0.0.20.2}/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.20 → ob_dj_store-0.0.20.2}/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.20 → ob_dj_store-0.0.20.2}/ob_dj_store/core/stores/models/_cart.py

@@ -97,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.20 → ob_dj_store-0.0.20.2}/ob_dj_store.egg-info/PKG-INFO

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