fix(Site): don't show upsell banner if site on trial plan

frappe · Dec 5, 2024 · 28e725f · 28e725f
1 parent 573ba92
commit 28e725f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/dashboard/src2/components/SiteOverview.vue b/dashboard/src2/components/SiteOverview.vue
@@ -19,7 +19,12 @@
 			</Button>
 		</AlertBanner>
 		<DismissableBanner
-			v-if="!$site.doc.current_plan?.private_benches && $site.doc.group_public"
+			v-if="
+				$site.doc.current_plan &&
+				!$site.doc.current_plan?.private_benches &&
+				$site.doc.group_public &&
+				!$site.doc.current_plan?.is_trial_plan
+			"
 			class="col-span-1 lg:col-span-2"
 			title="Your site is currently on a shared bench group. Upgrade plan to enjoy <a href='https://frappecloud.com/shared-hosting#benches' class='underline' target='_blank'>more benefits</a>."
 			:id="$site.name"

diff --git a/dashboard/src2/objects/common/index.ts b/dashboard/src2/objects/common/index.ts
@@ -27,7 +27,13 @@ export const clusterOptions = [
 ];
 
 export function getUpsellBanner(site: DocumentResource, title: string) {
-	if (site.doc.current_plan?.private_benches || !site.doc.group_public) return;
+	if (
+		!site.doc.current_plan ||
+		site.doc.current_plan?.private_benches ||
+		site.doc.current_plan?.is_trial_plan ||
+		!site.doc.group_public
+	)
+		return;
 
 	return {
 		title: title,

diff --git a/press/press/doctype/site_plan/site_plan.py b/press/press/doctype/site_plan/site_plan.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2024, Frappe and contributors
 # For license information, please see license.txt
-
-from typing import List
+from __future__ import annotations
 
 import frappe
 
@@ -53,7 +52,7 @@ class SitePlan(Plan):
 		vcpu: DF.Int
 	# end: auto-generated types
 
-	dashboard_fields = [
+	dashboard_fields = (
 		"name",
 		"plan_title",
 		"document_type",
@@ -68,15 +67,16 @@ class SitePlan(Plan):
 		"support_included",
 		"private_benches",
 		"monitor_access",
-	]
+		"is_trial_plan",
+	)
 
 	def get_doc(self, doc):
 		doc["price_per_day_inr"] = self.get_price_per_day("INR")
 		doc["price_per_day_usd"] = self.get_price_per_day("USD")
 		return doc
 
 	@classmethod
-	def get_ones_without_offsite_backups(cls) -> List[str]:
+	def get_ones_without_offsite_backups(cls) -> list[str]:
 		return frappe.get_all("Site Plan", filters={"offsite_backups": False}, pluck="name")