solidus_core 3.1.8 → 3.2.0.alpha

data/config/locales/en.yml

@@ -365,7 +365,7 @@ en:
         amount_authorized: Amount Authorized
         amount_credited: Amount Credited
         amount_used: Amount Used
-        category_id: Credit Type
+        category_id: Category
         created_at: Issued On
         created_by_id: Created By
         invalidated_at: Invalidated
@@ -866,6 +866,10 @@ en:
           new_price: New Price
         new:
           new_price: New Price
+        master_variant_table:
+          master_variant: Master Variant Prices
+        table:
+          variant_pricing: Variant Prices
       promotions:
         actions:
           calculator_label: Calculated by
@@ -998,9 +1002,11 @@ en:
           edit_variant: Edit Variant
         form:
           dimensions: Dimensions
+          options: Options
           pricing: Pricing
           pricing_hint: These values are populated from the product details page and
             can be overridden below
+          properties: Properties
           use_product_tax_category: Use Product Tax Category
         new:
           new_variant: New Variant
@@ -1172,257 +1178,10 @@ en:
     country_based: Country Based
     country_name: Name
     country_names:
-      AD: Andorra
-      AE: United Arab Emirates
-      AF: Afghanistan
-      AG: Antigua and Barbuda
-      AI: Anguilla
-      AL: Albania
-      AM: Armenia
-      AO: Angola
-      AQ: Antarctica
-      AR: Argentina
-      AS: American Samoa
-      AT: Austria
-      AU: Australia
-      AW: Aruba
-      AX: Åland Islands
-      AZ: Azerbaijan
-      BA: Bosnia and Herzegovina
-      BB: Barbados
-      BD: Bangladesh
-      BE: Belgium
-      BF: Burkina Faso
-      BG: Bulgaria
-      BH: Bahrain
-      BI: Burundi
-      BJ: Benin
-      BL: Saint Barthélemy
-      BM: Bermuda
-      BN: Brunei Darussalam
-      BO: Bolivia, Plurinational State of
-      BQ: Bonaire, Sint Eustatius and Saba
-      BR: Brazil
-      BS: Bahamas
-      BT: Bhutan
-      BV: Bouvet Island
-      BW: Botswana
-      BY: Belarus
-      BZ: Belize
       CA: Canada
-      CC: Cocos (Keeling) Islands
-      CD: Congo, The Democratic Republic of the
-      CF: Central African Republic
-      CG: Congo
-      CH: Switzerland
-      CI: Côte d'Ivoire
-      CK: Cook Islands
-      CL: Chile
-      CM: Cameroon
-      CN: China
-      CO: Colombia
-      CR: Costa Rica
-      CU: Cuba
-      CV: Cabo Verde
-      CW: Curaçao
-      CX: Christmas Island
-      CY: Cyprus
-      CZ: Czechia
-      DE: Germany
-      DJ: Djibouti
-      DK: Denmark
-      DM: Dominica
-      DO: Dominican Republic
-      DZ: Algeria
-      EC: Ecuador
-      EE: Estonia
-      EG: Egypt
-      EH: Western Sahara
-      ER: Eritrea
-      ES: Spain
-      ET: Ethiopia
-      FI: Finland
-      FJ: Fiji
-      FK: Falkland Islands (Malvinas)
-      FM: Micronesia, Federated States of
-      FO: Faroe Islands
-      FR: France
       FRA: France
-      GA: Gabon
-      GB: United Kingdom
-      GD: Grenada
-      GE: Georgia
-      GF: French Guiana
-      GG: Guernsey
-      GH: Ghana
-      GI: Gibraltar
-      GL: Greenland
-      GM: Gambia
-      GN: Guinea
-      GP: Guadeloupe
-      GQ: Equatorial Guinea
-      GR: Greece
-      GS: South Georgia and the South Sandwich Islands
-      GT: Guatemala
-      GU: Guam
-      GW: Guinea-Bissau
-      GY: Guyana
-      HK: Hong Kong
-      HM: Heard Island and McDonald Islands
-      HN: Honduras
-      HR: Croatia
-      HT: Haiti
-      HU: Hungary
-      ID: Indonesia
-      IE: Ireland
-      IL: Israel
-      IM: Isle of Man
-      IN: India
-      IO: British Indian Ocean Territory
-      IQ: Iraq
-      IR: Iran, Islamic Republic of
-      IS: Iceland
-      IT: Italy
       ITA: Italy
