Merge pull request #7983 from readthedocs/humitos/donate-stripe-checkout

Author: humitos

media/css/core.css

@@ -104,7 +104,7 @@ form p label { font-weight: normal; }
 form p.required label { font-weight: bold; }
 textarea, input, button, .button, select { display: block; padding: 5px; color: #444; background-color: #fff; border: 1px solid #BFBFBF; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
 textarea, input, .button { box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5) inset; -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5) inset; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5) inset; }
-input[type="text"], input[type="password"] { width: 250px; height: 20px; margin-bottom: 5px; background: #fff; }
+input[type="text"], input[type="password"], input[type="email"] { width: 250px; height: 20px; margin-bottom: 5px; background: #fff; }
 input::-webkit-input-placeholder { color: #ccc; }
 input:-moz-placeholder { color: #ccc; opacity: 1; }
 input::-moz-placeholder { color: #ccc; opacity: 1; }

readthedocs/gold/static-src/gold/js/checkout.js

@@ -15,8 +15,7 @@ function StripeCheckoutView(config) {
                 // Avoid submitting the form
                 event.preventDefault();
 
-                var priceId = document.getElementById(self.levelId).value;
-                self.createCheckoutSession(priceId).then(function (result) {
+                self.createCheckoutSession().then(function (result) {
                     // Call Stripe.js method to redirect to the new Checkout page
                     result.json().then(function (data) {
                         self.stripe
@@ -28,15 +27,28 @@ function StripeCheckoutView(config) {
             });
     };
 
-    self.createCheckoutSession = function (priceId) {
+    self.createCheckoutSession = function () {
+        var priceId = document.getElementById(self.levelId).value;
+        // One-time donation fields
+        var name = document.getElementById('id_name');
+        var email = document.getElementById('id_email');
+        var logoUrl = document.getElementById('id_logo_url');
+        var siteUrl = document.getElementById('id_site_url');
+        var public = document.getElementById('id_public');
+
         return fetch(self.checkoutSessionUrl, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
                 "X-CSRFToken": self.csrfToken
             },
             body: JSON.stringify({
-                priceId: priceId
+                priceId: priceId,
+                name: name ? name.value : null,
+                email: email ? email.value : null,
+                logoUrl: logoUrl ? logUrl.value : null,
+                siteUrl: siteUrl ? siteUrl.value : null,
+                public: public ? public.checked : null,
             })
         });
     };

readthedocs/gold/static/gold/js/checkout.js

@@ -23,7 +23,8 @@ class GoldStripeWebhookTests(TestCase):
                 "client_reference_id": "golduser",
                 "customer": "cus_a1b2c3",
                 "customer_email": "[email protected]",
-                "subscription": "sub_a1b2c3"
+                "subscription": "sub_a1b2c3",
+                "mode": "subscription"
             }
         },
         "type": "checkout.session.completed"

readthedocs/gold/tests/test_webhooks.py

@@ -226,15 +226,34 @@ def post(self, request, format=None):
 
                 if event.type == self.EVENT_CHECKOUT_COMPLETED:
                     username = event.data.object.client_reference_id
-                    subscription = stripe.Subscription.retrieve(event.data.object.subscription)
-
-                    user = User.objects.get(username=username)
-                    GoldUser.objects.create(
-                        user=user,
-                        level=subscription.plan.id,
-                        stripe_id=stripe_customer,
-                        subscribed=True,
-                    )
+                    mode = event.data.object.mode
+                    if mode == 'subscription':
+                        # Gold Membership
+                        user = User.objects.get(username=username)
+                        subscription = stripe.Subscription.retrieve(event.data.object.subscription)
+                        GoldUser.objects.create(
+                            user=user,
+                            level=subscription.plan.id,
+                            stripe_id=stripe_customer,
+                            subscribed=True,
+                        )
+                    elif mode == 'payment':
+                        # One-time donation
+                        try:
+                            # TODO: find a better way to extend this view for one-time donations.
+                            from readthedocsext.donate.utils import handle_payment_webhook
+                            stripe_session = event.data.object.id
+                            price_in_cents = event.data.object.amount_total
+                            handle_payment_webhook(
+                                username,
+                                stripe_customer,
+                                stripe_session,
+                                price_in_cents,
+                            )
+                        except ImportError:
+                            log.warning(
+                                'Not able to import handle_payment_webhook for one-time donation.',
+                            )
                     # TODO: add user notification saying it was successful
 
                 elif event.type == self.EVENT_CHECKOUT_PAYMENT_FAILED:

readthedocs/gold/views.py

@@ -13,16 +13,3 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['stripe_publishable'] = settings.STRIPE_PUBLISHABLE
         return context
-
-    def get_form(self, data=None, files=None, **kwargs):
-        """
-        Pass in copy of POST data to avoid read only QueryDicts on form.
-
-        This is used to be able to reset some important credit card fields if
-        card validation fails. In this case, the Stripe token was valid, but the
-        card was rejected during the charge or subscription instantiation.
-        """
-        if self.request.method == 'POST':
-            data = self.request.POST.copy()
-        cls = self.get_form_class()
-        return cls(data=data, files=files, **kwargs)