ob-dj-store 0.0.21.2__tar.gz → 0.0.21.4__tar.gz

{ob_dj_store-0.0.21.2 → ob_dj_store-0.0.21.4}/PKG-INFO

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

{ob_dj_store-0.0.21.2 → ob_dj_store-0.0.21.4}/ob_dj_store/apis/stores/filters.py

@@ -1,3 +1,5 @@
+from urllib.parse import unquote
+
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.search import SearchVector
 from django.db.models import Prefetch, Q
@@ -103,8 +105,9 @@ class ProductFilter(filters.FilterSet):
     def filter_search(self, queryset, name, value):
         language = self.request.META.get("HTTP_LANGUAGE", "").strip().upper()
         if language == "AR":
-            query = Q(name_arabic__icontains=value) | Q(
-                description_arabic__icontains=value
+            value_ar = unquote(value)
+            query = Q(name_arabic__icontains=value_ar) | Q(
+                description_arabic__icontains=value_ar
             )
         else:
             query = Q(name__icontains=value) | Q(description__icontains=value)

{ob_dj_store-0.0.21.2 → ob_dj_store-0.0.21.4}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -967,22 +967,22 @@ class ProductSearchSerializer(
         )
 
     def get_store_id(self):
-        return self.context["request"].query_params.get("store")
+        return self.context["view"].kwargs["store_pk"]
 
-    def get_inventory_for_store(self, store_id):
-        if hasattr(self, "get_inventory"):
-            return self.get_inventory(store_id)
+    def get_inventory_for_store(self, product, store_id):
+        if store_id:
+            return product.get_inventory(store_id)
         return None
 
     def get_is_snoozed(self, obj):
         store_id = self.get_store_id()
-        inventory = self.get_inventory_for_store(store_id)
+        inventory = self.get_inventory_for_store(obj, store_id)
         return obj.is_snoozed(store_id=store_id) if inventory else False
 
     def get_is_available(self, obj):
         store_id = self.get_store_id()
-        inventory = self.get_inventory_for_store(store_id)
-        return bool(inventory and inventory.quantity)
+        inventory = self.get_inventory_for_store(obj, store_id)
+        return bool(inventory and (inventory.quantity or inventory.is_uncountable))
 
 
 class ProductListSerializer(ArabicFieldsMixin, serializers.ModelSerializer):

{ob_dj_store-0.0.21.2 → ob_dj_store-0.0.21.4}/ob_dj_store/core/stores/models/_product.py

@@ -250,13 +250,14 @@ class Product(DjangoModelCleanMixin, models.Model):
 
     def get_inventory(self, store_id):
         try:
-            inventory = self.product_variants.inventories.get(store=store_id)
+            inventory = self.product_variants.first().inventories.get(store_id=store_id)
         except ObjectDoesNotExist:
             return None
+        return inventory
 
     def is_snoozed(self, store_id):
         try:
-            inventory = self.product_variants.inventories.get(store=store_id)
+            inventory = self.product_variants.first().inventories.get(store=store_id)
         except ObjectDoesNotExist:
             return False
         return inventory.is_snoozed

{ob_dj_store-0.0.21.2 → ob_dj_store-0.0.21.4}/ob_dj_store.egg-info/PKG-INFO

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