ob-dj-store 0.0.21.1__tar.gz → 0.0.21.3__tar.gz

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/PKG-INFO

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

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/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
@@ -101,10 +103,16 @@ class ProductFilter(filters.FilterSet):
         return queryset.filter(category__name__iexact=value)
 
     def filter_search(self, queryset, name, value):
-        print("q filter :", value)
-        return queryset.filter(
-            Q(name__icontains=value) | Q(description__icontains=value)
-        ).distinct()[:5]
+        language = self.request.META.get("HTTP_LANGUAGE", "").strip().upper()
+        if language == "AR":
+            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)
+        qs = queryset.filter(query).distinct()[:5]
+        return qs
 
 
 class VariantFilter(filters.FilterSet):

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -947,6 +947,44 @@ class ProductSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeria
         return data
 
 
+class ProductSearchSerializer(
+    ArabicFieldsMixin, FavoriteMixin, serializers.ModelSerializer
+):
+    is_snoozed = serializers.SerializerMethodField()
+    is_available = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Product
+        fields = (
+            "id",
+            "name",
+            "name_arabic",
+            "slug",
+            "description",
+            "description_arabic",
+            "is_snoozed",
+            "is_available",
+        )
+
+    def get_store_id(self):
+        return self.context["request"].query_params.get("store")
+
+    def get_inventory_for_store(self, store_id):
+        if hasattr(self, "get_inventory"):
+            return self.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)
+        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)
+
+
 class ProductListSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     product_images = ProductMediaSerializer(many=True, source="images")
 

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/ob_dj_store/apis/stores/urls.py

@@ -20,6 +20,7 @@ from ob_dj_store.apis.stores.views import (
     TaxViewSet,
     TransactionsViewSet,
     VariantView,
+    WalletV2ViewSet,
     WalletViewSet,
 )
 
@@ -43,6 +44,7 @@ router.register(r"cart", CartView, basename="cart")
 router.register(r"cart-item", CartItemView, basename="cart-item")
 router.register(r"favorite", FavoriteViewSet, basename="favorite")
 router.register(r"wallet", WalletViewSet, basename="wallet")
+router.register(r"wallet_v2", WalletV2ViewSet, basename="wallet_v2")
 router.register(r"payment-method", PaymentMethodViewSet, basename="payment-method")
 router.register(r"order", ReorderViewSet, basename="re-order")
 router.register(r"partner/auth", PartnerAuthInfoViewSet, basename="auth")

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/ob_dj_store/apis/stores/views.py

@@ -51,6 +51,7 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     PaymentMethodSerializer,
     PaymentSerializer,
     ProductListSerializer,
+    ProductSearchSerializer,
     ProductSerializer,
     ProductVariantSerializer,
     ReorderSerializer,
@@ -61,6 +62,7 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     WalletSerializer,
     WalletTopUpSerializer,
     WalletTransactionListSerializer,
+    WalletTransactionSerializer,
 )
 from ob_dj_store.core.stores.gateway.tap.utils import TapException
 from ob_dj_store.core.stores.models import (
@@ -575,6 +577,11 @@ class ProductView(
     filterset_class = ProductFilter
     queryset = Product.objects.active()
 
+    def get_serializer_class(self):
+        if self.request.query_params.get("q"):
+            return ProductSearchSerializer
+        return ProductSerializer
+
     def apply_prefetch(self, queryset):
 
         qs = queryset.prefetch_related(
@@ -1103,13 +1110,19 @@ class WalletViewSet(
         methods=["GET"],
         detail=True,
         url_path="transactions",
-        serializer_class=WalletTransactionListSerializer,
+        serializer_class=WalletTransactionSerializer,
     )
-    def transactions(self, request, *args, **kwargs):
-        wallet = self.get_object()
-        queryset = wallet.transactions.all().order_by("-created_at")
-        serializer = WalletTransactionListSerializer(queryset, many=True)
-        return Response({"results": serializer.data})
+    def transactions(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        queryset = self.get_object().transactions.all().order_by("-created_at")
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
 
     @swagger_auto_schema(
         operation_summary="List Wallet selection images",
@@ -1137,6 +1150,34 @@ class WalletViewSet(
         return Response(serializer.data)
 
 
+class WalletV2ViewSet(
+    mixins.ListModelMixin, viewsets.GenericViewSet,
+):
+    def get_queryset(self):
+        return Wallet.objects.filter(
+            user=self.request.user, is_active=True
+        ).select_related("media_image")
+
+    @swagger_auto_schema(
+        operation_summary="List Wallet's transactions",
+        operation_description="""
+                list user's wallet transactions(debit,credit)
+            """,
+        tags=["Wallet",],
+    )
+    @action(
+        methods=["GET"],
+        detail=True,
+        url_path="transactions",
+        serializer_class=WalletTransactionListSerializer,
+    )
+    def transactions(self, request, *args, **kwargs):
+        wallet = self.get_object()
+        queryset = wallet.transactions.all().order_by("-created_at")
+        serializer = WalletTransactionListSerializer(queryset, many=True)
+        return Response({"results": serializer.data})
+
+
 class PartnerAuthInfoViewSet(
     mixins.CreateModelMixin,
     mixins.RetrieveModelMixin,

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/ob_dj_store/core/stores/models/_product.py

@@ -248,6 +248,19 @@ class Product(DjangoModelCleanMixin, models.Model):
     def __str__(self):
         return f"Product {self.name} (PK={self.pk})"
 
+    def get_inventory(self, store_id):
+        try:
+            inventory = self.product_variants.inventories.get(store=store_id)
+        except ObjectDoesNotExist:
+            return None
+
+    def is_snoozed(self, store_id):
+        try:
+            inventory = self.product_variants.inventories.get(store=store_id)
+        except ObjectDoesNotExist:
+            return False
+        return inventory.is_snoozed
+
 
 # TODO: must remove, redundunt
 class Attribute(DjangoModelCleanMixin, models.Model):

{ob_dj_store-0.0.21.1 → ob_dj_store-0.0.21.3}/ob_dj_store.egg-info/PKG-INFO

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