solidus_core 3.2.5 → 3.3.0

data/app/models/spree/promotion/order_adjustments_recalculator.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Spree
+  class Promotion < Spree::Base
+
+    # This class encapsulates all the things the promotion system does to
+    # an order. It is called from the `Spree::OrderUpdater` before taxes are
+    # calculated, such that taxes always respect promotions.
+
+    # This class iterates over all existing promotion adjustments and recalculates
+    # their amount and eligibility using their adjustment source.
+    class OrderAdjustmentsRecalculator
+      def initialize(order)
+        @order = order
+      end
+
+      def call
+        all_items = line_items + shipments
+        all_items.each do |item|
+          promotion_adjustments = item.adjustments.select(&:promotion?)
+
+          promotion_adjustments.each { |adjustment| recalculate(adjustment) }
+          Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
+
+          item.promo_total = promotion_adjustments.select(&:eligible?).sum(&:amount)
+        end
+        # Update and select the best promotion adjustment for the order.
+        # We don't update the order.promo_total yet. Order totals are updated later
+        # in #update_adjustment_total since they include the totals from the order's
+        # line items and/or shipments.
+        order_promotion_adjustments = order.adjustments.select(&:promotion?)
+        order_promotion_adjustments.each { |adjustment| recalculate(adjustment) }
+        Spree::Config.promotion_chooser_class.new(order_promotion_adjustments).update
+
+        order.promo_total = all_items.sum(&:promo_total) +
+                            order_promotion_adjustments.
+                              select(&:eligible?).
+                              select(&:promotion?).
+                              sum(&:amount)
+        order
+      end
+
+      private
+
+      attr_reader :order
+      delegate :line_items, :shipments, to: :order
+
+      # Recalculate and persist the amount from this adjustment's source based on
+      # the adjustable ({Order}, {Shipment}, or {LineItem})
+      #
+      # If the adjustment has no source (such as when created manually from the
+      # admin) or is closed, this is a noop.
+      #
+      # @return [BigDecimal] New amount of this adjustment
+      def recalculate(adjustment)
+        if adjustment.finalized?
+          return adjustment.amount
+        end
+
+        # If the adjustment has no source, do not attempt to re-calculate the
+        # amount.
+        # Some scenarios where this happens:
+        #   - Adjustments that are manually created via the admin backend
+        #   - PromotionAction adjustments where the PromotionAction was deleted
+        #     after the order was completed.
+        if adjustment.source.present?
+          adjustment.amount = adjustment.source.compute_amount(adjustment.adjustable)
+
+          adjustment.eligible = calculate_eligibility(adjustment)
+
+          # Persist only if changed
+          # This is only not a save! to avoid the extra queries to load the order
+          # (for validations) and to touch the adjustment.
+          adjustment.update_columns(eligible: adjustment.eligible, amount: adjustment.amount, updated_at: Time.current) if adjustment.changed?
+        end
+        adjustment.amount
+      end
+
+      # Calculates based on attached promotion (if this is a promotion
+      # adjustment) whether this promotion is still eligible.
+      # @api private
+      # @return [true,false] Whether this adjustment is eligible
+      def calculate_eligibility(adjustment)
+        if !adjustment.finalized? && adjustment.source
+          adjustment.source.promotion.eligible?(adjustment.adjustable, promotion_code: adjustment.promotion_code)
+        else
+          adjustment.eligible?
+        end
+      end
+    end
+  end
+end

data/app/models/spree/promotion.rb

@@ -52,8 +52,8 @@ module Spree
     end
     scope :applied, -> { joins(:order_promotions).distinct }
 
-    self.whitelisted_ransackable_associations = ['codes']
-    self.whitelisted_ransackable_attributes = %w[name path promotion_category_id]
+    self.allowed_ransackable_associations = ['codes']
+    self.allowed_ransackable_attributes = %w[name path promotion_category_id]
     def self.ransackable_scopes(*)
       %i(active)
     end

data/app/models/spree/promotion_code.rb

