ob-dj-store 0.0.15.9__py3-none-any.whl → 0.0.15.11__py3-none-any.whl

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

@@ -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.dist-info → ob_dj_store-0.0.15.11.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=XEdKExJGKPGszKUxS5_LtyrAyGv3VyI-z8X5K6c5sxQ,8681
 ob_dj_store/apis/stores/urls.py,sha256=P4d0iamg2R5lTwc5DTIuhLzJTMSH4f5QpHzGR1_PWE0,1676
-ob_dj_store/apis/stores/views.py,sha256=idoLhqmsIrM4k_0T-TcHSuLFs6ZxzHmzZ6bJ5QUPx2g,38090
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=RoGIHyPQ6eY5q6nMYGDHmBk7oTlnHzok25NRKoAwtn8,50284
+ob_dj_store/apis/stores/views.py,sha256=v-WZCpvY3Y9N3rmC6bG3R2NrhikFUDLey5KzaShwgs4,38160
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=Ci4sVCaI56oOcT-e2thBc8EiOL_NB-ok2vMkzVvq-d0,50663
 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
@@ -129,12 +129,12 @@ ob_dj_store/core/stores/models/_order.py,sha256=VHBp3LMveedHNbS7vxP7PE_H_g9t8qgs
 ob_dj_store/core/stores/models/_payment.py,sha256=mz54fuxmcNQ1pVBC959f7gnbIld1haxIYK0Xuv6UVoM,6320
 ob_dj_store/core/stores/models/_product.py,sha256=jWbhk-oXngLdHqBTnHNokzN_MhcBArsD1R7UjOnfAzY,15287
 ob_dj_store/core/stores/models/_store.py,sha256=NnyXG7_L_UYrNKaQYuHOBEWc6DQqAPd1OZJg0xOccKk,8005
-ob_dj_store/core/stores/models/_wallet.py,sha256=TMS9lFHp90wnfhssfPJabnGJVIbaua0ufigcqPDmYGY,5156
+ob_dj_store/core/stores/models/_wallet.py,sha256=8wi-H0HMFOdDPc1LbKkQBMGAymiLvBWq2djnN_BicRI,5327
 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.15.9.dist-info/METADATA,sha256=UNyiL9iZUoIS--qrWQiw5l2JTtKyfpbaf7ijL8mvcJc,2827
-ob_dj_store-0.0.15.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-ob_dj_store-0.0.15.9.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.15.9.dist-info/RECORD,,
+ob_dj_store-0.0.15.11.dist-info/METADATA,sha256=YtVs5vlD_R72FW4Xq4IAQzLxVUFrN9iF6N8O9NZtEUM,2828
+ob_dj_store-0.0.15.11.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+ob_dj_store-0.0.15.11.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.15.11.dist-info/RECORD,,