Update payment intent descriptions

After successful payments ensure the payment intent description is
correct. This helps accounting procedures.

Fixes #8565

app/controllers/alaveteli_pro/stripe_webhooks_controller.rb

@@ -51,21 +51,20 @@ def customer_subscription_deleted
   end
 
   def invoice_payment_succeeded
-    charge_id = @stripe_event.data.object.charge
-
-    return unless charge_id
-
-    charge = Stripe::Charge.retrieve(charge_id)
-
     subscription_id = @stripe_event.data.object.subscription
     subscription = Stripe::Subscription.retrieve(
       id: subscription_id, expand: ['plan.product']
     )
     plan_name = subscription.plan.product.name
+    description = "#{pro_site_name}: #{plan_name}"
 
-    Stripe::Charge.update(
-      charge.id, description: "#{pro_site_name}: #{plan_name}"
-    )
+    charge_id = @stripe_event.data.object.charge
+    Stripe::Charge.update(charge_id, description: description) if charge_id
+
+    payment_intent_id = @stripe_event.data.object.payment_intent
+    Stripe::PaymentIntent.update(
+      payment_intent_id, description: description
+    ) if payment_intent_id
   end
 
   def invoice_payment_failed

spec/controllers/alaveteli_pro/stripe_webhooks_controller_spec.rb

@@ -40,14 +40,22 @@
             plan: { id: stripe_plan.id }
           }
         ],
-        subscription: stripe_subscription.id
+        subscription: stripe_subscription.id,
+        payment_intent: payment_intent.id
       )
     end
 
     let(:paid_invoice) { invoice.pay }
 
     let(:charge) { Stripe::Charge.retrieve(paid_invoice.charge) }
 
+    let(:payment_intent) do
+      Stripe::PaymentIntent.create(
+        amount: stripe_plan.amount,
+        currency: stripe_plan.currency
+      )
+    end
+
     let(:stripe_event) do
       StripeMock.mock_webhook_event(
         'customer.subscription.deleted', items: stripe_subscription.items
@@ -388,6 +396,7 @@ def send_request
             'invoice.payment_succeeded',
             lines: paid_invoice.lines,
             charge: paid_invoice.charge,
+            payment_intent: nil,
             subscription: stripe_subscription.id
           )
         end
@@ -398,10 +407,31 @@ def send_request
         end
       end
 
+      context 'when there is a payment intent for an invoice' do
+        let(:stripe_event) do
+          StripeMock.mock_webhook_event(
+            'invoice.payment_succeeded',
+            lines: paid_invoice.lines,
+            charge: nil,
+            payment_intent: paid_invoice.payment_intent,
+            subscription: stripe_subscription.id
+          )
+        end
+
+        it 'updates the payment intent description with the site and plan name' do
+          expect(Stripe::PaymentIntent.retrieve(payment_intent.id).description).
+            to eq('Alaveteli Professional: Test')
+        end
+      end
+
       context 'when there is no charge for an invoice' do
         let(:stripe_event) do
           StripeMock.mock_webhook_event(
-            'invoice.payment_succeeded', lines: paid_invoice.lines, charge: nil
+            'invoice.payment_succeeded',
+            lines: paid_invoice.lines,
+            charge: nil,
+            payment_intent: nil,
+            subscription: stripe_subscription.id
           )
         end
 

spec/fixtures/stripe_webhooks/invoice.payment_succeeded.json

@@ -95,6 +95,7 @@
       "livemode": false,
       "metadata": {},
       "next_payment_attempt": null,
+      "payment_intent": null,
       "paid": true,
       "period_end": 1464084258,
       "period_start": 1464084258,