-      JE: Jersey
-      JM: Jamaica
-      JO: Jordan
-      JP: Japan
-      KE: Kenya
-      KG: Kyrgyzstan
-      KH: Cambodia
-      KI: Kiribati
-      KM: Comoros
-      KN: Saint Kitts and Nevis
-      KP: Korea, Democratic People's Republic of
-      KR: Korea, Republic of
-      KW: Kuwait
-      KY: Cayman Islands
-      KZ: Kazakhstan
-      LA: Lao People's Democratic Republic
-      LB: Lebanon
-      LC: Saint Lucia
-      LI: Liechtenstein
-      LK: Sri Lanka
-      LR: Liberia
-      LS: Lesotho
-      LT: Lithuania
-      LU: Luxembourg
-      LV: Latvia
-      LY: Libya
-      MA: Morocco
-      MC: Monaco
-      MD: Moldova, Republic of
-      ME: Montenegro
-      MF: Saint Martin (French part)
-      MG: Madagascar
-      MH: Marshall Islands
-      MK: North Macedonia
-      ML: Mali
-      MM: Myanmar
-      MN: Mongolia
-      MO: Macao
-      MP: Northern Mariana Islands
-      MQ: Martinique
-      MR: Mauritania
-      MS: Montserrat
-      MT: Malta
-      MU: Mauritius
-      MV: Maldives
-      MW: Malawi
-      MX: Mexico
-      MY: Malaysia
-      MZ: Mozambique
-      NA: Namibia
-      NC: New Caledonia
-      NE: Niger
-      NF: Norfolk Island
-      NG: Nigeria
-      NI: Nicaragua
-      NL: Netherlands
-      'NO': Norway
-      NP: Nepal
-      NR: Nauru
-      NU: Niue
-      NZ: New Zealand
-      OM: Oman
-      PA: Panama
-      PE: Peru
-      PF: French Polynesia
-      PG: Papua New Guinea
-      PH: Philippines
-      PK: Pakistan
-      PL: Poland
-      PM: Saint Pierre and Miquelon
-      PN: Pitcairn
-      PR: Puerto Rico
-      PS: Palestine, State of
-      PT: Portugal
-      PW: Palau
-      PY: Paraguay
-      QA: Qatar
-      RE: Réunion
-      RO: Romania
-      RS: Serbia
-      RU: Russia
-      RW: Rwanda
-      SA: Saudi Arabia
-      SB: Solomon Islands
-      SC: Seychelles
-      SD: Sudan
-      SE: Sweden
-      SG: Singapore
-      SH: Saint Helena, Ascension and Tristan da Cunha
-      SI: Slovenia
-      SJ: Svalbard and Jan Mayen
-      SK: Slovakia
-      SL: Sierra Leone
-      SM: San Marino
-      SN: Senegal
-      SO: Somalia
-      SR: Suriname
-      SS: South Sudan
-      ST: Sao Tome and Principe
-      SV: El Salvador
-      SX: Sint Maarten (Dutch part)
-      SY: Syrian Arab Republic
-      SZ: Eswatini
-      TC: Turks and Caicos Islands
-      TD: Chad
-      TF: French Southern Territories
-      TG: Togo
-      TH: Thailand
-      TJ: Tajikistan
-      TK: Tokelau
-      TL: Timor-Leste
-      TM: Turkmenistan
-      TN: Tunisia
-      TO: Tonga
-      TR: Turkey
-      TT: Trinidad and Tobago
-      TV: Tuvalu
-      TW: Taiwan
-      TZ: Tanzania, United Republic of
-      UA: Ukraine
-      UG: Uganda
-      UM: United States Minor Outlying Islands
       US: United States of America
