bullet_train 1.0.81 → 1.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07a863ffd021a1e4da0bf8e18e68fb9e357d90264d5a0d0d92770363f48390c
-  data.tar.gz: be20709eb91a25d64c9ef4371326cb56cc9b938b34bbb2e80db8ad21396d085c
+  metadata.gz: d2119a17f5ed1aace492642ab674c8fb67cadefd29100aee3809e590813da3bb
+  data.tar.gz: '0679c15de2ec6260be9beab3c1261fbef4892cacd961d285f813229aac5b1616'
 SHA512:
-  metadata.gz: 1f887941fdeb2c3cb567b7011a1ff7edbf47558bc362d4b714c8a0d6ea6d4da922ac4d3eccc16c01c384ed9773eacc3f1b84ed3aadcf41adc7fd5d692b9ff0b4
-  data.tar.gz: bd70518110d78e2c7d455fa314a70a874fc6d82b109c28188098b7ef91701af31c85ae9eb7be5f1dbff67b95e8c91005c4babb89179b2cbbc2bda7a0bd38254a
+  metadata.gz: 807684f8b6d5a99a6d35a78d0e50cbeb8a0ef40d06b1e56c1c653a6851ea0289e50c75f2a1e75a1500f6799f3fcd91a603fffaa64ea12324068a851290e67186
+  data.tar.gz: 964b44f5ddaa872e26e8cefcf0dd6f9a11d19fc7d3b435e10e7a14d6f62c420a60945dde1eb0c9c588f049cd64423e93c82c52e2b207c01c2cfbe7d58c5b125b

data/app/controllers/concerns/account/controllers/base.rb

@@ -5,6 +5,10 @@ module Account::Controllers::Base
     include LoadsAndAuthorizesResource
     include Fields::ControllerSupport
 
+    if billing_enabled?
+      include Billing::ControllerSupport
+    end
+
     before_action :set_last_seen_at, if: proc {
       user_signed_in? && (current_user.last_seen_at.nil? || current_user.last_seen_at < 1.minute.ago)
     }
@@ -106,6 +110,11 @@ module Account::Controllers::Base
         end
       end
 
+      # TODO Maybe in this context we should check whether `Billing::ControllerSupport` is included instead of just defined?
+      if defined?(Billing::ControllerSupport)
+        enforce_billing_requirements
+        # See `app/controllers/concerns/billing_support.rb` for details.
+      end
     end
 
     true

data/app/helpers/base_helper.rb

@@ -1,6 +1,10 @@
 module BaseHelper
   # TODO This is for the billing package to override, but I feel like there has got to be a better way to do this.
   def hide_team_resource_menus?
-    false
+    if billing_enabled?
+      current_team.needs_billing_subscription?
+    else
+      false
+    end
   end
 end

data/app/models/concerns/memberships/base.rb

@@ -29,6 +29,11 @@ module Memberships::Base
     scope :current_and_invited, -> { includes(:invitation).where("user_id IS NOT NULL OR invitations.id IS NOT NULL").references(:invitation) }
     scope :current, -> { where("user_id IS NOT NULL") }
     scope :tombstones, -> { includes(:invitation).where("user_id IS NULL AND invitations.id IS NULL").references(:invitation) }
+
+    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
+    if billing_enabled?
+      scope :billable, -> { current }
+    end
   end
 
   def name

data/app/models/concerns/records/base.rb

@@ -28,6 +28,14 @@ module Records::Base
     scope :newest_updated, -> { order("updated_at DESC") }
     scope :oldest_updated, -> { order("updated_at ASC") }
 
+    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
+    if billing_enabled?
+      # By default, any model in a collection is considered active for billing purposes.
+      # This can be overloaded in the child model class to specify more specific criteria for billing.
+      # See `app/models/concerns/memberships/base.rb` for an example.
+      scope :billable, -> { order("TRUE") }
+    end
+
     # Microscope adds useful scopes targeting ActiveRecord `boolean`, `date` and `datetime` attributes.
     # https://github.com/mirego/microscope
     acts_as_microscope

data/app/models/concerns/teams/base.rb

@@ -18,6 +18,17 @@ module Teams::Base
     # integrations
     has_many :integrations_stripe_installations, class_name: "Integrations::StripeInstallation", dependent: :destroy if stripe_enabled?
 
+    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
+    if billing_enabled?
+      # subscriptions
+      has_many :billing_subscriptions, class_name: "Billing::Subscription", dependent: :destroy, foreign_key: :team_id
+
+      # TODO We need a way for `bullet_train-billing-stripe` to define these.
+      if defined?(Billing::Stripe::Subscription)
+        has_many :billing_stripe_subscriptions, class_name: "Billing::Stripe::Subscription", dependent: :destroy, foreign_key: :team_id
+      end
+    end
+
     # validations
     validates :name, presence: true
     validates :time_zone, inclusion: {in: ActiveSupport::TimeZone.all.map(&:name)}, allow_nil: true
@@ -48,4 +59,12 @@ module Teams::Base
     # generic functions need to function for a team model as well, so we do this.
     self
   end
+
+  # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
+  if billing_enabled?
+    def needs_billing_subscription?
+      return false if freemium_enabled?
+      billing_subscriptions.active.empty?
+    end
+  end
 end

data/config/locales/en/billing/products.en.yml

@@ -0,0 +1,17 @@
+en:
+  billing/products:
+    free:
+      name: Free
+    basic:
+      name: Basic
+      description: This is an example plan that includes a free trial when paid for monthly.
+      features:
+        - Demonstrates pricing per team member.
+        - Allows creation of up to fifty "Creative Concepts".
+        - Soft enforcement that limit.
+    pro:
+      name: Pro
+      description: An improved example plan that demonstrates different features.
+      features:
+        - Demonstrates a fixed price for up to ten team members.
+        - Allows creation of an unlimited number of "Creative Concepts".

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.0.81"
+  VERSION = "1.0.83"
 end

data/lib/bullet_train.rb

@@ -61,7 +61,12 @@ def inbound_email_enabled?
   ENV["INBOUND_EMAIL_DOMAIN"].present?
 end
 
-def subscriptions_enabled?
+def billing_enabled?
+  defined?(BulletTrain::Billing)
+end
+
+# TODO This should be in an initializer or something.
+def billing_subscription_creation_disabled?
   false
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.0.81
+  version: 1.0.83
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -556,6 +556,7 @@ files:
 - config/initializers/concerns/inflections_base.rb
 - config/initializers/concerns/turbo_failure_app.rb
 - config/locales/en/base.yml
+- config/locales/en/billing/products.en.yml
 - config/locales/en/devise.en.yml
 - config/locales/en/doorkeeper.en.yml
 - config/locales/en/invitations.en.yml