Merge remote-tracking branch 'origin/main' into issue/NEST-537

src/Modules/OrchardCore.Commerce.Payment.Stripe/Handlers/SubscriptionStripeWebhookEventHandler.cs

@@ -54,7 +54,12 @@ public async Task ReceivedStripeEventAsync(Event stripeEvent)
                 var subscriptionPart = new SubscriptionPart();
                 subscriptionPart.UserId.Text = user.UserId;
                 subscriptionPart.Status.Text = SubscriptionStatuses.Active;
-                subscriptionPart.EndDateUtc.Value = invoice.PeriodEnd;
+
+                // invoice.PeriodEnd doesn't show the current period, see Stripe docs:
+                // https://docs.stripe.com/api/invoices/object#invoice_object-period_end
+                // "End of the usage period during which invoice items were added to this invoice. This looks back one
+                // period for a subscription invoice. Use the line item period to get the service period for each price."
+                subscriptionPart.EndDateUtc.Value = invoice.Lines.Data.Find(data => !data.Proration)?.Period.End;
                 subscriptionPart.PaymentProviderName.Text = StripePaymentProvider.ProviderName;
                 subscriptionPart.IdInPaymentProvider.Text = invoice.SubscriptionId;