-      UY: Uruguay
-      UZ: Uzbekistan
-      VA: Holy See (Vatican City State)
-      VC: Saint Vincent and the Grenadines
-      VE: Venezuela, Bolivarian Republic of
-      VG: Virgin Islands, British
-      VI: Virgin Islands, U.S.
-      VN: Vietnam
-      VU: Vanuatu
-      WF: Wallis and Futuna
-      WS: Samoa
-      YE: Yemen
-      YT: Mayotte
-      ZA: South Africa
-      ZM: Zambia
-      ZW: Zimbabwe
     coupon: Coupon
     coupon_code: Coupon code
     coupon_code_already_applied: The coupon code has already been applied to this
@@ -2497,7 +2256,6 @@ en:
     value: Value
     variant: Variant
     variant_placeholder: Choose a Variant
-    variant_pricing: Variant Pricing
     variant_properties: Variant Properties
     variant_search: Variant Search
     variant_search_placeholder: SKU or Option Value

data/db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTypeBeforeRemovalToSpreePaymentMethods < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_payment_methods, :type_before_removal, :string
+  end
+end

data/db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SetPromotionsWithAnyPolicyToAllIfPossible < ActiveRecord::Migration[5.2]
+  def up
+    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
+      if promotion.promotion_rules.length <= 1
+        promotion.update!(match_policy: :all)
+      else
+        raise StandardError, <<~MSG
+          You have promotions with a match policy of any and more than one rule. Please
+          run `bundle exec rake solidus:split_promotions_with_any_match_policy`.
+        MSG
+      end
+    end
+  end
+
+  def down
+    # No-Op
+  end
+end

