solidus_core 3.0.8 → 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

@@ -40,14 +40,6 @@ class Spree::StoreCredit < Spree::PaymentSource
   extend Spree::DisplayMoney
   money_methods :amount, :amount_used, :amount_authorized
 
-  # Sets this store credit's amount to a new value,
-  # parsing it as a localized number if the new value is a string.
-  #
-  # @param number [String, #to_d] a new amount
-  def amount=(number)
-    self[:amount] = Spree::LocalizedNumber.parse(number)
-  end
-
   def amount_remaining
     return 0.0.to_d if invalidated?
     amount - amount_used - amount_authorized
@@ -158,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

@@ -1004,8 +1004,6 @@ en:
           use_product_tax_category: Use Product Tax Category
         new:
           new_variant: New Variant
-        table:
-          no_variants_found: No variants found for '%{term}'
         table_filter:
           show_deleted: Show Deleted Variants
     administration: Administration
@@ -1172,257 +1170,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
@@ -1537,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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
-require 'rails/version'
 
 module Solidus
   # @private
@@ -16,7 +15,7 @@ module Solidus
     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)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
-    class_option :active_storage, type: :boolean, default: Rails.gem_version >= Gem::Version.new("6.1.0"), banner: 'Install ActiveStorage as image attachments handler for products and taxons'
+    class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -133,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 -%>