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

Bugfix/4422 your plan show only on annual or monthly #4437

Merged
merged 12 commits into from
May 22, 2023
Merged

Bugfix/4422 your plan show only on annual or monthly #4437

merged 12 commits into from
May 22, 2023

Commits on May 9, 2023

  1. Banner only appears on correct filtered option or yearly with communi… 

    …ty plan
    @srartese
    srartese committed May 9, 2023
    Configuration menu
    Copy the full SHA
    7e1005c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix/4411-flashing-plan-banner' of github.com:kobotoo… 

    …lbox/kpi into bugfix/4422-your-plan-show-only-on-annual-or-monthly
    @srartese
    srartese committed May 9, 2023
    Configuration menu
    Copy the full SHA
    027b05b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/billing' of github.com:kobotoolbox/kpi into bug… 

    …fix/4422-your-plan-show-only-on-annual-or-monthly
    @srartese
    srartese committed May 9, 2023
    Configuration menu
    Copy the full SHA
    2bcf0ab View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge branch 'feature/billing' into bugfix/4422-your-plan-show-only-o… 

    …n-annual-or-monthly
    @srartese
    srartese committed May 10, 2023
    Configuration menu
    Copy the full SHA
    edae192 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Updated page to load on the subscribed filter if applicable and show … 

    …'Change plan' button as option for opposite subscribed plan option
    @srartese
    srartese committed May 12, 2023
    Configuration menu
    Copy the full SHA
    dfccea0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/billing' of github.com:kobotoolbox/kpi into bug… 

    …fix/4422-your-plan-show-only-on-annual-or-monthly

# Conflicts:
#	jsapp/js/account/plan.component.tsx
    @srartese
    srartese committed May 12, 2023
    Configuration menu
    Copy the full SHA
    ac10c6c View commit details
    Browse the repository at this point in the history

  3. Updated logic to add 'change plan' button and work with other updates

    @srartese
    srartese committed May 12, 2023
    Configuration menu
    Copy the full SHA
    9e55483 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. add recurring price intervals to Product endpoint

    @LMNTL
    LMNTL committed May 15, 2023
    Configuration menu
    Copy the full SHA
    0a4685f View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. make /subscriptions/ endpoint return recurring intervals

    @LMNTL
    LMNTL committed May 17, 2023
    Configuration menu
    Copy the full SHA
    cd336aa View commit details
    Browse the repository at this point in the history

  2. Updated useMemo and using new interval data

    @srartese
    srartese committed May 17, 2023
    Configuration menu
    Copy the full SHA
    19a90f5 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. added back in hasActiveSubscription

    @srartese
    srartese committed May 18, 2023
    Configuration menu
    Copy the full SHA
    05b5aa8 View commit details
    Browse the repository at this point in the history

  2. Fixed banner not showing properly on canceled plans

    @srartese
    srartese committed May 18, 2023
    Configuration menu
    Copy the full SHA
    95607a6 View commit details
    Browse the repository at this point in the history