data/lib/generators/solidus/install/install_generator/bundler_context.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    # Bundler context during the install process.
+    #
+    # This class gives access to information about the bundler context in which
+    # the install generator is run. I.e., which solidus components are present
+    # in the user's Gemfile. It also allows modifying the Gemfile to add or
+    # remove gems.
+    #
+    # @api private
+    class BundlerContext
+      # 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 `Bundled.locked_gems.dependencies`.
+      #
+      # @api private
+      class InjectorWithPathSupport < Bundler::Injector
+        private 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}\"".yield_self { |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
+
+      attr_reader :dependencies, :injector
+
+      def self.bundle_cleanly(&block)
+        Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+      end
+
+      def initialize
+        @dependencies = Bundler.locked_gems.dependencies
+        @injector = InjectorWithPathSupport
+      end
+
+      def solidus_in_gemfile?
+        !solidus_dependency.nil?
+      end
+
+      def component_in_gemfile?(name)
+        !@dependencies["solidus_#{name}"].nil?
+      end
+
+      def break_down_components(components)
+        raise <<~MSG  unless solidus_in_gemfile?
+          solidus meta gem needs to be present in the Gemfile to build the component dependency
+        MSG
+
+        @injector.inject(
+          components.map { |component| dependency_for_component(component) }
+        )
+      end
+
+      def remove(*args, **kwargs, &block)
+        @injector.remove(*args, **kwargs, &block)
+      end
+
+      private
+
+      def dependency_for_component(component)
+        Bundler::Dependency.new(
+          "solidus_#{component}",
+          solidus_dependency.requirement,
+          {
+            "source" => solidus_dependency.source,
+            "git" => solidus_dependency.source.try(:uri),
+            "ref" => solidus_dependency.source.try(:ref)
+          }
+        )
+      end
+
+      def solidus_dependency
+        @dependencies['solidus']
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator/install_frontend.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    class InstallFrontend
+      attr_reader :bundler_context,
+                  :generator_context
+
+      def initialize(bundler_context:, generator_context:)
+        @bundler_context = bundler_context
+        @generator_context = generator_context
+      end
+
+      def call(frontend, installer_adds_auth:)
+        case frontend
+        when 'solidus_frontend'
+          install_solidus_frontend
+        when 'solidus_starter_frontend'
+          install_solidus_starter_frontend(installer_adds_auth)
+        end
+      end
+
+      private
+
+      def install_solidus_frontend
+        unless @bundler_context.component_in_gemfile?(:frontend)
+          BundlerContext.bundle_cleanly do
+            `bundle add solidus_frontend`
+            `bundle install`
+          end
+        end
+
+        @generator_context.generate('solidus_frontend:install')
+      end
+
+      def install_solidus_starter_frontend(installer_adds_auth)
+        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+
+        # TODO: Move installation of solidus_auth_devise to the
+        # solidus_starter_frontend template
+        BundlerContext.bundle_cleanly { `bundle add solidus_auth_devise` } unless auth_present?(installer_adds_auth)
+        `LOCATION="https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/main/template.rb" bin/rails app:template`
+      end
+
+      def auth_present?(installer_adds_auth)
+        installer_adds_auth || @bundler_context.component_in_gemfile?(:auth_devise)
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Solidus
+  class InstallGenerator < Rails::Generators::Base
+    # Helper for extracting solidus_frontend from solidus meta-gem
+    #
+    # We're recommending users use newer solidus_starter_frontend. However,
+    # we're still shipping solidus_frontend as part of the solidus meta-gem. The
+    # reason is that we don't want users updating previous versions to see its
+    # storefront gone suddenly.
+    #
+    # In future solidus releases, solidus_frontend won't be a component anymore.
+    # However, until that happens:
+    #
+    # - For users of the new frontend, we need to prevent pulling
+    # solidus_frontend.
+    # - For users of the legacy frontend, we need to prevent Bundler from
+    # resolving it from the mono-repo while it's still there.
+    #
+    # This class is a needed companion during the deprecation
+    # path. It'll modify the user's Gemfile, breaking the solidus gem down into
+    # its components but solidus_frontend.
+    class SupportSolidusFrontendExtraction
+      attr_reader :bundler_context
+
+      def initialize(bundler_context:)
+        @bundler_context = bundler_context
+      end
+
+      def call
+        return unless needs_to_break_down_solidus_meta_gem?
+
+        break_down_solidus_meta_gem
+      end
+
+      private
+
+      def break_down_solidus_meta_gem
+        @bundler_context.break_down_components(%w[core backend api sample])
+        @bundler_context.remove(['solidus'])
+      end
+
+      def needs_to_break_down_solidus_meta_gem?
+        @bundler_context.solidus_in_gemfile?
+      end
+    end
+  end
+end

data/lib/generators/solidus/install/install_generator.rb

@@ -2,16 +2,22 @@
 
 require 'rails/generators'
 require 'rails/version'
+require_relative 'install_generator/bundler_context'
+require_relative 'install_generator/support_solidus_frontend_extraction'
+require_relative 'install_generator/install_frontend'
 
 module Solidus
   # @private
   class InstallGenerator < Rails::Generators::Base
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
-    PAYMENT_METHODS = {
-      'paypal' => 'solidus_paypal_commerce_platform',
-      'none' => nil,
-    }
+    LEGACY_FRONTEND = 'solidus_frontend'
+    DEFAULT_FRONTEND = 'solidus_starter_frontend'
+    FRONTENDS = [
+      DEFAULT_FRONTEND,
+      LEGACY_FRONTEND,
+      'none'
+    ].freeze
 
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
@@ -24,11 +30,11 @@ module Solidus
     class_option :lib_name, type: :string, default: 'spree'
     class_option :with_authentication, type: :boolean, default: true
     class_option :enforce_available_locales, type: :boolean, default: nil
-    class_option :payment_method,
+    class_option :frontend,
                  type: :string,
-                 enum: PAYMENT_METHODS.keys,
-                 default: PAYMENT_METHODS.keys.first,
-                 desc: "Indicates which payment method to install."
+                 enum: FRONTENDS,
+                 default: nil,
+                 desc: "Indicates which frontend to install."
 
     def self.source_paths
       paths = superclass.source_paths
@@ -84,16 +90,10 @@ module Solidus
       empty_directory 'app/assets/images'
 
       %w{javascripts stylesheets images}.each do |path|
-        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
-        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/backend" if defined?(Spree::Backend) || Rails.env.test?
       end
 
-      if defined? Spree::Frontend || Rails.env.test?
-        template "vendor/assets/javascripts/spree/frontend/all.js"
-        template "vendor/assets/stylesheets/spree/frontend/all.css"
-      end
-
-      if defined? Spree::Backend || Rails.env.test?
+      if defined?(Spree::Backend) || Rails.env.test?
         template "vendor/assets/javascripts/spree/backend/all.js"
         template "vendor/assets/stylesheets/spree/backend/all.css"
       end
@@ -104,17 +104,6 @@ module Solidus
     end
 
     def configure_application
-      application <<-RUBY
-    # Load application's model / class decorators
-    initializer 'spree.decorators' do |app|
-      config.to_prepare do
-        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
-          require_dependency(path)
-        end
-      end
-    end
-      RUBY
-
       if !options[:enforce_available_locales].nil?
         application <<-RUBY
     # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
@@ -133,6 +122,9 @@ module Solidus
         Solidus has a default authentication extension that uses Devise.
         You can find more info at https://github.com/solidusio/solidus_auth_devise.
 
+        Regardless of what you answer here, it'll be installed if you choose
+        solidus_starter_frontend as your storefront in a later step.
+
         Would you like to install it? (Y/n)"))
 
         @plugins_to_be_installed << 'solidus_auth_devise'
@@ -140,25 +132,6 @@ module Solidus
       end
     end
 
-    def install_payment_method
-      name = options[:payment_method]
-
-      unless options[:auto_accept]
-        available_names = PAYMENT_METHODS.keys
-
-        name = ask("
-  You can select a payment method to be included in the installation process.
-  Please select a payment method name:", limited_to: available_names, default: available_names.first)
-      end
-
-      gem_name = PAYMENT_METHODS.fetch(name)
-
-      if gem_name
-        @plugins_to_be_installed << gem_name
-        @plugin_generators_to_run << "#{gem_name}:install"
-      end
-    end
-
     def include_seed_data
       append_file "db/seeds.rb", <<-RUBY.strip_heredoc
 
@@ -182,7 +155,7 @@ module Solidus
         gem plugin_name
       end
 
-      bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
+      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
       run "spring stop" if defined?(Spring)
 
       @plugin_generators_to_run.each do |plugin_generator_name|
@@ -190,6 +163,22 @@ module Solidus
       end
     end
 
+    def install_frontend
+      return if options[:frontend] == 'none'
+
+      bundler_context = BundlerContext.new
+
+      frontend = detect_frontend_to_install(bundler_context)
+
+      support_solidus_frontend_extraction(bundler_context) unless frontend == LEGACY_FRONTEND
+
+      say_status :installing, frontend
+
+      InstallFrontend.
+        new(bundler_context: bundler_context, generator_context: self).
+        call(frontend, installer_adds_auth: @plugins_to_be_installed.include?('solidus_auth_devise'))
+    end
+
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
@@ -258,8 +247,26 @@ module Solidus
 
     private
 
-    def bundle_cleanly(&block)
-      Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+    def detect_frontend_to_install(bundler_context)
+      ENV['FRONTEND'] ||
+        options[:frontend] ||
+        (bundler_context.component_in_gemfile?(:frontend) && LEGACY_FRONTEND) ||
+        (options[:auto_accept] && DEFAULT_FRONTEND) ||
+        ask(<<~MSG.indent(8), limited_to: FRONTENDS, default: DEFAULT_FRONTEND)
+
+          Which frontend would you like to use? solidus_starter_frontend is
+          recommended. However, some extensions are still only compatible with
+          the now deprecated solidus_frontend.
+
+        MSG
+    end
+
+    def support_solidus_frontend_extraction(bundler_context)
+      say_status "break down", "solidus"
+
+      SupportSolidusFrontendExtraction.
+        new(bundler_context: bundler_context).
+        call
     end
   end
 end