solidus_core 3.0.2 → 3.1.0

data/app/models/spree/stock/availability.rb

@@ -19,7 +19,7 @@ module Spree
       # Get the on_hand stock quantities
       # @return [Hash<Integer=>Spree::StockQuantities>] A map of stock_location_ids to the stock quantities available in that location
       def on_hand_by_stock_location_id
-        counts_on_hand.to_a.group_by do |(_, stock_location_id), _|
+        quantities_by_location_id = counts_on_hand.to_a.group_by do |(_, stock_location_id), _|
           stock_location_id
         end.transform_values do |values|
           Spree::StockQuantities.new(
@@ -31,12 +31,13 @@ module Spree
             end.to_h
           )
         end
+        restore_location_order(quantities_by_location_id)
       end
 
-      # Get the on_hand stock quantities
+      # Get the backorderable stock quantities
       # @return [Hash<Integer=>Spree::StockQuantities>] A map of stock_location_ids to the stock quantities available in that location
       def backorderable_by_stock_location_id
-        backorderables.group_by(&:second).transform_values do |variant_ids|
+        quantities_by_location_id = backorderables.group_by(&:second).transform_values do |variant_ids|
           Spree::StockQuantities.new(
             variant_ids.map do |variant_id, _|
               variant = @variant_map[variant_id]
@@ -44,6 +45,7 @@ module Spree
             end.to_h
           )
         end
+        restore_location_order(quantities_by_location_id)
       end
 
       private
@@ -67,6 +69,12 @@ module Spree
           where(variant_id: @variants).
           where(stock_location_id: @stock_locations)
       end
+
+      def restore_location_order(quantities_by_location_id)
+        sorted_location_ids = @stock_locations.map(&:id)
+
+        quantities_by_location_id.sort_by { |key, _value| sorted_location_ids.index(key) }.to_h
+      end
     end
   end
 end

data/app/models/spree/stock/simple_coordinator.rb

@@ -92,16 +92,6 @@ module Spree
         end
       end
 
-      def sort_availability(availability)
-        sorted_availability = availability.sort_by do |stock_location_id, _|
-          @stock_locations.find_index do |stock_location|
-            stock_location.id == stock_location_id
-          end
-        end
-
-        Hash[sorted_availability]
-      end
-
       def get_units(quantities)
         # Change our raw quantities back into inventory units
         quantities.flat_map do |variant, quantity|

data/app/models/spree/stock_location.rb

@@ -26,7 +26,7 @@ module Spree
     validates_uniqueness_of :code, allow_blank: true, case_sensitive: false
 
     scope :active, -> { where(active: true) }
-    scope :order_default, -> { order(default: :desc, name: :asc) }
+    scope :order_default, -> { order(default: :desc, position: :asc) }
 
     after_create :create_stock_items, if: :propagate_all_variants?
     after_save :ensure_one_default

data/app/models/spree/store_credit.rb

@@ -150,7 +150,12 @@ class Spree::StoreCredit < Spree::PaymentSource
   end
 
   def generate_authorization_code
-    "#{id}-SC-#{Time.current.utc.strftime('%Y%m%d%H%M%S%6N')}"
+    [
+      id,
+      'SC',
+      Time.current.utc.strftime('%Y%m%d%H%M%S%6N'),
+      SecureRandom.uuid
+    ].join('-')
   end
 
   def editable?

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

@@ -9,7 +9,7 @@ module Spree
     # looking to provide their own calculator should adhere to the API of this
     # class.
     #
-    # @see Spree::Tax::ShippingRateTaxer
+    # @see Spree::Stock::Estimator
     class ShippingRate
       include Spree::Tax::TaxHelpers
 

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -6,8 +6,8 @@ module Spree::Taxon::ActiveStorageAttachment
 
   included do
     has_attachment :icon,
-                   styles: { mini: '32x32>', normal: '128x128>' },
-                   default_style: :mini
+                   styles: Spree::Config.taxon_image_styles,
+                   default_style: Spree::Config.taxon_image_style_default
     validate :icon_is_an_image
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -5,14 +5,14 @@ module Spree::Taxon::PaperclipAttachment
 
   included do
     has_attached_file :icon,
-      styles: { mini: '32x32>', normal: '128x128>' },
-      default_style: :mini,
+      styles: Spree::Config.taxon_image_styles,
+      default_style: Spree::Config.taxon_image_style_default,
       url: '/spree/taxons/:id/:style/:basename.:extension',
       path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
       default_url: '/assets/default_taxon.png'
 
     validates_attachment :icon,
