ob-dj-store 0.0.22.5__tar.gz → 0.0.22.6__tar.gz

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/PKG-INFO

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

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/apis/stores/filters.py

@@ -19,6 +19,7 @@ from ob_dj_store.core.stores.models import (
     Product,
     ProductVariant,
     Store,
+    Tip,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory
 from ob_dj_store.core.stores.models._wallet import Wallet
@@ -322,3 +323,17 @@ class CountryPaymentMethodFilter(filters.FilterSet):
     def by_country(self, queryset, name, value):
         if value:
             return queryset.filter(country=value)
+
+
+class TipFilter(filters.FilterSet):
+
+    country = filters.CharFilter(method="by_country")
+
+    class Meta:
+        model = Tip
+        fields = []
+
+    def by_country(self, queryset, name, value):
+        if value:
+            queryset = queryset.filter(country=value)
+        return queryset

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -52,6 +52,8 @@ from ob_dj_store.core.stores.models import (
     ShippingMethod,
     Store,
     Tax,
+    Tip,
+    TipAmount,
     Wallet,
     WalletMedia,
     WalletTransaction,
@@ -1996,3 +1998,34 @@ class CountryPaymentMethodSerialzier(serializers.ModelSerializer):
             instance=qs, context=self.context, many=True
         ).data
         return data
+
+
+class TipSerializer(serializers.ModelSerializer):
+    tip_amounts = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Tip
+        fields = (
+            "id",
+            "name",
+            "description",
+            "is_applied",
+            "country",
+            "is_active",
+            "tip_amounts",
+        )
+
+    def get_tip_amounts(self, obj):
+        from .serializers import TipAmountSerializer  # avoid circular import
+
+        tip_amounts = obj.tip_amounts.all()
+        return TipAmountSerializer(tip_amounts, many=True).data
+
+
+class TipAmountSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = TipAmount
+        fields = (
+            "id",
+            "percentage",
+        )

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/apis/stores/urls.py

@@ -18,6 +18,7 @@ from ob_dj_store.apis.stores.views import (
     ShippingMethodViewSet,
     StoreView,
     TaxViewSet,
+    TipsViewSet,
     TransactionsViewSet,
     VariantView,
     WalletV2ViewSet,
@@ -54,6 +55,9 @@ router.register(
     CountryPaymentMethodsViewSet,
     basename="country-payment-methods",
 )
+router.register(
+    r"tip", TipsViewSet, basename="tip",
+)
 
 urlpatterns = [
     path(r"", include(router.urls)),

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/apis/stores/views.py

@@ -32,6 +32,7 @@ from ob_dj_store.apis.stores.filters import (
     PaymentMethodFilter,
     ProductFilter,
     StoreFilter,
+    TipFilter,
     VariantFilter,
     WalletFilter,
 )
@@ -58,6 +59,7 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     ShippingMethodSerializer,
     StoreSerializer,
     TaxSerializer,
+    TipSerializer,
     WalletMediaSerializer,
     WalletSerializer,
     WalletTopUpSerializer,
@@ -85,6 +87,7 @@ from ob_dj_store.core.stores.models import (
     ShippingMethod,
     Store,
     Tax,
+    Tip,
     Wallet,
     WalletMedia,
 )
@@ -1327,3 +1330,30 @@ class CountryPaymentMethodsViewSet(
     )
     def retrieve(self, request, *args, **kwargs):
         return super().retrieve(request, *args, **kwargs)
+
+
+class TipsViewSet(
+    mixins.ListModelMixin, viewsets.GenericViewSet,
+):
+    queryset = Tip.objects.active()
+    serializer_class = TipSerializer
+    filterset_class = TipFilter
+    filter_backends = [DjangoFilterBackend]
+    permission_classes = [
+        permissions.IsAuthenticated,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(super().get_queryset())
+
+    @swagger_auto_schema(
+        operation_summary="list al tips",
+        operation_description="""
+                list all tips
+            """,
+        tags=["Tip",],
+    )
+    def list(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        return super().list(request=request, *args, **kwargs)

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/core/stores/managers.py

@@ -291,3 +291,7 @@ class PartnerAuthInfoManager(models.Manager):
 
 class CountryPaymentMethodManager(ActiveMixin, models.Manager):
     pass
+
+
+class TipManager(ActiveMixin, models.Manager):
+    pass

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store/core/stores/models/_order.py

@@ -7,7 +7,7 @@ from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 
-from ob_dj_store.core.stores.managers import OrderItemManager, OrderManager
+from ob_dj_store.core.stores.managers import OrderItemManager, OrderManager, TipManager
 from ob_dj_store.utils.model import DjangoModelCleanMixin
 
 
@@ -148,6 +148,8 @@ class Order(DjangoModelCleanMixin, models.Model):
         )
         if self.shipping_method:
             amount += self.shipping_method.shipping_fee
+        if self.tip_value:
+            amount += self.tip_value
         amount -= self.get_discount_amount
         return amount
 
@@ -331,6 +333,8 @@ class Tip(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    objects = TipManager()
+
     class Meta:
         verbose_name = _("Tip")
         verbose_name_plural = _("Tips")

{ob_dj_store-0.0.22.5 → ob_dj_store-0.0.22.6}/ob_dj_store.egg-info/PKG-INFO

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