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

Add invoice proration option to TeamType (backport #2758) #2760

Merged
merged 4 commits into from
Sep 14, 2023

Conversation

github-actions[bot]
Copy link

Backport of #2758


Fixes #2746

Description

This adds a new option to the TeamType to set the invoice proration behaviour.

<img width="381" alt="image" src="https://github.com/flowforge/flowforge/assets/51083/91aa1973-fab9-4671-b359-643ece87ac1c\">

The default option is the existing behaviour - triggering an invoice with every change made.

The new option, 'Add proration items to monthly invoice', will mean the team invoice is still set monthly, but will list all of the changes made through the month and the protated charges.

This also addresses an issue where deleting an Instance would not remove it properly from billing.
The unit tests have been updated to match how the relevant parts of the code are called to ensure they properly match the real behaviour - specifically, not deleting the Project database object before calling billing.removeProject.

Checklist

@knolleary knolleary merged commit 843e454 into maintenance Sep 14, 2023
@knolleary knolleary deleted the backport-2758 branch September 14, 2023 16:02
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.

1 participant