Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Support for an annual plan too.

Matt Roberts1896e382db3a
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index b2733ff53..07941738b 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -216,6 +216,7 @@ func routes(r *web.Engine) *web.Engine {
ui.Get("/admin/billing", handlers.ManageBilling())
ui.Post("/_api/admin/billing/portal", handlers.CreateStripePortalSession())
ui.Post("/_api/admin/billing/checkout", handlers.CreateStripeCheckoutSession())
+ ui.Post("/_api/admin/billing/checkout/annual", handlers.CreateStripeAnnualCheckoutSession())
}
}
diff --git a/app/handlers/billing.go b/app/handlers/billing.go
index b55bace80..1b2c84efe 100644
--- a/app/handlers/billing.go
+++ b/app/handlers/billing.go
@@ -66,41 +66,53 @@ func CreateStripePortalSession() web.HandlerFunc {
}
}
-// CreateStripeCheckoutSession creates a Stripe checkout session for new subscriptions
-func CreateStripeCheckoutSession() web.HandlerFunc {
- return func(c *web.Context) error {
- stripe.Key = env.Config.Stripe.SecretKey
-
- returnURL := c.BaseURL() + "/admin/billing"
- tenantID := c.Tenant().ID
-
- params := &stripe.CheckoutSessionParams{
- Mode: stripe.String(string(stripe.CheckoutSessionModeSubscription)),
- LineItems: []*stripe.CheckoutSessionLineItemParams{
- {
- Price: stripe.String(env.Config.Stripe.PriceID),
- Quantity: stripe.Int64(1),
- },
+// createCheckoutSession creates a Stripe checkout session for the given price ID
+func createCheckoutSession(c *web.Context, priceID string) error {
+ stripe.Key = env.Config.Stripe.SecretKey
+
+ returnURL := c.BaseURL() + "/admin/billing"
+ tenantID := c.Tenant().ID
+
+ params := &stripe.CheckoutSessionParams{
+ Mode: stripe.String(string(stripe.CheckoutSessionModeSubscription)),
+ LineItems: []*stripe.CheckoutSessionLineItemParams{
+ {
+ Price: stripe.String(priceID),
+ Quantity: stripe.Int64(1),
},
- SuccessURL: stripe.String(returnURL + "?checkout=success"),
- CancelURL: stripe.String(returnURL + "?checkout=cancelled"),
+ },
+ SuccessURL: stripe.String(returnURL + "?checkout=success"),
+ CancelURL: stripe.String(returnURL + "?checkout=cancelled"),
+ Metadata: map[string]string{
+ "tenant_id": fmt.Sprintf("%d", tenantID),
+ },
+ SubscriptionData: &stripe.CheckoutSessionSubscriptionDataParams{
Metadata: map[string]string{
"tenant_id": fmt.Sprintf("%d", tenantID),
},
- SubscriptionData: &stripe.CheckoutSessionSubscriptionDataParams{
- Metadata: map[string]string{
- "tenant_id": fmt.Sprintf("%d", tenantID),
- },
- },
- }
+ },
+ }
- s, err := checkoutsession.New(params)
- if err != nil {
- return c.Failure(err)
- }
+ s, err := checkoutsession.New(params)
+ if err != nil {
+ return c.Failure(err)
+ }
- return c.Ok(web.Map{
- "url": s.URL,
- })
+ return c.Ok(web.Map{
+ "url": s.URL,
+ })
+}
+
+// CreateStripeCheckoutSession creates a Stripe checkout session for new subscriptions
+func CreateStripeCheckoutSession() web.HandlerFunc {
+ return func(c *web.Context) error {
+ return createCheckoutSession(c, env.Config.Stripe.PriceID)
+ }
+}
+
+// CreateStripeAnnualCheckoutSession creates a Stripe checkout session for annual subscriptions
+func CreateStripeAnnualCheckoutSession() web.HandlerFunc {
+ return func(c *web.Context) error {
+ return createCheckoutSession(c, env.Config.Stripe.AnnualPriceID)
}
}
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index b6a988cbc..fdf91b81c 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -60,6 +60,7 @@ type config struct {
SecretKey string `env:"STRIPE_SECRET_KEY"`
WebhookSecret string `env:"STRIPE_WEBHOOK_SECRET"`
PriceID string `env:"STRIPE_PRICE_ID"`
+ AnnualPriceID string `env:"STRIPE_ANNUAL_PRICE_ID"`
}
Metrics struct {
Enabled bool `env:"METRICS_ENABLED,default=false"`
diff --git a/public/pages/Administration/pages/ManageBilling.page.tsx b/public/pages/Administration/pages/ManageBilling.page.tsx
index f426fccc5..155f879f3 100644
--- a/public/pages/Administration/pages/ManageBilling.page.tsx
+++ b/public/pages/Administration/pages/ManageBilling.page.tsx
@@ -19,6 +19,7 @@ interface ManageBillingPageProps {
interface PlanFeature {
text: string
isNegative?: boolean
+ onClick?: () => void
}
interface PlanCardProps {
@@ -78,10 +79,17 @@ const PlanCard = (props: PlanCardProps) => {
{props.features.map((feature, index) => {
const featureText = typeof feature === "string" ? feature : feature.text
const isNegative = typeof feature === "object" && feature.isNegative
+ const onClick = typeof feature === "object" ? feature.onClick : undefined
return (
- <HStack key={index} spacing={2} align="start">
+ <HStack key={index} spacing={2} align="center">
<Icon sprite={isNegative ? IconX : IconCheck} className={isNegative ? "text-red-500" : "text-green-500"} height="16" />
- <span className="text-sm">{featureText}</span>
+ {onClick ? (
+ <a className="text-sm clickable text-blue-200 clickable" onClick={onClick}>
+ {featureText}
+ </a>
+ ) : (
+ <span className="text-sm">{featureText}</span>
+ )}
</HStack>
)
})}
@@ -139,7 +147,26 @@ const ManageBillingPage = (props: ManageBillingPageProps) => {
const freeFeatures = ["250 suggestions", "Unlimited voters", "Your own subdomain or custom domain", "All core functionality"]
- const proFeatures = ["Everything in free", "Unlimited suggestions", "Content moderation", "Search engine indexing", "Billing month to month"]
+ const startAnnualCheckout = async () => {
+ setIsLoading(true)
+ const result = await http.post<{ url: string }>("/_api/admin/billing/checkout/annual")
+ if (result.ok) {
+ window.location.href = result.data.url
+ } else {
+ setIsLoading(false)
+ }
+ }
+
+ const proFeatures: (string | PlanFeature)[] = [
+ "Everything in free",
+ "Unlimited suggestions",
+ "Content moderation",
+ "Search engine indexing",
+ {
+ text: "Option to pay annually",
+ onClick: startAnnualCheckout,
+ },
+ ]
const legacyProFeatures: PlanFeature[] = [
{ text: "Same features as Pro" },