@@ -11,7 +11,7 @@ class Spree::PromotionCode < Spree::Base
   validates :promotion, presence: true
   validate :promotion_not_apply_automatically, on: :create
 
-  self.whitelisted_ransackable_attributes = ['value']
+  self.allowed_ransackable_attributes = ['value']
 
   # Whether the promotion code has exceeded its usage restrictions
   #

data/app/models/spree/property.rb

@@ -11,7 +11,7 @@ module Spree
 
     after_touch :touch_all_products
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     private
 

data/app/models/spree/return_authorization.rb

@@ -27,7 +27,7 @@ module Spree
     extend DisplayMoney
     money_methods :amount, :total_excluding_vat
 
-    self.whitelisted_ransackable_attributes = ['memo']
+    self.allowed_ransackable_attributes = ['memo']
 
     def total_excluding_vat
       return_items.sum(&:total_excluding_vat)

data/app/models/spree/shipment.rb

@@ -41,8 +41,8 @@ module Spree
 
     include ::Spree::Config.state_machines.shipment
 
-    self.whitelisted_ransackable_associations = ['order']
-    self.whitelisted_ransackable_attributes = ['number']
+    self.allowed_ransackable_associations = ['order']
+    self.allowed_ransackable_attributes = ['number']
 
     delegate :tax_category, :tax_category_id, to: :selected_shipping_rate, allow_nil: true
 

data/app/models/spree/state.rb

@@ -15,7 +15,7 @@ module Spree
       )
     end
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     # table of { country.id => [ state.id , state.name ] }, arrays sorted by name
     # blank is added elsewhere, if needed

data/app/models/spree/stock_item.rb

@@ -20,7 +20,7 @@ module Spree
     after_save :conditional_variant_touch, if: :saved_changes?
     after_touch { variant.touch }
 
-    self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+    self.allowed_ransackable_attributes = ['count_on_hand', 'stock_location_id']
 
     # @return [Array<Spree::InventoryUnit>] the backordered inventory units
     #   associated with this stock item

data/app/models/spree/stock_location.rb

@@ -31,7 +31,7 @@ module Spree
     after_create :create_stock_items, if: :propagate_all_variants?
     after_save :ensure_one_default
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name

data/app/models/spree/stock_movement.rb

@@ -13,8 +13,8 @@ module Spree
 
     scope :recent, -> { order(created_at: :desc) }
 
-    self.whitelisted_ransackable_associations = %w[variant]
-    self.whitelisted_ransackable_attributes = ['quantity']
+    self.allowed_ransackable_associations = %w[variant]
+    self.allowed_ransackable_attributes = ['quantity']
 
     def readonly?
       !new_record?

data/app/models/spree/store_credit_prioritizer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Spree
+  class StoreCreditPrioritizer
+    def initialize(credits, _order)
+      @credits = credits
+    end
+
+    def call
+      credits.order_by_priority
+    end
+
+    private
+
+    attr_reader :credits
+  end
+end

data/app/models/spree/tax/tax_helpers.rb

@@ -6,9 +6,9 @@ module Spree
       private
 
       def rates_for_item(item)
-        @rates_for_order ||= Spree::TaxRate.for_address(item.order.tax_address)
+        @rates_for_item ||= Spree::TaxRate.item_level.for_address(item.order.tax_address)
 
-        @rates_for_order.select do |rate|
+        @rates_for_item.select do |rate|
           rate.active? && rate.tax_categories.map(&:id).include?(item.tax_category_id)
         end
       end

data/app/models/spree/tax_calculator/default.rb

@@ -25,6 +25,7 @@ module Spree
       def calculate
         Spree::Tax::OrderTax.new(
           order_id: order.id,
+          order_taxes: order_rates,
           line_item_taxes: line_item_rates,
           shipment_taxes: shipment_rates
         )
@@ -34,6 +35,23 @@ module Spree
 
       attr_reader :order
 