-      content_type: { content_type: %w[image/jpg image/jpeg image/png image/gif] }
+      content_type: { content_type: Spree::Config.allowed_image_mime_types }
   end
 
   def icon_present?

data/app/models/spree/variant/price_selector.rb

@@ -26,11 +26,24 @@ module Spree
       # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
       # @return [Spree::Money, nil] The most specific price for this set of pricing options.
       def price_for(price_options)
+        Spree::Deprecation.warn(
+          "price_for is deprecated and will be removed. The price_for method
+          should return a Spree::Price as described. Please use
+          #price_for_options and adjust your frontend code to explicitly call
+          &.money where required"
+        )
+        price_for_options(price_options)&.money
+      end
+
+      # The variant's Spree::Price record, given a set of pricing options
+      # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
+      # @return [Spree::Price, nil] The most specific price for this set of pricing options.
+      def price_for_options(price_options)
         variant.currently_valid_prices.detect do |price|
-          ( price.country_iso == price_options.desired_attributes[:country_iso] ||
-            price.country_iso.nil?
+          (price.country_iso == price_options.desired_attributes[:country_iso] ||
+           price.country_iso.nil?
           ) && price.currency == price_options.desired_attributes[:currency]
-        end.try!(:money)
+        end
       end
     end
   end

data/app/models/spree/variant.rb

@@ -24,7 +24,6 @@ module Spree
       stock_items.discard_all
       images.destroy_all
       prices.discard_all
-      currently_valid_prices.discard_all
     end
 
     attr_writer :rebuild_vat_prices
@@ -58,13 +57,6 @@ module Spree
       inverse_of: :variant,
       autosave: true
 
-    has_many :currently_valid_prices,
-      -> { currently_valid },
-      class_name: 'Spree::Price',
-      dependent: :destroy,
-      inverse_of: :variant,
-      autosave: true
-
     before_validation :set_cost_currency
     before_validation :set_price, if: -> { product && product.master }
     before_validation :build_vat_prices, if: -> { rebuild_vat_prices? || new_record? && product }
@@ -276,16 +268,17 @@ module Spree
     end
 
     # Chooses an appropriate price for the given pricing options
+    # This has been deprecated in favor of #price_for_options.
     #
-    # @see Spree::Variant::PriceSelector#price_for
+    # @see Spree::Variant::PriceSelector#price_for_options
     delegate :price_for, to: :price_selector
 
     # Returns the difference in price from the master variant
     def price_difference_from_master(pricing_options = Spree::Config.default_pricing_options)
-      master_price = product.master.price_for(pricing_options)
-      variant_price = price_for(pricing_options)
+      master_price = product.master.price_for_options(pricing_options)
+      variant_price = price_for_options(pricing_options)
       return unless master_price && variant_price
-      variant_price - master_price
+      Spree::Money.new(variant_price.amount - master_price.amount, currency: pricing_options.currency)
     end
 
     def price_same_as_master?(pricing_options = Spree::Config.default_pricing_options)
@@ -293,6 +286,17 @@ module Spree
       diff && diff.zero?
     end
 
+    def price_for_options(price_options)
+      if price_selector.respond_to?(:price_for_options)
+        price_selector.price_for_options(price_options)
+      else
+        money = price_for(price_options)
+        return if money.nil?
+
+        Spree::Price.new(amount: money.to_d, variant: self, currency: price_options.currency)
+      end
+    end
+
     # Generates a friendly name and sku string.
     #
     # @return [String]
@@ -315,16 +319,22 @@ module Spree
     end
 
     # @param quantity [Fixnum] how many are desired
+    # @param stock_location [Spree::StockLocation] Optionally restrict stock
+    #   quantity check to a specific stock location. If unspecified it will
+    #   check inventory in all available StockLocations.
     # @return [Boolean] true if the desired quantity can be supplied
-    def can_supply?(quantity = 1)
-      Spree::Stock::Quantifier.new(self).can_supply?(quantity)
+    def can_supply?(quantity = 1, stock_location = nil)
+      Spree::Stock::Quantifier.new(self, stock_location).can_supply?(quantity)
     end
 
     # Fetches the on-hand quantity of the variant.
     #
+    # @param stock_location [Spree::StockLocation] Optionally restrict stock
+    #   quantity check to a specific stock location. If unspecified it will
+    #   check inventory in all available StockLocations.
     # @return [Fixnum] the number currently on-hand
-    def total_on_hand
-      Spree::Stock::Quantifier.new(self).total_on_hand
+    def total_on_hand(stock_location = nil)
+      Spree::Stock::Quantifier.new(self, stock_location).total_on_hand
     end
 
     # Shortcut method to determine if inventory tracking is enabled for this

data/config/locales/en.yml

@@ -1288,6 +1288,8 @@ en:
           %{amount}.
         item_total_less_than_or_equal: This coupon code can't be applied to orders
           less than or equal to %{amount}.
+        item_total_doesnt_match_with_operator: This coupon code can't be applied to
+          orders %{operator} %{amount}.
         limit_once_per_user: This coupon code can only be used once per user.
         missing_product: This coupon code can't be applied because you don't have
           all of the necessary products in your cart.

data/db/migrate/20210312061050_change_column_null_on_prices.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeColumnNullOnPrices < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null(:spree_prices, :amount, false)
+  end
+end

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

@@ -132,7 +132,7 @@ module Solidus
         Solidus has a default authentication extension that uses Devise.
         You can find more info at https://github.com/solidusio/solidus_auth_devise.
 
-        Would you like to install it? (y/n)"))
+        Would you like to install it? (Y/n)"))
 
         @plugins_to_be_installed << 'solidus_auth_devise'
         @plugin_generators_to_run << 'solidus:auth:install'

data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt

@@ -1,9 +1,11 @@
 # Configure Solidus Preferences
 # See http://docs.solidus.io/Spree/AppConfiguration.html for details
 
+# Solidus version defaults for preferences that are not overridden
+Spree.load_defaults '<%= Spree.solidus_version %>'
+
 Spree.config do |config|
   # Core:
-
   # Default currency for new sites
   config.currency = "USD"
 

data/lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt

@@ -0,0 +1,30 @@
+# This initializer lets you preview the defaults that have changed on the new
+# Solidus version.
+#
+# It allows you to enable them one by one while you adapt your application.
+# When you're done with all of them, you can safely remove this file and add
+# the updated `load_defaults` calls to the top of the config blocks in your
+# Solidus main initializer. You can also call `Spree.load_defaults(version)` to
+# target all components at once.
+
+Spree.config do |config|
+  <%= @core_changes %>
+end
+
+<% if defined?(Spree::Frontend::Engine) -%>
+Spree::Frontend::Config.configure do |config|
+  <%= @frontend_changes %>
+end
+<% end -%>
+
+<% if defined?(Spree::Backend::Engine) -%>
+Spree::Backend::Config.configure do |config|
+  <%= @backend_changes %>
+end
+<% end -%>
+
+<% if defined?(Spree::Api::Engine) -%>
+Spree::Api::Config.configure do |config|
+  <%= @api_changes %>
+end
+<% end -%>

data/lib/generators/solidus/update/update_generator.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'spree/preferences/preference_differentiator'
+require 'rails/generators'
+
+module Solidus
+  # @private
+  class UpdateGenerator < ::Rails::Generators::Base
+    FROM = Spree.previous_solidus_minor_version
+
+    desc 'Generates a new initializer to preview the new defaults for current Solidus version'
+
+    source_root File.expand_path('templates', __dir__)
+
+    class_option :initializer_basename,
+                 type: :string,
+                 default: 'new_solidus_defaults',
+                 banner: 'The name for the new initializer'
+
+    class_option :previous_version_prompt,
+                 type: :boolean,
+                 default: true,
+                 banner: 'Prompt to warn about only previous version support'
+
+    class_option :from,
+                 type: :string,
+                 default: FROM,
+                 banner: 'Solidus version from which you are upgrading'
+
+    class_option :to,
+                 type: :string,
+                 default: Spree.solidus_version,
+                 hide: true
+
+    class_option :initializer_directory,
+                 type: :string,
+                 default: 'config/initializers/',
+                 hide: true
+
+    def create_new_defaults_initializer
+      previous_version_prompt = options[:previous_version_prompt]
+      return if previous_version_prompt && !yes?(<<~MSG, :red)
+        The update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
+        If you are confident you want to upgrade from a previous version, you must rerun the generator with the "--from={OLD_VERSION}" argument.
+        Are you sure you want to continue? (y/N)
+      MSG
+
+      from = options[:from]
+      to = options[:to]
+      @from = from
+      @core_changes = core_changes_template(from, to)
+      @frontend_changes = frontend_changes_template(from, to)
+      @backend_changes = backend_changes_template(from, to)
+      @api_changes = api_changes_template(from, to)
+
+      template 'config/initializers/new_solidus_defaults.rb.tt',
+               File.join(options[:initializer_directory], "#{options[:initializer_basename]}.rb")
+    end
+
+    def print_message
+      say <<~MSG
+
+        ***********************************************************************
+
+        Other tasks may be needed to update to the new Solidus version. Please,
+        check https://github.com/solidusio/solidus/blob/v#{options[:to]}/CHANGELOG.md
+        for details.
+
+        Thanks for using Solidus!
+
+        ***********************************************************************
+
+      MSG
+    end
+
+    private
+
+    def core_changes_template(from, to)
+      changes_template_for(Spree::AppConfiguration, from, to)
+    end
+
+    def frontend_changes_template(from, to)
+      return '' unless defined?(Spree::Frontend::Engine)
+
+      changes_template_for(Spree::FrontendConfiguration, from, to)
+    end
+
+    def backend_changes_template(from, to)
+      return '' unless defined?(Spree::Backend::Engine)
+
+      changes_template_for(Spree::BackendConfiguration, from, to)
+    end
+
+    def api_changes_template(from, to)
+      return '' unless defined?(Spree::Api::Engine)
+
+      changes_template_for(Spree::ApiConfiguration, from, to)
+    end
+
+    def changes_template_for(klass, from, to)
+      changes = Spree::Preferences::PreferenceDifferentiator.new(klass).call(from: from, to: to)
+      return '# No changes' if changes.empty?
+
+      [
+        ["config.load_defaults('#{from}')"] +
+          changes.map do |pref_key, change|
+            "  # config.#{pref_key} = #{change[:to]}"
+          end.flatten
+      ].join("\n")
+    end
+  end
+end

data/lib/generators/spree/dummy/templates/rails/application.rb.tt

@@ -7,4 +7,3 @@ Bundler.require(*Rails.groups(assets: %w(development test)))
 require '<%= lib_name %>'
 
 <%= application_definition %>
-

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,66 +1,111 @@
 <% if agent_number = ENV['TC_AGENT_NUMBER']
 database_prefix = agent_number + '_'
 end %>
+<% db = case ENV['DB']
+        when 'mysql'
+          'mysql'
+        when 'postgres', 'postgresql'
+          'postgres'
+        when 'sqlite', '', nil
+          'sqlite'
+        else
+          raise "Invalid DB specified: #{ENV['DB']}"
+        end %>
+<% db_host = case db
+             when 'mysql'
+               ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+             when 'postgres'
+               ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+             else
+               ENV['DB_HOST']
+             end %>
+<% db_username = ENV['DB_USERNAME'] %>
+<% db_password = ENV['DB_PASSWORD'] %>
+
+
+
+
 <% case ENV['DB']
-  when 'sqlite' %>
-development:
-  adapter: sqlite3
-  database: db/solidus_development.sqlite3
-test:
-  adapter: sqlite3
-  database: db/solidus_test.sqlite3
-  timeout: 10000
-production:
-  adapter: sqlite3
-  database: db/solidus_production.sqlite3
-<% when 'mysql' %>
+  when 'mysql' %>
 development:
   adapter: mysql2
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
   encoding: utf8
 test:
   adapter: mysql2
-  <% if ENV['TRAVIS'] %>
-  username: root
-  password:
-  <% end %>
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
   encoding: utf8
 production:
   adapter: mysql2
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
   encoding: utf8
 <% when 'postgres', 'postgresql' %>
-<% db_host = ENV['DB_HOST'] -%>
-<% db_username = ENV['DB_USERNAME'] -%>
-<% db_password = ENV['DB_PASSWORD'] -%>
 development:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 test:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
-  username: <%= db_username || 'postgres' %>
-<% unless db_password.blank? %>
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
   password: <%= db_password %>
-<% end %>
-  min_messages: warning
-<% unless db_host.blank? %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 production:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
+  <% end %>
+  min_messages: warning
 <% when 'sqlite', '', nil %>
 development:
   adapter: sqlite3
@@ -71,6 +116,4 @@ test:
 production:
   adapter: sqlite3
   database: db/solidus_production.sqlite3
-<% else %>
-  <% raise "Invalid DB specified: #{ENV['DB']}" %>
 <% end %>