Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CYCLE 14] | BFSY-199 | nn-bfsy-199 #2742

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[CYCLE 14] | BFSY-199 | nn-bfsy-199 #2742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609cd9c
BFSY-199 | 4) Show BUY ADDON only when plan is active | solved
Amigo96 Nov 10, 2022
34dd708
BFSY-199| concurrent plan and status incomplete | fixed
Amigo96 Nov 10, 2022
b9740e5
BFSY-199| 3) Credit plan cancelled | fixed
Amigo96 Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/templates/components/billing/authorization.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<span class="notice-banner--yellow" data-test-trial-running-out='true'>
We are currently waiting for Stripe to finish processing your order.
</span>
{{else if (and this.isComplete (or this.subscription.isStripe this.subscription.isManual))}}
{{else if (or this.subscription.isStripe this.subscription.isManual)}}
{{#if (or this.showPlansSelector this.showAddonsSelector)}}
{{#if (not this.isV2Subscription)}}
<Billing::Process
Expand Down Expand Up @@ -86,7 +86,7 @@
/>
</div>
<div class='billing-subscription__buttons--addons'>
{{#if (and this.isV2Subscription this.canBuyAddons)}}
{{#if (and this.isV2Subscription this.canBuyAddons this.subscription.isSubscribed)}}
<button {{on 'click' (fn (mut this.showAddonsSelector) true)}} class='button--white-and-teal button--hover' data-test-buy-addons='true'>
Buy addons
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/billing/summary-v2.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
Unknown plan
{{/if}}

{{#if (eq this.subscription.plan.planType 'hybrid')}}
{{#if this.subscription.plan.planType}}
{{#if this.subscription.isSubscribed}}
<span class="badge green square" data-test-active-status='true'>
active
Expand Down