[PR #5518] [MERGED] feat: plan+billing #6859

New issue

Closed

opened 2026-03-23 23:16:59 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:16:59 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/5518
Author: @Xazin
Created: 6/11/2024
Status: ✅ Merged
Merged: 6/12/2024
Merged by: @Xazin

Base: main ← Head: feat/billing-client

📝 Commits (10+)

4b00f9f feat: billing client
327474b feat: subscribe workspace default impl
5144517 feat: added create subscription
6fde759 chore: merge with main
4cf326e feat: add get workspace subs
6b65fc3 feat: added subscription cancellation
e6bf4dd chore: merge with main
ee9fed5 chore: merge with main
eae75b8 feat: add workspace limits api
2f9bc26 fix: update client api

📊 Changes

52 files changed (+2768 additions, -82 deletions)

View changed files

📝 .github/workflows/rust_ci.yaml (+8 -8)
📝 frontend/appflowy_flutter/lib/core/helpers/url_launcher.dart (+3 -2)
📝 frontend/appflowy_flutter/lib/shared/feature_flags.dart (+6 -0)
📝 frontend/appflowy_flutter/lib/startup/deps_resolver.dart (+4 -0)
📝 frontend/appflowy_flutter/lib/startup/tasks/appflowy_cloud_task.dart (+11 -1)
📝 frontend/appflowy_flutter/lib/user/application/user_service.dart (+28 -3)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/billing/settings_billing_bloc.dart (+112 -0)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/plan/settings_plan_bloc.dart (+174 -0)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/plan/workspace_subscription_ext.dart (+16 -0)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/plan/workspace_usage_ext.dart (+8 -0)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart (+2 -2)
➕ frontend/appflowy_flutter/lib/workspace/application/subscription_success_listenable/subscription_success_listenable.dart (+7 -0)
📝 frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart (+10 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart (+5 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dart (+2 -2)
➕ frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_billing_view.dart (+138 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_manage_data_view.dart (+5 -2)
➕ frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart (+594 -0)
➕ frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart (+732 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart (+9 -3)

...and 32 more files

📄 Description

Feature Preview

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/5518 **Author:** [@Xazin](https://github.com/Xazin) **Created:** 6/11/2024 **Status:** ✅ Merged **Merged:** 6/12/2024 **Merged by:** [@Xazin](https://github.com/Xazin) **Base:** `main` ← **Head:** `feat/billing-client` --- ### 📝 Commits (10+) - [`4b00f9f`](https://github.com/AppFlowy-IO/AppFlowy/commit/4b00f9f29817493887f439c63dba2875a2755f52) feat: billing client - [`327474b`](https://github.com/AppFlowy-IO/AppFlowy/commit/327474bb31a886cf73aaf766e194cd459cc58f8e) feat: subscribe workspace default impl - [`5144517`](https://github.com/AppFlowy-IO/AppFlowy/commit/5144517330d705b9c1962b2c647d413fc1753e2b) feat: added create subscription - [`6fde759`](https://github.com/AppFlowy-IO/AppFlowy/commit/6fde759061d21e5bb39043f101c36652d4a35bb3) chore: merge with main - [`4cf326e`](https://github.com/AppFlowy-IO/AppFlowy/commit/4cf326e98f3982ec52ff6c73017b4958ec2d9b43) feat: add get workspace subs - [`6b65fc3`](https://github.com/AppFlowy-IO/AppFlowy/commit/6b65fc32290ef88d977bf90c332f8ede3c2fdb5c) feat: added subscription cancellation - [`e6bf4dd`](https://github.com/AppFlowy-IO/AppFlowy/commit/e6bf4ddcd5398c4fabaf5f0d302a2262a2d81c7b) chore: merge with main - [`ee9fed5`](https://github.com/AppFlowy-IO/AppFlowy/commit/ee9fed5b09031ed0b31009d88b034ab29d1c0fa5) chore: merge with main - [`eae75b8`](https://github.com/AppFlowy-IO/AppFlowy/commit/eae75b8b7a74ba46f7ee9f265919a30e31450100) feat: add workspace limits api - [`2f9bc26`](https://github.com/AppFlowy-IO/AppFlowy/commit/2f9bc267e29ba20b1db461e3a9ccbf7f4efe98c8) fix: update client api ### 📊 Changes **52 files changed** (+2768 additions, -82 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/rust_ci.yaml` (+8 -8) 📝 `frontend/appflowy_flutter/lib/core/helpers/url_launcher.dart` (+3 -2) 📝 `frontend/appflowy_flutter/lib/shared/feature_flags.dart` (+6 -0) 📝 `frontend/appflowy_flutter/lib/startup/deps_resolver.dart` (+4 -0) 📝 `frontend/appflowy_flutter/lib/startup/tasks/appflowy_cloud_task.dart` (+11 -1) 📝 `frontend/appflowy_flutter/lib/user/application/user_service.dart` (+28 -3) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/billing/settings_billing_bloc.dart` (+112 -0) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/plan/settings_plan_bloc.dart` (+174 -0) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/plan/workspace_subscription_ext.dart` (+16 -0) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/plan/workspace_usage_ext.dart` (+8 -0) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart` (+2 -2) ➕ `frontend/appflowy_flutter/lib/workspace/application/subscription_success_listenable/subscription_success_listenable.dart` (+7 -0) 📝 `frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart` (+10 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart` (+5 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dart` (+2 -2) ➕ `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_billing_view.dart` (+138 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_manage_data_view.dart` (+5 -2) ➕ `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart` (+594 -0) ➕ `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart` (+732 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart` (+9 -3) _...and 32 more files_ </details> ### 📄 Description ### Feature Preview #### PR Checklist - [ ] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>