+      # Calculate the order-level taxes.
+      #
+      # @private
+      # @return [Array<Spree::Tax::ItemTax>] calculated taxes for the order
+      def order_rates
+        rates_for_order.map do |rate|
+          amount = rate.compute_amount(order)
+
+          Spree::Tax::ItemTax.new(
+            label: rate.adjustment_label(amount),
+            tax_rate: rate,
+            amount: amount,
+            included_in_price: rate.included_in_price
+          )
+        end
+      end
+
       # Calculate the taxes for line items.
       #
       # @private
@@ -76,6 +94,19 @@ module Spree
           )
         end
       end
+
+      # @private
+      # @return [Array<Spree::TaxRate>] rates that apply to an order
+      def rates_for_order
+        tax_category_ids = Set[
+          *@order.line_items.map(&:tax_category_id),
+          *@order.shipments.map(&:tax_category_id)
+        ]
+        rates = Spree::TaxRate.active.order_level.for_address(@order.tax_address)
+        rates.select do |rate|
+          tax_category_ids.intersect?(rate.tax_category_ids.to_set)
+        end
+      end
     end
   end
 end

data/app/models/spree/tax_rate.rb

@@ -11,6 +11,11 @@ module Spree
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
 
+    enum level: {
+      item: 0,
+      order: 1
+    }, _suffix: true
+
     belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates, optional: true
 
     has_many :tax_rate_tax_categories,
@@ -27,7 +32,7 @@ module Spree
 
     validates :amount, presence: true, numericality: true
 
-    self.whitelisted_ransackable_associations = %w[tax_categories zone]
+    self.allowed_ransackable_associations = %w[tax_categories zone]
 
     # Finds all tax rates whose zones match a given address
     scope :for_address, ->(address) { joins(:zone).merge(Spree::Zone.for_address(address)) }
@@ -113,12 +118,13 @@ module Spree
     def amount_for_adjustment_label
       ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
-        locale: I18n.locale,
-        precision: nil
+        locale: I18n.locale
       )
     end
 
     def translation_key(_amount)
+      return "flat_fee" if calculator.is_a?(Spree::Calculator::FlatFee)
+
       key = included_in_price? ? "vat" : "sales_tax"
       key += "_with_rate" if show_rate_in_label?
       key.to_sym

data/app/models/spree/taxon.rb

@@ -27,7 +27,7 @@ module Spree
 
     include ::Spree::Config.taxon_attachment_module
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     # @return [String] meta_title if set otherwise a string containing the
     #   root name and taxon name

data/app/models/spree/taxonomy.rb

@@ -13,7 +13,7 @@ module Spree
 
     default_scope -> { order(position: :asc) }
 
-    self.whitelisted_ransackable_attributes = %w[name]
+    self.allowed_ransackable_attributes = %w[name]
 
     private
 

data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb

@@ -4,7 +4,7 @@ module Spree
   class UserLastUrlStorer
     module Rules
       # This is the basic rule that ships with Solidus that avoids storing in
-      # session the current path for login/loout/signup routes, avoiding possibly
+      # session the current path for login/logout/signup routes, avoiding possibly
       # infinte redirects.
       module AuthenticationRule
         AUTHENTICATION_ROUTES = %w[spree_signup_path spree_login_path spree_logout_path]

data/app/models/spree/variant.rb

@@ -30,11 +30,14 @@ module Spree
 
     belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants_including_master, optional: false
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :shipping_category, class_name: "Spree::ShippingCategory", optional: true
 
     delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
-             :shipping_category_id, :meta_description, :meta_keywords, :shipping_category,
+             :meta_description, :meta_keywords,
              to: :product
     delegate :tax_category, to: :product, prefix: true
+    delegate :shipping_category, :shipping_category_id,
+      to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
 
     has_many :inventory_units, inverse_of: :variant
@@ -110,8 +113,8 @@ module Spree
       joins(:stock_items).where(arel_conditions.inject(:or)).distinct
     end
 
