Beta Testing Round 3 Bug Fixes (#1357)

* Clean up env example files

* Fix duplicate category creations

* Fix duplicate tag and merchant creation

* Add initial valuation to imported accounts

* Add upgrade modal prompt

* Don't hide content on billing page

* Add temporary session for new customers

* Lint fixes

* Fix unused translations

* Fix system tests

app/controllers/application_controller.rb

@@ -2,7 +2,22 @@ class ApplicationController < ActionController::Base
   include Onboardable, Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation, Impersonatable
   include Pagy::Backend
 
+  helper_method :require_upgrade?, :subscription_pending?
+
   private
+    def require_upgrade?
+      return false if self_hosted?
+      return false unless Current.session
+      return false if Current.family.subscribed?
+      return false if subscription_pending? || request.path == settings_billing_path
+
+      true
+    end
+
+    def subscription_pending?
+      subscribed_at = Current.session.subscribed_at
+      subscribed_at.present? && subscribed_at <= Time.current && subscribed_at > 1.hour.ago
+    end
 
     def with_sidebar
       return "turbo_rails/frame" if turbo_frame_request?

app/controllers/categories_controller.rb

@@ -1,7 +1,7 @@
 class CategoriesController < ApplicationController
   layout :with_sidebar
 
-  before_action :set_category, only: %i[edit update]
+  before_action :set_category, only: %i[edit update destroy]
   before_action :set_transaction, only: :create
 
   def index
@@ -13,12 +13,14 @@ class CategoriesController < ApplicationController
   end
 
   def create
-    Category.transaction do
-      category = Current.family.categories.create!(category_params)
-      @transaction.update!(category_id: category.id) if @transaction
-    end
+    @category = Current.family.categories.new(category_params)
 
-    redirect_back_or_to transactions_path, notice: t(".success")
+    if @category.save
+      @transaction.update(category_id: @category.id) if @transaction
+      redirect_back_or_to transactions_path, notice: t(".success")
+    else
+      redirect_back_or_to transactions_path, alert: t(".failure", error: @category.errors.full_messages.to_sentence)
+    end
   end
 
   def edit
@@ -30,6 +32,12 @@ class CategoriesController < ApplicationController
     redirect_back_or_to transactions_path, notice: t(".success")
   end
 
+  def destroy
+    @category.destroy
+
+    redirect_back_or_to categories_path, notice: t(".success")
+  end
+
   private
     def set_category
       @category = Current.family.categories.find(params[:id])

app/controllers/merchants_controller.rb

@@ -12,8 +12,13 @@ class MerchantsController < ApplicationController
   end
 
   def create
-    Current.family.merchants.create!(merchant_params)
-    redirect_to merchants_path, notice: t(".success")
+    @merchant = Current.family.merchants.new(merchant_params)
+
+    if @merchant.save
+      redirect_to merchants_path, notice: t(".success")
+    else
+      redirect_to merchants_path, alert: t(".error", error: @merchant.errors.full_messages.to_sentence)
+    end
   end
 
   def edit

app/controllers/subscriptions_controller.rb

@@ -1,16 +1,14 @@
 class SubscriptionsController < ApplicationController
   def new
-    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
-
     if Current.family.stripe_customer_id.blank?
-      customer = client.v1.customers.create(
+      customer = stripe_client.v1.customers.create(
         email: Current.family.primary_user.email,
         metadata: { family_id: Current.family.id }
       )
       Current.family.update(stripe_customer_id: customer.id)
     end
 
-    session = client.v1.checkout.sessions.create({
+    session = stripe_client.v1.checkout.sessions.create({
       customer: Current.family.stripe_customer_id,
       line_items: [ {
         price: ENV["STRIPE_PLAN_ID"],
@@ -18,7 +16,7 @@ class SubscriptionsController < ApplicationController
       } ],
       mode: "subscription",
       allow_promotion_codes: true,
-      success_url: settings_billing_url,
+      success_url: success_subscription_url + "?session_id={CHECKOUT_SESSION_ID}",
       cancel_url: settings_billing_url
     })
 
@@ -26,12 +24,24 @@ class SubscriptionsController < ApplicationController
   end
 
   def show
-    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
-
-    portal_session = client.v1.billing_portal.sessions.create(
+    portal_session = stripe_client.v1.billing_portal.sessions.create(
       customer: Current.family.stripe_customer_id,
       return_url: settings_billing_url
     )
+
     redirect_to portal_session.url, allow_other_host: true, status: :see_other
   end
+
+  def success
+    checkout_session = stripe_client.v1.checkout.sessions.retrieve(params[:session_id])
+    Current.session.update(subscribed_at: Time.at(checkout_session.created))
+    redirect_to root_path, notice: "You have successfully subscribed to Maybe+."
+  rescue Stripe::InvalidRequestError
+    redirect_to settings_billing_path, alert: "Something went wrong processing your subscription. Please contact us to get this fixed."
+  end
+
+  private
+    def stripe_client
+      @stripe_client ||= Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+    end
 end

app/controllers/tags_controller.rb

@@ -1,7 +1,7 @@
 class TagsController < ApplicationController
   layout :with_sidebar
 
-  before_action :set_tag, only: %i[edit update]
+  before_action :set_tag, only: %i[edit update destroy]
 
   def index
     @tags = Current.family.tags.alphabetically
@@ -12,8 +12,13 @@ class TagsController < ApplicationController
   end
 
   def create
-    Current.family.tags.create!(tag_params)
-    redirect_to tags_path, notice: t(".created")
+    @tag = Current.family.tags.new(tag_params)
+
+    if @tag.save
+      redirect_to tags_path, notice: t(".created")
+    else
+      redirect_to tags_path, alert: t(".error", error: @tag.errors.full_messages.to_sentence)
+    end
   end
 
   def edit
@@ -24,6 +29,11 @@ class TagsController < ApplicationController
     redirect_to tags_path, notice: t(".updated")
   end
 
+  def destroy
+    @tag.destroy!
+    redirect_to tags_path, notice: t(".deleted")
+  end
+
   private
 
     def set_tag