ob-dj-store 0.0.15.9__tar.gz → 0.0.15.11__tar.gz

{ob-dj-store-0.0.15.9 → ob-dj-store-0.0.15.11}/PKG-INFO

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

{ob-dj-store-0.0.15.9 → ob-dj-store-0.0.15.11}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -1383,23 +1383,31 @@ class WalletSerializer(serializers.ModelSerializer):
 
 class WalletTopUpSerializer(serializers.Serializer):
     amount = serializers.DecimalField(
-        max_digits=10, decimal_places=2, min_value=1, required=True
+        max_digits=10, decimal_places=2, min_value=1, required=True, write_only=True
     )
     payment_method = serializers.PrimaryKeyRelatedField(
+        write_only=True,
         queryset=PaymentMethod.objects.filter(
             payment_provider__in=[
                 store_settings.TAP_CREDIT_CARD,
                 store_settings.TAP_KNET,
                 store_settings.TAP_ALL,
+                store_settings.APPLE_PAY,
             ]
         ),
         required=True,
     )
+    extra_infos = serializers.JSONField(required=False, write_only=True)
+    payment_url = serializers.CharField(read_only=True)
+    charge_id = serializers.CharField(read_only=True)
 
     def top_up_wallet(self, wallet):
         amount = self.validated_data["amount"]
         payment_method = self.validated_data["payment_method"]
-        return wallet.top_up_wallet(amount=amount, payment_method=payment_method)
+        extra_infos = self.validated_data.get("extra_infos", {})
+        return wallet.top_up_wallet(
+            amount=amount, payment_method=payment_method, extra_infos=extra_infos
+        )
 
 
 class WalletTransactionSerializer(serializers.ModelSerializer):

{ob-dj-store-0.0.15.9 → ob-dj-store-0.0.15.11}/ob_dj_store/apis/stores/views.py

@@ -1194,10 +1194,13 @@ class WalletViewSet(
         serializer.is_valid(raise_exception=True)
         instance = self.get_object()
         try:
-            payment_url = serializer.top_up_wallet(instance)
+            payment_url, charge_id = serializer.top_up_wallet(instance)
         except TapException as err:
             raise ValidationError({"tap": _(f"{str(err)}")})
-        return Response({"payment_url": payment_url}, status=status.HTTP_200_OK)
+        return Response(
+            {"payment_url": payment_url, "charge_id": charge_id},
+            status=status.HTTP_200_OK,
+        )
 
     @swagger_auto_schema(
         operation_summary="List Wallet's transactions",

{ob-dj-store-0.0.15.9 → ob-dj-store-0.0.15.11}/ob_dj_store/core/stores/models/_wallet.py

@@ -103,18 +103,23 @@ class Wallet(models.Model):
             image = self.media_image.image_thumbnail_medium
             return image.url if image else None
 
-    def top_up_wallet(self, amount: Decimal, payment_method: PaymentMethod):
+    def top_up_wallet(
+        self, amount: Decimal, payment_method: PaymentMethod, extra_infos: dict = {}
+    ):
         from ob_dj_store.core.stores.models import Order, Payment
 
+        extra_infos.update(
+            {
+                "is_wallet_fill_up": True,
+                "amount": str(amount),
+                "currency": self.currency,
+            }
+        )
         user = self.user
         order = Order.objects.create(
             customer=user,
             payment_method=payment_method,
-            extra_infos={
-                "is_wallet_fill_up": True,
-                "amount": str(amount),
-                "currency": self.currency,
-            },
+            extra_infos=extra_infos,
         )
         payment = Payment.objects.create(
             orders=[
@@ -125,7 +130,8 @@ class Wallet(models.Model):
             method=payment_method,
             amount=amount,
         )
-        return payment.payment_url
+        tap_payment = payment.tap_payment
+        return (tap_payment.payment_url, tap_payment.charge_id)
 
 
 class WalletTransaction(models.Model):

{ob-dj-store-0.0.15.9 → ob-dj-store-0.0.15.11}/ob_dj_store.egg-info/PKG-INFO

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