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

fix: redirect to FC dashboard when login to FC #1351

Merged
merged 4 commits into from
Mar 3, 2025

Conversation

pateljannat
Copy link
Collaborator

@pateljannat pateljannat commented Mar 3, 2025

  1. Previously, when a System Manager on an FC Trial Site, tried to login to FC from the portal, they were asked for a verification code, and that logged them into their FC dashboard. Also on clicking the Upgrade button from the Trial Card, they were redirected to another billing flow which was not a part of FC.

  2. With the changes in this PR, when a System Manager now tries to Login to Frappe Cloud, they will be redirected to their Site Dashboard if they have added a payment method on FC, if not they will be redirected to the FC Welcome page. The same flow will be true if they click on the Upgrade button.

Screenshot 2025-03-03 at 1 53 38 PM

Copy link

cypress bot commented Mar 3, 2025

lms    Run #1116

Run Properties:  status check passed Passed #1116  •  git commit 579de3850e ℹ️: Merge 07d30647d824dfd2c28908be5c2c1d1095b7f151 into b510cbce7f665c2b929add8661a0...
Project lms
Branch Review billing-flow-changes
Run status status check passed Passed #1116
Run duration 00m 29s
Commit git commit 579de3850e ℹ️: Merge 07d30647d824dfd2c28908be5c2c1d1095b7f151 into b510cbce7f665c2b929add8661a0...
Committer Jannat Patel
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 1
⚠️ You've recorded test results over your free plan limit.
Upgrade your plan to view test results.
View all changes introduced in this branch ↗︎

@pateljannat pateljannat merged commit 4224580 into frappe:develop Mar 3, 2025
5 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 2.25.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants