Skip to content

Commit 166cf9f

Browse files
committed
Fix billing UI: hide Cancel Subscription for incomplete, show PayPal without email
1 parent 83a723b commit 166cf9f

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

cloud/src/LrmCloud.Api/Services/Billing/Models/PaymentMethodInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public sealed class PaymentMethodInfo
6161
public string DisplayString => Type switch
6262
{
6363
PaymentMethodType.Card => $"{CardBrand?.ToUpperInvariant() ?? "Card"} •••• {CardLast4}",
64-
PaymentMethodType.PayPal => $"PayPal ({PayPalEmail})",
64+
PaymentMethodType.PayPal => "PayPal",
6565
PaymentMethodType.BankAccount => $"{BankName ?? "Bank"} •••• {BankLast4}",
6666
_ => "Unknown payment method"
6767
};

cloud/src/LrmCloud.Web/Pages/Settings/Billing.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ else
9999
{
100100
<RadzenButton Variant="Radzen.Variant.Text" ButtonStyle="ButtonStyle.Success" Icon="refresh" Text="Reactivate Subscription" Click="@ReactivateSubscription" class="rz-mt-2" />
101101
}
102-
else if (!_subscription.CancelAtPeriodEnd && !string.IsNullOrEmpty(_subscription.PaymentSubscriptionId))
102+
else if (!_subscription.CancelAtPeriodEnd && !string.IsNullOrEmpty(_subscription.PaymentSubscriptionId) && _subscription.Status?.ToLower() != "incomplete")
103103
{
104+
@* Hide Cancel Subscription when incomplete - PaymentSubscriptionId points to pending upgrade, not current subscription *@
104105
<RadzenButton Variant="Radzen.Variant.Text" ButtonStyle="ButtonStyle.Danger" Icon="cancel" Text="Cancel Subscription" Click="@ShowCancelDialog" class="rz-mt-2" />
105106
}
106107
}

0 commit comments

Comments
 (0)