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

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/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/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/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.dist-info → ob_dj_store-0.0.20.2.dist-info}/METADATA

@@ -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.dist-info → ob_dj_store-0.0.20.2.dist-info}/RECORD

@@ -3,15 +3,15 @@ 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=IRpWBlEdbPCOX7FnVwxJhq4dXLOB8IcToLK7RM6HxI4,65258
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=16tyWBbwC9NGEvfGDz8WdQe6QJo8GYPPzTdpb1Tdlvs,66061
 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=GWFVIzP4pUjY-57QBXrIhbK27JlY6EDatqsM97sGtZo,14533
-ob_dj_store/core/stores/admin_inlines.py,sha256=2K8iDmP4h0CLIOqy3x-ZXXpgYnT2jqL4cg5YFdiho8s,2976
+ob_dj_store/core/stores/admin.py,sha256=IbkkC8ILwFDzWD1vxNfBwRpbSm4fGZOR8yya-ZbSJho,14646
+ob_dj_store/core/stores/admin_inlines.py,sha256=2EOyWvl5ebm9kxHB8HXixAzUSx7FpGubPTwxGEJ66E0,2946
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=lz2CE4PJCI1ViO-CU61LqTr43O41aGRQkbWZUR5Fmfg,9909
 ob_dj_store/core/stores/receivers.py,sha256=DljYC97C_e1mHduKw9Un6YQmxIdwSIter7yVVZwggFA,3768
@@ -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=uImY_F9buKwIQeokl8sooT_AzXHnhD_VFEqmP3Fph2Q,7461
+ob_dj_store/core/stores/models/_cart.py,sha256=UKN_rBf9G0RAe5C1JplnEi6zTtc5toB-Dsq5Xl0rvN4,7495
 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.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,,
+ob_dj_store-0.0.20.2.dist-info/METADATA,sha256=_yjSTgCVEnJmDq9qsRD0HOIz3d4B1ucy1FkEiPU53ls,2827
+ob_dj_store-0.0.20.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+ob_dj_store-0.0.20.2.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.20.2.dist-info/RECORD,,

{ob_dj_store-0.0.20.dist-info → ob_dj_store-0.0.20.2.dist-info}/WHEEL

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