-    self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
-    self.whitelisted_ransackable_attributes = %w[weight sku]
+    self.allowed_ransackable_associations = %w[option_values product prices default_price]
+    self.allowed_ransackable_attributes = %w[weight sku]
 
     # Returns variants that have a price for the given pricing options
     # If you have modified the pricing options class, you might want to modify this scope too.
@@ -142,6 +145,23 @@ module Spree
       super || product_tax_category
     end
 
+    # @return [Spree::ShippingCategory] the variant's shipping category
+    #
+    # This returns the product's shipping category if the shipping category ID on the variant is nil. It looks
+    # like an association, but really is an override.
+    #
+    def shipping_category
+      super || product_shipping_category
+    end
+
+    # @return [Integer] the variant's shipping category id
+    #
+    # This returns the product's shipping category if if the shipping category ID on the variant is nil.
+    #
+    def shipping_category_id
+      super || product_shipping_category_id
+    end
+
     # Sets the cost_price for the variant.
     #
     # @param price [Any] the price to set
@@ -210,8 +230,8 @@ module Spree
 
     # Assign given options hash to option values.
     #
-    # @param options [Array] array of hashes with a name and value.
-    def options=(options = {})
+    # @param options [Array<Hash{name: String, value: String}>] array of hashes with a name and value.
+    def options=(options = [])
       options.each do |option|
         set_option_value(option[:name], option[:value])
       end

data/app/models/spree/zone.rb

@@ -42,7 +42,7 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |member| member['zoneable_id'].blank? }
 
-    self.whitelisted_ransackable_attributes = %w[name description]
+    self.allowed_ransackable_attributes = %w[name description]
 
     # Returns all zones that contain any of the zone members of the zone passed
     # in. This also includes any country zones that contain the state of the

data/config/locales/en.yml

@@ -415,6 +415,7 @@ en:
         depth: Depth
         height: Height
         price: Price
+        shipping_category: Variant Shipping Category
         sku: SKU
         tax_category: Variant Tax Category
         weight: Weight
@@ -527,6 +528,9 @@ en:
       spree/calculator/distributed_amount:
         one: Distributed Amount
         other: Distributed Amount
+      spree/calculator/flat_fee:
+        one: Flat Fee
+        other: Flat Fee
       spree/calculator/flat_percent_item_total:
         one: Flat Percent
         other: Flat Percent
@@ -751,6 +755,10 @@ en:
       not_saved:
         one: '1 error prohibited this %{resource} from being saved:'
         other: "%{count} errors prohibited this %{resource} from being saved:"
+  number:
+    percentage:
+      format:
+        precision: 1
   spree:
     abbreviation: Abbreviation
     accept: Accept
@@ -813,6 +821,7 @@ en:
       line_item: "%{promotion} (%{promotion_name})"
       order: "%{promotion} (%{promotion_name})"
       tax_rates:
+        flat_fee: "%{name}"
         sales_tax: "%{name}"
         sales_tax_with_rate: "%{name} %{amount}"
         vat: "%{name} (Included in Price)"
@@ -989,6 +998,7 @@ en:
           pricing: Pricing
           pricing_hint: These values are populated from the product details page and can be overridden below
           properties: Properties
+          use_product_shipping_category: Use Product Shipping Category
           use_product_tax_category: Use Product Tax Category
         new:
           new_variant: New Variant
@@ -1600,7 +1610,7 @@ en:
       spree/calculator:
         promotions: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
         shipping_methods: This is used to calculate the shipping rates on a per order or per package rate.
-        tax_rates: This is used to calculate both sales tax (United States-style taxes) and value-added tax (VAT). Typically this calculator should be the only tax calculator required by your store.
+        tax_rates: The "Default Tax" calculator is used for both sales tax (United States-style taxes) and value-added tax (VAT). Typically this calculator should be the only tax calculator required by your store. "Flat Fee" can be used for any taxes that require a flat fee be charged to the customer.
       spree/price:
         country: 'This determines in what country the price is valid.<br/>Default: Any Country'
         master_variant: Changing master variant prices will not change variant prices below, but will be used to populate all new variants
