feat: Add self serve billing management UI

admin/database/postgres/migrations/0049.sql

@@ -0,0 +1 @@
+ALTER TABLE assets ALTER COLUMN org_id DROP NOT NULL;

admin/jobs/river/biller_event_handlers.go

@@ -86,6 +86,7 @@ func (w *PaymentFailedWorker) Work(ctx context.Context, job *river.Job[PaymentFa
 		OrgName:            org.Name,
 		Currency:           job.Args.Currency,
 		Amount:             job.Args.Amount,
+		PaymentURL:         w.admin.URLs.PaymentPortal(org.Name),
 		GracePeriodEndDate: gracePeriodEndDate,
 	})
 	if err != nil {
@@ -242,9 +243,10 @@ func (w *PaymentFailedGracePeriodCheckWorker) paymentFailedGracePeriodCheck(ctx
 
 		// send email
 		err = w.admin.Email.SendInvoiceUnpaid(&email.InvoiceUnpaid{
-			ToEmail: org.BillingEmail,
-			ToName:  org.Name,
-			OrgName: org.Name,
+			ToEmail:    org.BillingEmail,
+			ToName:     org.Name,
+			OrgName:    org.Name,
+			PaymentURL: w.admin.URLs.PaymentPortal(org.Name),
 		})
 		if err != nil {
 			return fmt.Errorf("failed to send project hibernated due to payment overdue email for org %q: %w", org.Name, err)

admin/jobs/river/trial_checks.go

@@ -57,6 +57,7 @@ func (w *TrialEndingSoonWorker) trialEndingSoon(ctx context.Context) error {
 			ToEmail:      org.BillingEmail,
 			ToName:       org.Name,
 			OrgName:      org.Name,
+			UpgradeURL:   w.admin.URLs.UpgradePlan(org.Name),
 			TrialEndDate: m.EndDate,
 		})
 		if err != nil {
@@ -160,6 +161,7 @@ func (w *TrialEndCheckWorker) trialEndCheck(ctx context.Context) error {
 			ToEmail:            org.BillingEmail,
 			ToName:             org.Name,
 			OrgName:            org.Name,
+			UpgradeURL:         w.admin.URLs.UpgradePlan(org.Name),
 			GracePeriodEndDate: m.GracePeriodEndDate,
 		})
 		if err != nil {
@@ -281,9 +283,10 @@ func (w *TrialGracePeriodCheckWorker) trialGracePeriodCheck(ctx context.Context)
 
 		// send email
 		err = w.admin.Email.SendTrialGracePeriodEnded(&email.TrialGracePeriodEnded{
-			ToEmail: org.BillingEmail,
-			ToName:  org.Name,
-			OrgName: org.Name,
+			ToEmail:    org.BillingEmail,
+			ToName:     org.Name,
+			OrgName:    org.Name,
+			UpgradeURL: w.admin.URLs.UpgradePlan(org.Name),
 		})
 		if err != nil {
 			return fmt.Errorf("failed to send trial grace period ended email for org %q: %w", org.Name, err)

admin/server/billing.go

@@ -233,6 +233,18 @@
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
+	//
+	//err = s.admin.Email.SendSubscriptionCancelled(&email.SubscriptionCancelled{
+	//	ToEmail:  org.BillingEmail,
+	//	ToName:   org.Name,
+	//	OrgName:  org.Name,
+	//	PlanName: "Team Plan", // TODO: will this ever be different?
+	//	EndDate:  endDate,
+	//})
+	//if err != nil {
+	//	return nil, status.Error(codes.Internal, err.Error())
+	//}
+
 	s.logger.Named("billing").Warn("subscription cancelled", zap.String("org_id", org.ID), zap.String("org_name", org.Name))
 
 	return &adminv1.CancelBillingSubscriptionResponse{}, nil
@@ -362,6 +374,11 @@
 		return nil, status.Error(codes.FailedPrecondition, "payment customer not initialized yet for the organization")
 	}
 
+	// returnUrl is mandatory so if not passed default to home page
+	if req.ReturnUrl == "" {
+		req.ReturnUrl = s.admin.URLs.Frontend()
+	}
+
 	url, err := s.admin.PaymentProvider.GetBillingPortalURL(ctx, org.PaymentCustomerID, req.ReturnUrl)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -728,11 +745,11 @@
 	return &adminv1.Subscription{
 		Id:                           sub.ID,
 		Plan:                         billingPlanToDTO(sub.Plan),
-		StartDate:                    timestamppb.New(sub.StartDate),
-		EndDate:                      timestamppb.New(sub.EndDate),
-		CurrentBillingCycleStartDate: timestamppb.New(sub.CurrentBillingCycleStartDate),
-		CurrentBillingCycleEndDate:   timestamppb.New(sub.CurrentBillingCycleEndDate),
-		TrialEndDate:                 timestamppb.New(sub.TrialEndDate),
+		StartDate:                    valOrNullTime(sub.StartDate),
+		EndDate:                      valOrNullTime(sub.EndDate),
+		CurrentBillingCycleStartDate: valOrNullTime(sub.CurrentBillingCycleStartDate),
+		CurrentBillingCycleEndDate:   valOrNullTime(sub.CurrentBillingCycleEndDate),
+		TrialEndDate:                 valOrNullTime(sub.TrialEndDate),
 	}
 }
 
@@ -815,17 +832,17 @@
 		return &adminv1.BillingIssueMetadata{
 			Metadata: &adminv1.BillingIssueMetadata_OnTrial{
 				OnTrial: &adminv1.BillingIssueMetadataOnTrial{
-					EndDate:            timestamppb.New(m.(*database.BillingIssueMetadataOnTrial).EndDate),
-					GracePeriodEndDate: timestamppb.New(m.(*database.BillingIssueMetadataOnTrial).GracePeriodEndDate),
+					EndDate:            valOrNullTime(m.(*database.BillingIssueMetadataOnTrial).EndDate),
+					GracePeriodEndDate: valOrNullTime(m.(*database.BillingIssueMetadataOnTrial).GracePeriodEndDate),
 				},
 			},
 		}
 	case database.BillingIssueTypeTrialEnded:
 		return &adminv1.BillingIssueMetadata{
 			Metadata: &adminv1.BillingIssueMetadata_TrialEnded{
 				TrialEnded: &adminv1.BillingIssueMetadataTrialEnded{
-					EndDate:            timestamppb.New(m.(*database.BillingIssueMetadataTrialEnded).EndDate),
-					GracePeriodEndDate: timestamppb.New(m.(*database.BillingIssueMetadataTrialEnded).GracePeriodEndDate),
+					EndDate:            valOrNullTime(m.(*database.BillingIssueMetadataTrialEnded).EndDate),
+					GracePeriodEndDate: valOrNullTime(m.(*database.BillingIssueMetadataTrialEnded).GracePeriodEndDate),
 				},
 			},
 		}
@@ -846,12 +863,13 @@
 		invoices := make([]*adminv1.BillingIssueMetadataPaymentFailedMeta, 0)
 		for k := range paymentFailed.Invoices {
 			invoices = append(invoices, &adminv1.BillingIssueMetadataPaymentFailedMeta{
-				InvoiceId:     paymentFailed.Invoices[k].ID,
-				InvoiceNumber: paymentFailed.Invoices[k].Number,
-				InvoiceUrl:    paymentFailed.Invoices[k].URL,
-				AmountDue:     paymentFailed.Invoices[k].Amount,
-				Currency:      paymentFailed.Invoices[k].Currency,
-				DueDate:       timestamppb.New(paymentFailed.Invoices[k].DueDate),
+				InvoiceId:          paymentFailed.Invoices[k].ID,
+				InvoiceNumber:      paymentFailed.Invoices[k].Number,
+				InvoiceUrl:         paymentFailed.Invoices[k].URL,
+				AmountDue:          paymentFailed.Invoices[k].Amount,
+				Currency:           paymentFailed.Invoices[k].Currency,
+				DueDate:            valOrNullTime(paymentFailed.Invoices[k].DueDate),
+				GracePeriodEndDate: valOrNullTime(paymentFailed.Invoices[k].GracePeriodEndDate),
 			})
 		}
 		return &adminv1.BillingIssueMetadata{
@@ -865,7 +883,7 @@
 		return &adminv1.BillingIssueMetadata{
 			Metadata: &adminv1.BillingIssueMetadata_SubscriptionCancelled{
 				SubscriptionCancelled: &adminv1.BillingIssueMetadataSubscriptionCancelled{
-					EndDate: timestamppb.New(m.(*database.BillingIssueMetadataSubscriptionCancelled).EndDate),
+					EndDate: valOrNullTime(m.(*database.BillingIssueMetadataSubscriptionCancelled).EndDate),
 				},
 			},
 		}
@@ -917,6 +935,13 @@
 	return *v
 }
 
+func valOrNullTime(v time.Time) *timestamppb.Timestamp {
+	if v.IsZero() {
+		return nil
+	}
+	return timestamppb.New(v)
+}
+
 func biggerOfInt(ptr *int, def int) int {
 	if ptr == nil {
 		return def

admin/urls.go

@@ -329,3 +329,14 @@ func (u *URLs) AlertOpen(org, project, alert string) string {
 func (u *URLs) AlertEdit(org, project, alert string) string {
 	return urlutil.MustJoinURL(u.Frontend(), org, project, "-", "alerts", alert)
 }
+
+// UpgradePlan returns the landing page URL to either upgrade to plan or redirect to payment portal if there are any issues.
+func (u *URLs) UpgradePlan(org string) string {
+	return urlutil.MustJoinURL(u.Frontend(), org, "-", "settings", "billing", "upgrade")
+}
+
+// PaymentPortal returns the landing page url that redirects user to payment portal
+// Since the payment link can expire it is generated in this landing page on demand.
+func (u *URLs) PaymentPortal(org string) string {
+	return urlutil.MustJoinURL(u.Frontend(), org, "-", "settings", "billing", "payment")
+}

admin/user.go

@@ -246,6 +246,19 @@ func (s *Service) CreateOrganizationForUser(ctx context.Context, userID, email,
 
 	s.Logger.Info("created org", zap.String("name", orgName), zap.String("user_id", userID))
 
+	// raise never subscribed billing issue in sync to prevent race condition where first project is deployed before issue is raised and thus trial not started
+	if s.Biller.Name() != "noop" {
+		_, err := s.DB.UpsertBillingIssue(ctx, &database.UpsertBillingIssueOptions{
+			OrgID:     org.ID,
+			Type:      database.BillingIssueTypeNeverSubscribed,
+			Metadata:  database.BillingIssueMetadataNeverSubscribed{},
+			EventTime: org.CreatedOn,
+		})
+		if err != nil {
+			return nil, fmt.Errorf("failed to upsert billing error: %w", err)
+		}
+	}
+
 	// Submit job to init org billing // TODO modify river client to allow job submission as part of transaction
 	_, err = s.Jobs.InitOrgBilling(ctx, org.ID)
 	if err != nil {

runtime/pkg/email/email.go

@@ -362,16 +362,19 @@ type InvoicePaymentFailed struct {
 	OrgName            string
 	Currency           string
 	Amount             string
+	PaymentURL         string
 	GracePeriodEndDate time.Time
 }
 
 func (c *Client) SendInvoicePaymentFailed(opts *InvoicePaymentFailed) error {
-	return c.SendInformational(&Informational{
-		ToEmail: opts.ToEmail,
-		ToName:  opts.ToName,
-		Subject: fmt.Sprintf("Payment for %s has failed", opts.OrgName),
-		Title:   fmt.Sprintf("Payment for %s has failed", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("The payment of %s%s for your %q Rill subscription has failed. Your projects will be hibenrated on %s if payment not received.", opts.Currency, opts.Amount, opts.OrgName, opts.GracePeriodEndDate.Format("January 2, 2006"))),
+	return c.SendCallToAction(&CallToAction{
+		ToEmail:    opts.ToEmail,
+		ToName:     opts.ToName,
+		Subject:    fmt.Sprintf("Payment for %s has failed", opts.OrgName),
+		Title:      fmt.Sprintf("Payment for %s has failed", opts.OrgName),
+		Body:       template.HTML(fmt.Sprintf("The payment of %s%s for your %q Rill subscription has failed. Your projects will be hibenrated on %s if payment not received.", opts.Currency, opts.Amount, opts.OrgName, opts.GracePeriodEndDate.Format("January 2, 2006"))),
+		ButtonText: "Update Payment Info",
+		ButtonLink: opts.PaymentURL,
 	})
 }
 
@@ -395,19 +398,40 @@ func (c *Client) SendInvoicePaymentSuccess(opts *InvoicePaymentSuccess) error {
 }
 
 type InvoiceUnpaid struct {
-	ToEmail string
-	ToName  string
-	OrgName string
+	ToEmail    string
+	ToName     string
+	OrgName    string
+	PaymentURL string
 }
 
 // SendInvoiceUnpaid sent after the payment grace period has ended
 func (c *Client) SendInvoiceUnpaid(opts *InvoiceUnpaid) error {
+	return c.SendCallToAction(&CallToAction{
+		ToEmail:    opts.ToEmail,
+		ToName:     opts.ToName,
+		Subject:    fmt.Sprintf("Payment for %s is overdue", opts.OrgName),
+		Title:      fmt.Sprintf("Payment for %s is overdue", opts.OrgName),
+		Body:       template.HTML(fmt.Sprintf("The payment for your Rill subscription on %q is overdue. Your projects have been hibernated.", opts.OrgName)),
+		ButtonText: "Update Payment Info",
+		ButtonLink: opts.PaymentURL,
+	})
+}
+
+type SubscriptionCancelled struct {
+	ToEmail  string
+	ToName   string
+	OrgName  string
+	PlanName string
+	EndDate  time.Time
+}
+
+func (c *Client) SendSubscriptionCancelled(opts *SubscriptionCancelled) error {
 	return c.SendInformational(&Informational{
 		ToEmail: opts.ToEmail,
 		ToName:  opts.ToName,
-		Subject: fmt.Sprintf("Payment for %s is overdue", opts.OrgName),
-		Title:   fmt.Sprintf("Payment for %s is overdue", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("The payment for your Rill subscription on %q is overdue. Your projects have been hibernated.", opts.OrgName)),
+		Subject: fmt.Sprintf("Subscription was cancelled %s", opts.OrgName),
+		Title:   fmt.Sprintf("Subscription was cancelled %s", opts.OrgName),
+		Body:    template.HTML(fmt.Sprintf("You’ve successfully canceled your %s plan. Your access will continue until %s", opts.PlanName, opts.EndDate.Format("January 2, 2006"))),
 	})
 }
 
@@ -448,49 +472,58 @@ type TrialEndingSoon struct {
 	ToEmail      string
 	ToName       string
 	OrgName      string
+	UpgradeURL   string
 	TrialEndDate time.Time
 }
 
 func (c *Client) SendTrialEndingSoon(opts *TrialEndingSoon) error {
-	return c.SendInformational(&Informational{
-		ToEmail: opts.ToEmail,
-		ToName:  opts.ToName,
-		Subject: fmt.Sprintf("Your trial for %s is ending soon", opts.OrgName),
-		Title:   fmt.Sprintf("Your trial for %s is ending soon", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("Your trial for %q is ending on %s. Upgrade to a paid plan to continue using Rill.", opts.OrgName, opts.TrialEndDate.Format("January 2, 2006"))),
+	return c.SendCallToAction(&CallToAction{
+		ToEmail:    opts.ToEmail,
+		ToName:     opts.ToName,
+		Subject:    fmt.Sprintf("Your trial for %s is ending soon", opts.OrgName),
+		Title:      fmt.Sprintf("Your trial for %s is ending soon", opts.OrgName),
+		Body:       template.HTML(fmt.Sprintf("Your trial for %q is ending on %s. Upgrade to a paid plan to continue using Rill.", opts.OrgName, opts.TrialEndDate.Format("January 2, 2006"))),
+		ButtonText: "Upgrade Now",
+		ButtonLink: opts.UpgradeURL,
 	})
 }
 
 type TrialEnded struct {
 	ToEmail            string
 	ToName             string
 	OrgName            string
+	UpgradeURL         string
 	GracePeriodEndDate time.Time
 }
 
 func (c *Client) SendTrialEnded(opts *TrialEnded) error {
-	return c.SendInformational(&Informational{
-		ToEmail: opts.ToEmail,
-		ToName:  opts.ToName,
-		Subject: fmt.Sprintf("Your trial for %s has ended", opts.OrgName),
-		Title:   fmt.Sprintf("Your trial for %s has ended", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("Your trial for %q has ended. Your projects will be hibernated on %s. Upgrade to a paid plan to continue using Rill.", opts.OrgName, opts.GracePeriodEndDate.Format("January 2, 2006"))),
+	return c.SendCallToAction(&CallToAction{
+		ToEmail:    opts.ToEmail,
+		ToName:     opts.ToName,
+		Subject:    fmt.Sprintf("Your trial for %s has ended", opts.OrgName),
+		Title:      fmt.Sprintf("Your trial for %s has ended", opts.OrgName),
+		Body:       template.HTML(fmt.Sprintf("Your trial for %q has ended. Your projects will be hibernated on %s. Upgrade to a paid plan to continue using Rill.", opts.OrgName, opts.GracePeriodEndDate.Format("January 2, 2006"))),
+		ButtonText: "Upgrade to Team Plan",
+		ButtonLink: opts.UpgradeURL,
 	})
 }
 
 type TrialGracePeriodEnded struct {
-	ToEmail string
-	ToName  string
-	OrgName string
+	ToEmail    string
+	ToName     string
+	OrgName    string
+	UpgradeURL string
 }
 
 func (c *Client) SendTrialGracePeriodEnded(opts *TrialGracePeriodEnded) error {
-	return c.SendInformational(&Informational{
-		ToEmail: opts.ToEmail,
-		ToName:  opts.ToName,
-		Subject: fmt.Sprintf("Your trial grace period has ended for %s", opts.OrgName),
-		Title:   fmt.Sprintf("Your trial grace period has ended for %s", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("Your trial grace period has ended for %q. Your projects have been hibernated. Please visit the billing portal to enter payment method and upgrade your plan to continue using Rill.", opts.OrgName)),
+	return c.SendCallToAction(&CallToAction{
+		ToEmail:    opts.ToEmail,
+		ToName:     opts.ToName,
+		Subject:    fmt.Sprintf("Your trial grace period has ended for %s", opts.OrgName),
+		Title:      fmt.Sprintf("Your trial grace period has ended for %s", opts.OrgName),
+		Body:       template.HTML(fmt.Sprintf("Your trial grace period has ended for %q. Your projects have been hibernated. Please visit the billing portal to enter payment method and upgrade your plan to continue using Rill.", opts.OrgName)),
+		ButtonText: "Upgrade to Team Plan",
+		ButtonLink: opts.UpgradeURL,
 	})
 }
 
@@ -507,6 +540,6 @@ func (c *Client) SendTrialExtended(opts *TrialExtended) error {
 		ToName:  opts.ToName,
 		Subject: fmt.Sprintf("Your trial for %s has been extended", opts.OrgName),
 		Title:   fmt.Sprintf("Your trial for %s has been extened", opts.OrgName),
-		Body:    template.HTML(fmt.Sprintf("Welcome to Rill! Your trial for %q has been extended and will end on %s.", opts.OrgName, opts.TrialEndDate.Format("January 2, 2006"))),
+		Body:    template.HTML(fmt.Sprintf("Your trial for %q has been extended and will end on %s.", opts.OrgName, opts.TrialEndDate.Format("January 2, 2006"))),
 	})
 }