fix: redirection to FC site without checking payment method
This commit is contained in:
@@ -234,10 +234,7 @@ const userDropdownOptions = computed(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const loginToFrappeCloud = () => {
|
const loginToFrappeCloud = () => {
|
||||||
let redirect_to = '/dashboard/welcome'
|
let redirect_to = '/dashboard/sites/' + userResource.data.sitename
|
||||||
if (userResource.data?.site_info.is_payment_method_added) {
|
|
||||||
redirect_to = '/dashboard/sites/' + userResource.data.sitename
|
|
||||||
}
|
|
||||||
window.open(`${frappeCloudBaseEndpoint}${redirect_to}`, '_blank')
|
window.open(`${frappeCloudBaseEndpoint}${redirect_to}`, '_blank')
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-else-if="!batches.list.loading"
|
v-else-if="!batches.list.loading"
|
||||||
class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
|
class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
|
||||||
>
|
>
|
||||||
<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
|
<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
|
||||||
<div class="text-lg font-medium mb-1">
|
<div class="text-lg font-medium mb-1">
|
||||||
|
|||||||
@@ -242,6 +242,8 @@ profile_url_prefix = "/users/"
|
|||||||
|
|
||||||
signup_form_template = "lms.plugins.show_custom_signup"
|
signup_form_template = "lms.plugins.show_custom_signup"
|
||||||
|
|
||||||
|
on_login = "lms.lms.user.on_login"
|
||||||
|
|
||||||
add_to_apps_screen = [
|
add_to_apps_screen = [
|
||||||
{
|
{
|
||||||
"name": "lms",
|
"name": "lms",
|
||||||
|
|||||||
@@ -83,3 +83,8 @@ def set_country_from_ip(login_manager=None, user=None):
|
|||||||
# return
|
# return
|
||||||
frappe.db.set_value("User", user, "country", get_country_code())
|
frappe.db.set_value("User", user, "country", get_country_code())
|
||||||
return
|
return
|
||||||
|
|
||||||
|
def on_login(login_manager):
|
||||||
|
default_app = frappe.db.get_single_value("System Settings", "default_app")
|
||||||
|
if default_app == "lms":
|
||||||
|
frappe.local.response["home_page"] = "/lms"
|
||||||
Reference in New Issue
Block a user