@@ -1631,11 +1641,13 @@ en:
       spree/tax_category:
         is_default: When checked, this tax category will be selected by default when creating new products or variants.
       spree/tax_rate:
+        tax_rate_level: Item-level taxes will be applied as adjustments on line items and shipments. Order-level taxes will create an adjustment on the order. Care should be taken when chosing order-level adjustments as they aren't considered in refunds or in discounts. The default is item-level.
         validity_period: This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br /> If no start date value is specified, the tax rate will be immediately available. <br /> If no expiration date value is specified, the tax rate will never expire
       spree/variant:
         deleted: Deleted Variant
         deleted_explanation: This variant was deleted on %{date}.
         deleted_explanation_with_replacement: This variant was deleted on %{date}. It has since been replaced by another with the same SKU.
+        shipping_category: 'This determines what kind of shipping this variant requires.<br/> Default: Use shipping category of the product associated with this variant'
         tax_category: 'This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant'
     home: Home
     i18n:
@@ -1694,6 +1706,7 @@ en:
     iso_name: Iso Name
     item: Item
     item_description: Item Description
+    item_level: Item-level
     item_total: Item Total
     item_total_rule:
       operators:
@@ -1872,6 +1885,7 @@ en:
     order_details: Order Details
     order_email_resent: Order Email Resent
     order_information: Order Information
+    order_level: Order-level
     order_mailer:
       cancel_email:
         dear_customer: Dear Customer,
@@ -2288,7 +2302,8 @@ en:
     tax_category: Tax Category
     tax_code: Tax Code
     tax_included: Tax (incl.)
-    tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)
+    tax_rate_amount_explanation: When using the "Default Tax" calculator, the amount is treated as a decimal amount to aid in calculations. (i.e. If the tax rate is 5% then enter 0.05) If using the "Flat Fee" calculator, the amount is used for the static fee.
+    tax_rate_level: Tax Rate Level
     tax_rates: Tax Rates
     taxon: Taxon
     taxon_attachment_removal_error: There was an error removing the attachment

data/db/migrate/20220805202442_add_level_to_spree_tax_rates.rb

@@ -0,0 +1,5 @@
+class AddLevelToSpreeTaxRates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_tax_rates, :level, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20221123152807_add_shipping_category_to_spree_variants.rb

@@ -0,0 +1,5 @@
+class AddShippingCategoryToSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :spree_variants, :shipping_category, index: true
+  end
+end

data/db/seeds.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'thor'
+shell = Thor::Base.shell.new
+
 %w(
   stores
   store_credit
@@ -12,6 +15,6 @@
   roles
   shipping_categories
 ).each do |seed|
-  puts "Loading seed file: #{seed}"
+  shell.say_status :seed, seed
   require_relative "default/spree/#{seed}"
 end

data/lib/generators/solidus/install/app_templates/authentication/custom.rb

@@ -0,0 +1,21 @@
+initializer 'spree_authentication.rb', <<~RUBY
+  # Please replace this module with your own implementation of
+  # ApplicationController#spree_current_user.
+  #
+  # The current setup will allow doing guest checkouts.
+  ActiveSupport.on_load(:action_controller) do
+    def spree_current_user
+      # Define here your custom logic for retrieving the current user
+      nil
+    end
+  end
+
+  # Re-raise the original authorization error on anauthorized access
+  Rails.application.config.to_prepare do
+    Spree::BaseController.unauthorized_redirect = -> { raise "Define the behavior for unauthorized access in \#{__FILE__}." }
+  end
+RUBY
+
+create_file 'app/views/spree/admin/shared/_navigation_footer.html.erb', <<~ERB
+  <!-- Add here your login/logout links in 'app/views/spree/admin/shared/_navigation_footer.html.erb'. -->
+ERB

data/lib/generators/solidus/install/app_templates/authentication/devise.rb

