ob-dj-store 0.0.21.2__py3-none-any.whl → 0.0.21.4__py3-none-any.whl

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

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

@@ -1,9 +1,9 @@
 ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ob_dj_store/apis/stores/filters.py,sha256=cJ7OnNLFT1N5lp3IXFUpGMgqm-jhS24g-Y8pZmEMe58,10260
+ob_dj_store/apis/stores/filters.py,sha256=JeUtcicJ3cFnZc71aUMEwn2jaVj1oNQsZOCZfdxGDu8,10338
 ob_dj_store/apis/stores/urls.py,sha256=W9sNJ7ST9pGnfVCf7GmduDO-_zK9MGTI6ybV8n-lzSc,2111
 ob_dj_store/apis/stores/views.py,sha256=cwDFNY2rtTfjl_F9PpR5zOJy2DPmGidOjIlJ9fsgSYI,42744
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=GUsUTN4MTXq92Uriv6Ql9MzjZJsSbmFDC3lZhSmB7vE,68219
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=R_FGdD98iLWsb0dsI-kdq9_60yPkwahT_kMpfNPUzmQ,68239
 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
@@ -153,14 +153,14 @@ ob_dj_store/core/stores/models/_inventory.py,sha256=_rGlVL5HjOlHQVB8CI0776CPcE5r
 ob_dj_store/core/stores/models/_order.py,sha256=_08lqX5p4brCdUilqfbT--6Ao2TMsqnzXaWoV_7IYL8,9758
 ob_dj_store/core/stores/models/_partner.py,sha256=OuYvevUWn1sYHs9PcFf51EUUC1uqytQss8Bx91aMOH8,4732
 ob_dj_store/core/stores/models/_payment.py,sha256=FTV-NmvQjxwwR5C5X7qYWV-ZUIZfqMMEjkBNaS-drLs,6421
-ob_dj_store/core/stores/models/_product.py,sha256=iBSXZcZdtCXFINiOFqbnaZot9rWPkFdzySXwKJO5h6I,18239
+ob_dj_store/core/stores/models/_product.py,sha256=cYMsCtcYoJJ-kdmDmHGm2AGBo2cn6qWuF9g7zQJ_p2g,18283
 ob_dj_store/core/stores/models/_store.py,sha256=0K-CNJWuXNqeyULL1J0M9hiNcVla0UNNjdCdN_nzNEE,9833
 ob_dj_store/core/stores/models/_wallet.py,sha256=YvT-rvED-jrYjePLJpvdLXXoBudR6TGPu5cNE0m2fWo,5643
 ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.21.2.dist-info/METADATA,sha256=3N8bQGyJNEAIPzgZDu-MpfFdHHNPmEo3Uv4pTjgtK84,2850
-ob_dj_store-0.0.21.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ob_dj_store-0.0.21.2.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.21.2.dist-info/RECORD,,
+ob_dj_store-0.0.21.4.dist-info/METADATA,sha256=qhdG-tlBDz4MV9ybB8VQwDWe5t-2eKMTacinZNLizjo,2850
+ob_dj_store-0.0.21.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ob_dj_store-0.0.21.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.21.4.dist-info/RECORD,,