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

Show correct UI on plans page when there are inactive/multiple plans #4400

Merged
merged 25 commits into from
Apr 11, 2023
Merged

Show correct UI on plans page when there are inactive/multiple plans #4400

merged 25 commits into from
Apr 11, 2023

Commits on Apr 4, 2023

  1. display plans properly if existing subscription is not in active status

    @LMNTL
    LMNTL committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    4f802b5 View commit details
    Browse the repository at this point in the history

  2. memoize filterPrices

    @LMNTL
    LMNTL committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    1ce0a28 View commit details
    Browse the repository at this point in the history

  3. fix stray hardcoded reference to plan name

    @LMNTL
    LMNTL committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    406b2fd View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Merge branch 'feature/add-subscription-tiers' into feature/billing-st… 

    …ripe-statuses
    @LMNTL
    LMNTL committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    665cb4b View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Merge branch 'feature/add-subscription-tiers' of github.com:kobotoolb… 

    …ox/kpi into feature/billing-stripe-statuses

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

  2. clean up handling of button disabled state

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    9564b86 View commit details
    Browse the repository at this point in the history

  3. use toasts instead of alert()

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    f96fcb6 View commit details
    Browse the repository at this point in the history

  4. remove unnecessary/misleading null check

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    26ea732 View commit details
    Browse the repository at this point in the history

  5. sort Products by lowest price (ascending)

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    7856980 View commit details
    Browse the repository at this point in the history

  6. clarify unit_amount comment

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    deab387 View commit details
    Browse the repository at this point in the history

  7. updated viewset description

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    7ee6293 View commit details
    Browse the repository at this point in the history

  8. fix Upgrade not becoming uninteractable, make buttons only 

     re-enable on error
    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    54a1200 View commit details
    Browse the repository at this point in the history

  9. attempt to resolve browser state issues, fix typo

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    199f6f9 View commit details
    Browse the repository at this point in the history

  10. update useEffect dependencies

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    e18c6e8 View commit details
    Browse the repository at this point in the history

  11. remove useLocation and try pageshow event

    @LMNTL
    LMNTL committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ee88038 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. re-fetch API data on back/forward

    @LMNTL
    LMNTL committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d69caf1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/add-subscription-tiers' into feature/billing-st… 

    …ripe-statuses
    @LMNTL
    LMNTL committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ac0963e View commit details
    Browse the repository at this point in the history

  3. fix typo

    @LMNTL
    LMNTL committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    03b7097 View commit details
    Browse the repository at this point in the history

  4. update comment

    @LMNTL
    LMNTL committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    985f84e View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. change submission total based on annual/monthly filter

    @LMNTL
    LMNTL committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    83a167f View commit details
    Browse the repository at this point in the history

  2. remove payment_method_types so Stripe relies on the payment method se… 

    …ttings in dashboard
    @LMNTL
    LMNTL committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    4abdba5 View commit details
    Browse the repository at this point in the history

  3. set the customer name, organization name in stripe

    @LMNTL
    LMNTL committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    065c7c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. merge in feature/add-subscription-tiers

    @LMNTL
    LMNTL committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    a10bda1 View commit details
    Browse the repository at this point in the history

  2. merge in feature/add-subscription-tiers

    @LMNTL
    LMNTL committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    c192f8b View commit details
    Browse the repository at this point in the history

  3. fix some linting errors

    @LMNTL
    LMNTL committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    7916fed View commit details
    Browse the repository at this point in the history