ob-dj-store 0.0.12.7__py3-none-any.whl → 0.0.12.9__py3-none-any.whl

ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -845,9 +845,11 @@ class StoreSerializer(FavoriteMixin, serializers.ModelSerializer):
 
     def get_in_range_delivery(self, obj):
         user_location = self.context["request"].query_params.get("point")
-        in_range_method = obj.shipping_methods.filter(
-            type=ShippingMethod.ShippingType.DELIVERY
-        ).exists()
+        in_range_method = False
+        for shipping_method in obj.shipping_methods.all():
+            if shipping_method.type == ShippingMethod.ShippingType.DELIVERY:
+                in_range_method = True
+                break
         if not in_range_method:
             return True
         if user_location and obj.poly:
@@ -900,9 +902,7 @@ class StoreSerializer(FavoriteMixin, serializers.ModelSerializer):
             return f"{ds}{unit}"
 
     def get_phone_contacts(self, obj):
-        phone_contacts = obj.phone_contacts.filter(is_active=True).order_by(
-            "-is_default"
-        )
+        phone_contacts = obj.phone_contacts.all()
         return PhoneContactSerializer(phone_contacts, many=True).data
 
     def get_current_day_opening_hours(self, obj):

ob_dj_store/apis/stores/views.py

@@ -63,6 +63,7 @@ from ob_dj_store.core.stores.models import (
     Order,
     Payment,
     PaymentMethod,
+    PhoneContact,
     Product,
     ProductVariant,
     ShippingMethod,
@@ -100,8 +101,20 @@ class StoreView(
         return super(StoreView, self).get_permissions()
 
     def get_queryset(self):
-        queryset = super().get_queryset()
-        queryset = queryset.prefetch_related("opening_hours", "shipping_methods")
+        queryset = (
+            super()
+            .get_queryset()
+            .prefetch_related(
+                "shipping_methods",
+                "opening_hours",
+                Prefetch(
+                    "phone_contacts",
+                    queryset=PhoneContact.objects.filter(is_active=True).order_by(
+                        "-is_default"
+                    ),
+                ),
+            )
+        )
         if self.action == "favorites":
             favorite_store_ids = Favorite.objects.favorites_for_model(
                 Store, self.request.user
@@ -261,6 +274,7 @@ class StoreView(
                     "DELIVERED",
                 ],
             )
+            .distinct()
             .count()
         )
         nearby_count = super().get_queryset().count()
@@ -572,7 +586,7 @@ class ProductView(
                     inventories__store__pk=self.kwargs["store_pk"]
                 ).distinct(),
             ),
-        )
+        ).distinct()
 
     def get_queryset(self):
         queryset = super().get_queryset()
@@ -583,7 +597,7 @@ class ProductView(
 
             queryset = self.queryset.filter(pk__in=favorite_product_ids)
         queryset = self.apply_prefetch(queryset)
-        return queryset.distinct()
+        return queryset
 
     def get_object(self):
         queryset = super().get_queryset()
@@ -1104,7 +1118,7 @@ class WalletViewSet(
     def transactions(
         self, request: Request, *args: typing.Any, **kwargs: typing.Any
     ) -> Response:
-        queryset = self.get_object().transactions.all()
+        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)

{ob_dj_store-0.0.12.7.dist-info → ob_dj_store-0.0.12.9.dist-info}/METADATA

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

{ob_dj_store-0.0.12.7.dist-info → ob_dj_store-0.0.12.9.dist-info}/RECORD

@@ -2,8 +2,8 @@ ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/filters.py,sha256=PZiES6wknvHAVnrNcsU8gc4S_z3IE9hYttUbiwT0Ogg,6089
 ob_dj_store/apis/stores/urls.py,sha256=P4d0iamg2R5lTwc5DTIuhLzJTMSH4f5QpHzGR1_PWE0,1676
-ob_dj_store/apis/stores/views.py,sha256=l3c31h5-0TXZUg0kalH8SkNbSUJyM49bb-TmnuF4btw,33842
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=Csc7WcnSvEr3aCY8VD3gozpY_-kvS1FRbDt8m0fKKDk,42831
+ob_dj_store/apis/stores/views.py,sha256=RX540Bz4V3cT01Tu9Waxo9UvreDhElYg8aoJtQ0rAVY,34204
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=TpOx-chOtbN6FWwVzkMpfDhUFYW_iL3xyZ-FAija10U,42869
 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
@@ -116,7 +116,7 @@ ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ob_dj_store/utils/helpers.py,sha256=FtXXJOD2PILqZTyuf80bmf0KuWW64hxbJG6naJdxI5w,1607
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
 ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
-ob_dj_store-0.0.12.7.dist-info/METADATA,sha256=5gNi4kn_lwcYSZZTQ0xyGXgq2xw2WUZB23qVMZLwnAk,2827
-ob_dj_store-0.0.12.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ob_dj_store-0.0.12.7.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.12.7.dist-info/RECORD,,
+ob_dj_store-0.0.12.9.dist-info/METADATA,sha256=jMqketjE_fB6jZei-ESpv2iChAvvWBOAOX_PdHuPt_k,2827
+ob_dj_store-0.0.12.9.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ob_dj_store-0.0.12.9.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.12.9.dist-info/RECORD,,