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.

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

Disable free team credit if team trials is enabled #1683

Merged
merged 1 commit into from
Feb 10, 2023
Merged

Conversation

knolleary
Copy link
Member

Description

We enabled free team credit in 1.3 as a first iteration to trials.

In 1.4 we are introducing proper team trials.

We do not want to apply both free credit and team trial to the same account. This PR disables free team credit if team trials is enabled.

It also renames a couple of the internal helper functions to clarify they are related to the free credit rather than team trial.

Related Issue(s)

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on flowforge/helm to update ConfigMap Template
    • Issue/PR raised on flowforge/CloudProject to update values for Staging/Production

Labels

  • Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

@knolleary knolleary marked this pull request as ready for review February 8, 2023 17:10
@knolleary knolleary requested a review from Pezmc February 8, 2023 17:12
@Steve-Mcl Steve-Mcl merged commit 80ca636 into main Feb 10, 2023
@Steve-Mcl Steve-Mcl deleted the trials-vs-credit branch February 10, 2023 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants