Merge pull request #86 from Ilhasoft/fix/remove_card_setup

fix: remove card setup

connect/api/v1/organization/views.py

@@ -124,12 +124,13 @@ def remove_card_setup(
 
         self.check_object_permissions(self.request, organization)
 
-        organization.organization_billing.remove_credit_card()
+        if organization.organization_billing.remove_credit_card:
 
-        organization.is_suspended = True
-        organization.save(update_fields=["is_suspended"])
+            organization.is_suspended = True
+            organization.save(update_fields=["is_suspended"])
 
-        return JsonResponse(data={"status": True}, status=status.HTTP_200_OK)
+            return JsonResponse(data={"status": True}, status=status.HTTP_200_OK)
+        return JsonResponse(data={"status": False}, status=status.HTTP_304_NOT_MODIFIED)
 
     @action(
         detail=True,

connect/billing/gateways/stripe_gateway.py

@@ -45,13 +45,13 @@ def purchase(self, money: float, identification, options: dict = None):
 
     def unstore(self, identification, options: dict = None):
         response = []
+
         existing_cards = stripe.PaymentMethod.list(
             customer=identification,
             type="card",
         )
-
         for card in existing_cards.get("data"):
-            if options.get("card_id") and str(card["id"]) == str(
+            if options and options.get("card_id") and str(card["id"]) == str(
                 options.get("card_id")
             ):
                 continue

connect/common/models.py

@@ -613,7 +613,10 @@ def payment_warnings(self):
     @property
     def remove_credit_card(self):
         gateway = billing.get_gateway("stripe")
-        return gateway.unstore(identification=self.stripe_customer)
+        unstore = gateway.unstore(identification=self.stripe_customer)
+        if unstore['status'] == 'SUCCESS':
+            return True
+        return False
 
     @staticmethod
     def calculate_amount(contact_count: int):