@@ -0,0 +1,16 @@
+# Skip if already in the gemfile
+if Bundler.locked_gems.dependencies['solidus_auth_devise']
+  say_status :skipping, 'solidus_auth_devise is already in the gemfile'
+else
+  bundle_command("add solidus_auth_devise")
+end
+
+if options[:auto_accept]
+  migrations_flag = options[:migrate] ? '--auto-run-migrations' : '--skip-migrations'
+end
+
+generate "solidus:auth:install #{migrations_flag}"
+
+append_file "db/seeds.rb", <<~RUBY
+  Spree::Auth::Engine.load_seed
+RUBY

data/lib/generators/solidus/install/app_templates/authentication/existing.rb

@@ -0,0 +1,10 @@
+user_class = options[:user_class] || 'Spree::User'
+
+begin
+  user_class.classify.constantize
+rescue NameError
+  say_status :error, "Can't find an existing user class named #{user_class.classify}, plese set up one before using this authentication option.", :red
+  abort
+end
+
+generate "spree:custom_user #{user_class.shellescape}"

data/lib/generators/solidus/install/app_templates/authentication/none.rb

@@ -0,0 +1 @@
+# noop

data/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb

@@ -0,0 +1,54 @@
+# # This will unpack the solidus gem into its components without calling `bundle install`.
+#
+# # Nothing to do if the `solidus` gem is not there.
+solidus = Bundler.locked_gems.dependencies['solidus'] or return
+
+# Write and remove into and from a Gemfile
+#
+# This custom injector fixes support for path, git and custom sources,
+# which is missing in bundler's upstream injector for a dependency fetched
+# with `Bundler.locked_gems.dependencies`.
+bundler_injector = Class.new(Bundler::Injector) do
+  def build_gem_lines(conservative_versioning)
+    @deps.map do |d|
+      name = d.name.dump
+      is_local = d.source.instance_of?(Bundler::Source::Path)
+      is_git = d.source.instance_of?(Bundler::Source::Git)
+
+      requirement = if is_local
+                      ", path: \"#{d.source.path}\""
+                    elsif is_git
+                      ", git: \"#{d.git}\"".then { |g| d.ref ? g + ", ref: \"#{d.ref}\"" : g }
+                    elsif conservative_versioning
+                      ", \"#{conservative_version(@definition.specs[d.name][0])}\""
+                    else
+                      ", #{d.requirement.as_list.map(&:dump).join(", ")}"
+                    end
+
+      source = ", source: \"#{d.source.remotes.join(",")}\"" unless is_local || is_git || d.source.nil?
+
+      %(gem #{name}#{requirement}#{source})
+    end.join("\n")
+  end
+end
+
+to_dependency = ->(component) do
+  Bundler::Dependency.new(
+    component,
+    solidus.requirement,
+    "source" => solidus.source,
+    "git" => solidus.source.try(:uri),
+    "ref" => solidus.source.try(:ref),
+  )
+end
+
+bundler_injector.inject(%w[
+  solidus_core
+  solidus_backend
+  solidus_api
+  solidus_sample
+].map(&to_dependency))
+
+bundler_injector.remove(%w[
+  solidus
+])

data/lib/generators/solidus/install/app_templates/frontend/classic.rb

@@ -0,0 +1,16 @@
+solidus = Bundler.locked_gems.dependencies['solidus']
+
+if Bundler.locked_gems.dependencies['solidus_frontend']
+  say_status :skipping, "solidus_frontend is already in the bundle", :blue
+else
+  # `solidus_frontend` is not sourced from rubygems if the solidus gem was not.
+  github_solidus_frontend = '--github solidusio/solidus_frontend' unless solidus.nil? || solidus.source.is_a?(Bundler::Source::Rubygems)
+
+  bundle_command("add solidus_frontend #{github_solidus_frontend}")
+end
+
+# Disable solidus_bolt installation from solidus_frontend as it can be
+# explicitly selected directly from the solidus installer.
+with_env('SKIP_SOLIDUS_BOLT' => 'true') do
+  generate 'solidus_frontend:install'
+end