spree_core 4.3.0.rc1 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b031163e0c77da6776854068fb9769ed6cd44ff048e75a088ee6526c40db986
-  data.tar.gz: 2cfbcbfb7a1c5221270e7b677222a94047b5965cb32e5144ca6540d927f2b51b
+  metadata.gz: b9362a52bbabd7b09ffc2bc0271bffc4a2d11bc311d7356b56db0271c79f0740
+  data.tar.gz: 41a19d295a5dad9f3b2dadfe07fe73210e5a57139cc82eeb170d9d2d6e143910
 SHA512:
-  metadata.gz: 375bd44efe93e706a1bd58abcc9be1fb3f2af0b0a993fe223a1e093033193105012284e0a7f03413fad0099feb105fa4b1526b8d576d76e58e62e37967c67768
-  data.tar.gz: c82f2406e121b6fff092677e91d0344e35c5b6e19aee5aca1916ee819d7909a42ef854653922413e215c67934cb73df2a1af002fbe3d48f53db99ff854d80f93
+  metadata.gz: b75ef727652e108dd4c34cf10bf2ab1d82abff4c9283ce2ee3c00078b328dbbcdcc38d729f7a1fa75d7a773470e48e5b3ce02d36d6cd33fbed5f8906dadfa944
+  data.tar.gz: eeaaf0d1aaa49aaaafd30b55ddc04e50ddcdc922ecd7779e9b98283ca5c8ac4e5fd899c73d770e8cbaa93474e25b3af40e0747612cb761e825afeb36988d2254

data/app/finders/spree/products/find.rb

@@ -27,6 +27,9 @@ module Spree
         @deleted          = params.dig(:filter, :show_deleted)
         @discontinued     = params.dig(:filter, :show_discontinued)
         @properties       = params.dig(:filter, :properties)
+        @in_stock         = params.dig(:filter, :in_stock)
+        @backorderable    = params.dig(:filter, :backorderable)
+        @purchasable      = params.dig(:filter, :purchasable)
       end
 
       def execute
@@ -42,6 +45,9 @@ module Spree
         products = by_properties(products)
         products = include_deleted(products)
         products = include_discontinued(products)
+        products = show_only_stock(products)
+        products = show_only_backorderable(products)
+        products = show_only_purchasable(products)
         products = ordered(products)
 
         products.distinct
@@ -49,8 +55,8 @@ module Spree
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options,
-                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued, :properties, :store
+      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
+                  :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable
 
       def ids?
         ids.present?
@@ -231,6 +237,24 @@ module Spree
         discontinued ? products : products.active(currency)
       end
 
+      def show_only_stock(products)
+        return products unless in_stock.to_s == 'true'
+
+        products.in_stock
+      end
+
+      def show_only_backorderable(products)
+        return products unless backorderable.to_s == 'true'
+
+        products.backorderable
+      end
+
+      def show_only_purchasable(products)
+        return products unless purchasable.to_s == 'true'
+
+        products.in_stock_or_backorderable
+      end
+
       def map_prices(prices)
         prices.map do |price|
           price == 'Infinity' ? Float::INFINITY : price.to_f

data/app/finders/spree/taxons/find.rb

@@ -3,16 +3,18 @@ module Spree
     class Find
       def initialize(scope:, params:)
         @scope = scope
-        @ids      = String(params.dig(:filter, :ids)).split(',')
-        @parent   = params.dig(:filter, :parent_id)
-        @taxonomy = params.dig(:filter, :taxonomy_id)
-        @name     = params.dig(:filter, :name)
-        @roots    = params.dig(:filter, :roots)
+        @ids              = String(params.dig(:filter, :ids)).split(',')
+        @parent           = params.dig(:filter, :parent_id)
+        @parent_permalink = params.dig(:filter, :parent_permalink)
+        @taxonomy         = params.dig(:filter, :taxonomy_id)
+        @name             = params.dig(:filter, :name)
+        @roots            = params.dig(:filter, :roots)
       end
 
       def execute
         taxons = by_ids(scope)
         taxons = by_parent(taxons)
+        taxons = by_parent_permalink(taxons)
         taxons = by_taxonomy(taxons)
         taxons = by_roots(taxons)
         taxons = by_name(taxons)
@@ -22,7 +24,7 @@ module Spree
 
       private
 
-      attr_reader :ids, :parent, :taxonomy, :roots, :name, :scope
+      attr_reader :ids, :parent, :parent_permalink, :taxonomy, :roots, :name, :scope
 
       def ids?
         ids.present?
@@ -32,6 +34,10 @@ module Spree
         parent.present?
       end
 
+      def parent_permalink?
+        parent_permalink.present?
+      end
+
       def taxonomy?
         taxonomy.present?
       end
@@ -60,6 +66,16 @@ module Spree
         taxons.where(parent_id: parent)
       end
 
+      def by_parent_permalink(taxons)
+        return taxons unless parent_permalink?
+
+        if Rails::VERSION::STRING >= '6.1'
+          taxons.joins(:parent).where(parent: { permalink: parent_permalink })
+        else
+          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").where(["parent_taxon.permalink = ?", parent_permalink])
+        end
+      end
+
       def by_taxonomy(taxons)
         return taxons unless taxonomy?
 

data/app/helpers/spree/base_helper.rb

@@ -246,11 +246,13 @@ module Spree
         options = options.first || {}
         options[:alt] ||= product.name
         image_path = default_image_for_product_or_variant(product)
-        if image_path.present?
-          create_product_image_tag image_path, product, options, style
-        else
-          image_tag "noimage/#{style}.png", options
-        end
+        img = if image_path.present?
+                create_product_image_tag image_path, product, options, style
+              else
+               inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%"
+              end
+
+        content_tag(:div, img, class: "admin-product-image-container #{style}-img")
       end
     end
 

data/app/models/concerns/spree/display_money.rb

@@ -17,13 +17,17 @@ module Spree
     # Decorate a method, but with some additional options
     #     extend Spree::DisplayMoney
     #     money_methods tax_amount: { currency: "CAD", no_cents: true }, :price
+    # Use generated method with the same arguments as in wrapped method
+    #     def tax_amount(order, country)
+    #     display_tax_amount(order, country)
     def money_methods(*args)
       args.each do |money_method|
         money_method = { money_method => {} } unless money_method.is_a? Hash
         money_method.each do |method_name, opts|
-          define_method("display_#{method_name}") do
+          define_method("display_#{method_name}") do |**args_list|
             default_opts = respond_to?(:currency) ? { currency: currency } : {}
-            Spree::Money.new(send(method_name), default_opts.merge(opts))
+
+            Spree::Money.new(send(method_name, **args_list), default_opts.merge(opts).merge(args_list.slice(:currency)))
           end
         end
       end

data/app/models/concerns/spree/image_methods.rb

@@ -0,0 +1,24 @@
+module Spree
+  module ImageMethods
+    extend ActiveSupport::Concern
+
+    def generate_url(size:, gravity: 'center', quality: 80, background: 'show')
+      return if size.blank?
+      size = size.gsub(/\s+/, '')
+
+      return unless size.match(/(\d+)x(\d+)/)
+
+      polymorphic_path(attachment.variant(
+        gravity: gravity,
+        resize: size,
+        extent: size,
+        background: background,
+        quality: quality.to_i
+      ), only_path: true)
+    end
+
+    def original_url
+      polymorphic_path(attachment, only_path: true)
+    end
+  end
+end

data/app/models/concerns/spree/product_scopes.rb

@@ -62,6 +62,18 @@ module Spree
         where("#{price_table_name}.amount >= ?", price)
       end
 
+      add_search_scope :in_stock do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock)
+      end
+
+      add_search_scope :backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.backorderable)
+      end
+
+      add_search_scope :in_stock_or_backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
+      end
+
       # This scope selects products in taxon AND all its descendants
       # If you need products only within one taxon use
       #

data/app/models/concerns/spree/single_store_resource.rb

@@ -3,7 +3,17 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
+      validate :ensure_store_association_is_not_changed
+
       scope :for_store, ->(store) { where(store_id: store.id) }
     end
+
+    protected
+
+    def ensure_store_association_is_not_changed
+      if store_id_changed? && persisted?
+        errors.add(:store, Spree.t('errors.messages.store_association_can_not_be_changed'))
+      end
+    end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -4,6 +4,7 @@ module Spree
 
     include Spree::UserPaymentSource
     include Spree::UserReporting
+    include Spree::UserRoles
     include Spree::RansackableAttributes
 
     included do
@@ -15,9 +16,6 @@ module Spree
 
       attr_accessor :use_billing
 
-      has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
-      has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
-
       has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser', foreign_key: :user_id, dependent: :destroy
       has_many :promotion_rules, through: :promotion_rule_users, class_name: 'Spree::PromotionRule'
 
@@ -47,11 +45,6 @@ module Spree
       end
     end
 
-    # has_spree_role? simply needs to return true or false whether a user has a role or not.
-    def has_spree_role?(role_in_question)
-      spree_roles.any? { |role| role.name == role_in_question.to_s }
-    end
-
     def last_incomplete_spree_order(store, options = {})
       orders.where(store: store).incomplete.
         includes(options[:includes]).
@@ -65,6 +58,14 @@ module Spree
       store_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
+    def available_store_credits(store)
+      store ||= Store.default
+
+      store_credits.for_store(store).pluck(:currency).uniq.each_with_object([]) do |currency, arr|
+        arr << Spree::Money.new(total_available_store_credit(currency, store), currency: currency)
+      end
+    end
+
     private
 
     def check_completed_orders

data/app/models/concerns/spree/user_reporting.rb

@@ -3,20 +3,45 @@ module Spree
     extend DisplayMoney
     money_methods :lifetime_value, :average_order_value
 
-    def lifetime_value
-      orders.complete.sum(:total)
+    def report_values_for(report_name, store)
+      store ||= Store.default
+
+      completed_orders(store).pluck(:currency).uniq.each_with_object([]) do |currency, arr|
+        arr << send("display_#{report_name}", store: store, currency: currency)
+      end
     end
 
-    def order_count
-      orders.complete.size
+    def lifetime_value(**args)
+      order_calculate(operation: :sum,
+                      column: :total,
+                      **args)
     end
 
-    def average_order_value
-      if order_count > 0
-        lifetime_value / order_count
-      else
-        BigDecimal('0.00')
-      end
+    def average_order_value(**args)
+      order_calculate(operation: :average,
+                      column: :total,
+                      **args)
+    end
+
+    def order_count(store = nil)
+      store ||= Store.default
+      order_calculate(store: store,
+                      currency: store.supported_currencies.split(','),
+                      operation: :count,
+                      column: :all)
+    end
+
+    private
+
+    def order_calculate(operation:, column:, store: nil, currency: nil)
+      store ||= Store.default
+      currency ||= store.default_currency
+
+      completed_orders(store).where(currency: currency).calculate(operation, column) || BigDecimal('0.00')
+    end
+
+    def completed_orders(store)
+      orders.for_store(store).complete
     end
   end
 end

data/app/models/concerns/spree/user_roles.rb

@@ -0,0 +1,25 @@
+module Spree
+  module UserRoles
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
+      has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
+
+      scope :admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }
+
+      # has_spree_role? simply needs to return true or false whether a user has a role or not.
+      def has_spree_role?(role_name)
+        spree_roles.exists?(name: role_name)
+      end
+
+      def self.admin_created?
+        admin.exists?
+      end
+
+      def admin?
+        has_spree_role?('admin')
+      end
+    end
+  end
+end

data/app/models/spree/app_dependencies.rb

@@ -13,7 +13,7 @@ module Spree
       :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
       :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
       :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
-      :classification_reposition_service, :credit_cards_destroy_service
+      :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -43,6 +43,8 @@ module Spree
       @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
       @cart_empty_service = 'Spree::Cart::Empty'
       @cart_destroy_service = 'Spree::Cart::Destroy'
+      @cart_associate_service = 'Spree::Cart::Associate'
+      @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
 
       # checkout
       @checkout_next_service = 'Spree::Checkout::Next'

data/app/models/spree/cms/sections/featured_article.rb

@@ -1,6 +1,5 @@
 module Spree::Cms::Sections
   class FeaturedArticle < Spree::CmsSection
-    before_save :reset_link_attributes
     after_initialize :default_values
 
     store :content, accessors: [:title, :subtitle, :button_text, :rte_content], coder: JSON
@@ -14,12 +13,6 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
-      if linked_resource_type_changed?
-        self.linked_resource_id = nil
-      end
-    end
-
     def default_values
       self.gutters ||= 'No Gutters'
       self.fit ||= 'Screen'

data/app/models/spree/cms/sections/hero_image.rb

@@ -1,6 +1,5 @@
 module Spree::Cms::Sections
   class HeroImage < Spree::CmsSection
-    before_save :reset_link_attributes
     after_initialize :default_values
 
     store :content, accessors: [:title, :button_text], coder: JSON
@@ -30,14 +29,6 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
-      if linked_resource_type_changed?
-        return if linked_resource_id_was.nil?
-
-        self.linked_resource_id = nil
-      end
-    end
-
     def default_values
       self.gutters ||= 'No Gutters'
       self.fit ||= 'Screen'

data/app/models/spree/cms/sections/image_gallery.rb

@@ -1,7 +1,7 @@
 module Spree::Cms::Sections
   class ImageGallery < Spree::CmsSection
     after_initialize :default_values
-    before_save :reset_link_attributes
+    validate :reset_multiple_link_attributes
 
     LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
                              ['Spree::Taxon'].freeze
@@ -70,7 +70,7 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
+    def reset_multiple_link_attributes
       return if Rails::VERSION::STRING < '6.0'
 
       if link_type_one_changed?

data/app/models/spree/cms/sections/side_by_side_images.rb

@@ -1,7 +1,7 @@
 module Spree::Cms::Sections
   class SideBySideImages < Spree::CmsSection
     after_initialize :default_values
-    before_save :reset_link_attributes
+    validate :reset_multiple_link_attributes
 
     LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
                              ['Spree::Taxon'].freeze
@@ -48,7 +48,7 @@ module Spree::Cms::Sections
 
     private
 
-    def reset_link_attributes
+    def reset_multiple_link_attributes
       return if Rails::VERSION::STRING < '6.0'
 
       if link_type_one_changed?

data/app/models/spree/cms_section.rb

@@ -5,6 +5,8 @@ module Spree
     acts_as_list scope: :cms_page
     belongs_to :cms_page, touch: true
 
+    validate :reset_link_attributes
+
     IMAGE_COUNT = ['one', 'two', 'three']
     IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
     IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
@@ -53,5 +55,15 @@ module Spree
     def fullscreen?
       fit == 'Screen'
     end
+
+    private
+
+    def reset_link_attributes
+      if linked_resource_type_changed?
+        return if linked_resource_id_was.nil?
+
+        self.linked_resource_id = nil
+      end
+    end
   end
 end

data/app/models/spree/gateway/bogus.rb

@@ -9,14 +9,12 @@ module Spree
 
     attr_accessor :test
 
+    preference :dummy_key, :string, default: 'PUBLICKEY123'
+
     def provider_class
       self.class
     end
 
-    def preferences
-      {}
-    end
-
     def create_profile(payment)
       return if payment.source.has_payment_profile?
 
@@ -88,5 +86,9 @@ module Spree
       end
       random
     end
+
+    def public_preference_keys
+      [:dummy_key]
+    end
   end
 end

data/app/models/spree/image.rb

@@ -2,6 +2,7 @@ module Spree
   class Image < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+    include ::Spree::ImageMethods
 
     # In Rails 5.x class constants are being undefined/redefined during the code reloading process
     # in a rails development environment, after which the actual ruby objects stored in those class constants
@@ -15,13 +16,8 @@ module Spree
         width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(
-                                  gravity: 'center',
-                                  resize: size,
-                                  extent: size,
-                                  background: 'snow2',
-                                  quality: 80
-                                ), only_path: true),
+          url: generate_url(size: size),
+          size: size,
           width: width,
           height: height
         }
@@ -35,13 +31,7 @@ module Spree
       width, height = size.chop.split('x')
 
       {
-        url: polymorphic_path(attachment.variant(
-                                gravity: 'center',
-                                resize: size,
-                                extent: size,
-                                background: 'snow2',
-                                quality: 80
-                              ), only_path: true),
+        url: generate_url(size: size),
         size: size,
         width: width,
         height: height
@@ -59,16 +49,7 @@ module Spree
     end
 
     def plp_url
-      size = self.class.styles[:plp_and_carousel]
-      variant = attachment.variant(
-        gravity: 'center',
-        resize: size,
-        extent: size,
-        background: 'snow2',
-        quality: 80
-      )
-
-      polymorphic_path(variant, only_path: true)
+      generate_url(size: self.class.styles[:plp_and_carousel])
     end
   end
 end

data/app/models/spree/payment_method.rb

@@ -87,5 +87,17 @@ module Spree
 
       store_ids.include?(store.id)
     end
+
+    def public_preferences
+      public_preference_keys.each_with_object({}) do |key, hash|
+        hash[key] = preferences[key]
+      end
+    end
+
+    protected
+
+    def public_preference_keys
+      []
+    end
   end
 end

data/app/models/spree/product.rb

@@ -142,17 +142,17 @@ module Spree
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def purchasable?
-      variants_including_master.any?(&:purchasable?)
+      default_variant.purchasable? || variants.any?(&:purchasable?)
     end
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def in_stock?
-      variants_including_master.any?(&:in_stock?)
+      default_variant.in_stock? || variants.any?(&:in_stock?)
     end
 
     # Cant use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def backorderable?
-      variants_including_master.any?(&:backorderable?)
+      default_variant.backorderable? || variants.any?(&:backorderable?)
     end
 
     def find_or_build_master
@@ -301,11 +301,13 @@ module Spree
     end
 
     def total_on_hand
-      @total_on_hand ||= if any_variants_not_track_inventory?
-                           Float::INFINITY
-                         else
-                           stock_items.sum(:count_on_hand)
-                         end
+      @total_on_hand ||= Rails.cache.fetch(['product-total-on-hand', cache_key_with_version]) do
+        if any_variants_not_track_inventory?
+          Float::INFINITY
+        else
+          stock_items.sum(:count_on_hand)
+        end
+      end
     end
 
     # Master variant may be deleted (i.e. when the product is deleted)

data/app/models/spree/property.rb

@@ -18,7 +18,7 @@ module Spree
     after_touch :touch_all_products
     after_save :ensure_product_properties_have_filter_params
 
-    self.whitelisted_ransackable_attributes = ['presentation']
+    self.whitelisted_ransackable_attributes = ['presentation', 'filterable']
 
     def uniq_values(product_properties_scope: nil)
       with_uniq_values_cache_key(product_properties_scope) do

data/app/models/spree/stock_location.rb

@@ -2,6 +2,7 @@ module Spree
   class StockLocation < Spree::Base
     has_many :shipments
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
+    has_many :variants, through: :stock_items
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State', optional: true
@@ -14,6 +15,7 @@ module Spree
 
     after_create :create_stock_items, if: :propagate_all_variants?
     after_save :ensure_one_default
+    after_update :conditional_touch_records
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
@@ -134,5 +136,12 @@ module Spree
         StockLocation.where(default: true).where.not(id: id).update_all(default: false)
       end
     end
+
+    def conditional_touch_records
+      return unless active_changed?
+
+      stock_items.update_all(updated_at: Time.current)
+      variants.update_all(updated_at: Time.current)
+    end
   end
 end

data/app/models/spree/store.rb

@@ -76,8 +76,8 @@ module Spree
 
     def self.current(url = nil)
       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        `Spree::Store.current` is deprecated and will be removed in Spree 5
-        Spree::Stores::FindCurrent.new(url: "http://example.com") instead
+        `Spree::Store.current` is deprecated and will be removed in Spree 5.0
+        Please use `Spree::Stores::FindCurrent.new(url: "https://example.com").execute` instead
       DEPRECATION
       Stores::FindCurrent.new(url: url).execute
     end

data/app/models/spree/taxon.rb

@@ -44,6 +44,7 @@ module Spree
     scope :for_store, ->(store) { joins(:taxonomy).where(spree_taxonomies: { store_id: store.id }) }
 
     self.whitelisted_ransackable_associations = %w[taxonomy]
+    self.whitelisted_ransackable_attributes = %w[name permalink]
 
     scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
 

data/app/models/spree/taxon_image.rb

@@ -2,6 +2,7 @@ module Spree
   class TaxonImage < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+    include ::Spree::ImageMethods
 
     def styles
       self.class.styles.map do |_, size|

data/app/models/spree/variant.rb

@@ -60,7 +60,7 @@ module Spree
 
     after_touch :clear_in_stock_cache
 
-    scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
+    scope :in_stock, -> { joins(:stock_items).where("#{Spree::StockItem.table_name}.count_on_hand > ? OR #{Spree::Variant.table_name}.track_inventory = ?", 0, false) }
     scope :backorderable, -> { joins(:stock_items).where(spree_stock_items: { backorderable: true }) }
     scope :in_stock_or_backorderable, -> { in_stock.or(backorderable) }
 
@@ -256,7 +256,13 @@ module Spree
       end
     end
 
-    delegate :total_on_hand, :can_supply?, :backorderable?, to: :quantifier
+    def backorderable?
+      @backorderable ||= Rails.cache.fetch(['variant-backorderable', cache_key_with_version]) do
+        quantifier.backorderable?
+      end
+    end
+
+    delegate :total_on_hand, :can_supply?, to: :quantifier
 
     alias is_backorderable? backorderable?
 
@@ -291,7 +297,7 @@ module Spree
     end
 
     def backordered?
-      @backordered ||= total_on_hand <= 0 && stock_items.exists?(backorderable: true)
+      @backordered ||= !in_stock? && stock_items.exists?(backorderable: true)
     end
 
     private

data/app/presenters/spree/filters/options_presenter.rb

@@ -3,6 +3,26 @@ module Spree
     class OptionsPresenter
       FilterableOptionType = Struct.new(:option_type, :option_values, keyword_init: true) do
         delegate_missing_to :option_type
+
+        def to_h
+          {
+            id: option_type.id,
+            name: option_type.name,
+            presentation: option_type.presentation,
+            option_values: option_values.map { |e| option_value_hash(e) }
+          }
+        end
+
+        private
+
+        def option_value_hash(option_value)
+          {
+            id: option_value.id,
+            name: option_value.name,
+            presentation: option_value.presentation,
+            position: option_value.position
+          }
+        end
       end
 
       def initialize(option_values_scope:)

data/app/presenters/spree/filters/property_presenter.rb

@@ -14,9 +14,29 @@ module Spree
         property.uniq_values(product_properties_scope: product_properties)
       end
 
+      def to_h
+        {
+          id: property.id,
+          name: property.name,
+          presentation: property.presentation,
+          values: values_hash
+        }
+      end
+
       private
 
       attr_reader :property
+
+      def values_hash
+        value_hashes = uniq_values.map do |filter_param, value|
+          {
+            value: value,
+            filter_param: filter_param
+          }
+        end
+
+        value_hashes.sort_by { |e| e[:value] }
+      end
     end
   end
 end

data/app/services/spree/cart/associate.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Cart
+    class Associate
+      prepend Spree::ServiceModule::Base
+
+      def call(guest_order:, user:)
+        if guest_order.user.nil?
+          guest_order.associate_user!(user)
+          success(guest_order)
+        else
+          failure(guest_order, 'Already assigned to a user')
+        end
+      end
+    end
+  end
+end

data/app/services/spree/cart/change_currency.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Cart
+    class ChangeCurrency
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, new_currency:)
+        return failure('Currency not supported') unless supported_currency?(order, new_currency)
+
+        result = order.update!(currency: new_currency) rescue false
+
+        if result
+          success(order)
+        else
+          failure('Failed to update order')
+        end
+      end
+
+      private
+
+      def supported_currency?(order, currency)
+        store = order.store
+        supported_currencies = store.supported_currencies_list
+        supported_currencies.map(&:iso_code).include?(currency.upcase)
+      end
+    end
+  end
+end

data/app/sorters/spree/base_sorter.rb

@@ -2,34 +2,46 @@ module Spree
   class BaseSorter
     def initialize(scope, params = {}, allowed_sort_attributes = [])
       @scope = scope
-      @sort = params[:sort]
       @allowed_sort_attributes = allowed_sort_attributes
+      @sort = sort_fields(params[:sort])
     end
 
     def call
-      by_param_attribute(scope)
+      by_param_attributes(scope)
     end
 
     protected
 
     attr_reader :scope, :collection, :sort, :allowed_sort_attributes
 
-    def by_param_attribute(scope)
-      return scope if sort_field.blank? || !allowed_sort_attributes.include?(sort_field.to_sym)
+    def by_param_attributes(scope)
+      return scope if sort.empty?
 
-      scope.order("#{sort_field}": order_direction)
+      sort.each do |value, order|
+        next if value.blank? || allowed_sort_attributes.exclude?(value.to_sym)
+
+        scope = scope.order("#{value}": order)
+      end
+
+      scope
+    end
+
+    def sort_fields(sort)
+      return [] if sort.nil?
+
+      sort.split(',').map { |field| [sort_field(field), order_direction(field)] }
     end
 
-    def desc_order
-      @desc_order ||= String(sort)[0] == '-'
+    def desc_order(field)
+      String(field)[0] == '-'
     end
 
-    def sort_field
-      @sort_field ||= desc_order ? sort[1..-1] : sort
+    def sort_field(field)
+      desc_order(field) ? field[1..-1] : field
     end
 
-    def order_direction
-      desc_order ? :desc : :asc
+    def order_direction(field)
+      desc_order(field) ? :desc : :asc
     end
   end
 end

data/app/sorters/spree/products/sort.rb

@@ -7,8 +7,9 @@ module Spree
       end
 
       def call
-        products = by_param_attribute(scope)
+        products = by_param_attributes(scope)
         products = by_price(products)
+        products = by_sku(products)
 
         products.distinct
       end
@@ -17,18 +18,33 @@ module Spree
 
       attr_reader :sort, :scope, :currency, :allowed_sort_attributes
 
-      def price?
-        sort_field == 'price'
-      end
-
       def by_price(scope)
-        return scope unless price?
+        return scope unless (value = sort_by?('price'))
 
         scope.joins(master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
           where(spree_prices: { currency: currency }).
-          order("#{Spree::Price.table_name}.amount #{order_direction}")
+          order("#{Spree::Price.table_name}.amount #{value[1]}")
+      end
+
+      def by_sku(scope)
+        return scope unless (value = sort_by?('sku'))
+
+        select_product_attributes = if scope.to_sql.include?("#{Spree::Product.table_name}.*")
+                                      ''
+                                    else
+                                      "#{Spree::Product.table_name}.*, "
+                                    end
+
+        scope.joins(:master).
+          select("#{select_product_attributes}#{Spree::Variant.table_name}.sku").
+          where(Spree::Variant.table_name.to_s => { is_master: true }).
+          order("#{Spree::Variant.table_name}.sku #{value[1]}")
+      end
+
+      def sort_by?(field)
+        sort.detect { |s| s[0] == field }
       end
     end
   end

data/config/locales/en.yml

@@ -184,6 +184,12 @@ en:
       spree/address:
         one: Address
         other: Addresses
+      spree/cms_page:
+        one: Page
+        other: Pages
+      spree/cms_section:
+        one: Section
+        other: Sections
       spree/country:
         one: Country
         other: Countries
@@ -558,6 +564,7 @@ en:
         draft_mode: Draft Mode
         full_width: Full width
         link_to_taxon: Link to Taxon
+        link_to_product: Link to Product
         title: Title
         fit: Fit To
         info_hero_image_body: "<p>The Hero Image section adds a large image with a button and tagline text to your page.</p>
@@ -964,6 +971,8 @@ en:
     error: error
     errors:
       messages:
+        store_association_can_not_be_changed: The store association can not be changed
+        store_is_already_set: Store is already set
         blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
@@ -1132,7 +1141,7 @@ en:
     log_in_to_continue: Log in to continue
     logs: "Logs"
     logged_in_as: Logged in as
-    logged_in_succesfully: Logged in successfully
+    logged_in_successfully: Logged in successfully
     logged_out: You have been logged out.
     login: Login
     login_as_existing: Login as Existing Customer
@@ -1341,6 +1350,7 @@ en:
     backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?
     overview: Overview
     package_from: package from
+    page: Page
     page_not_found: Sorry! Page you are looking can’t be found.
     pagination:
       next_page: next page &raquo;

data/db/migrate/20210527094055_create_spree_products_stores.rb

@@ -1,10 +1,17 @@
 class CreateSpreeProductsStores < ActiveRecord::Migration[5.2]
   def up
-    unless table_exists?(:spree_products_stores)
+    if table_exists?(:spree_products_stores)
+      unless index_exists?(:spree_products_stores, [:product_id, :store_id], unique: true)
+        add_index :spree_products_stores, [:product_id, :store_id], unique: true
+      end
+      unless column_exists?(:spree_products_stores, :created_at)
+        add_timestamps :spree_products_stores, default: Time.current
+      end
+    else
       create_table :spree_products_stores do |t|
         t.references :product, index: true
         t.references :store,  index: true
-        t.timestamps
+        t.timestamps default: Time.current
 
         t.index [:product_id, :store_id], unique: true
       end
@@ -12,13 +19,13 @@ class CreateSpreeProductsStores < ActiveRecord::Migration[5.2]
       stores = Spree::Store.all
       product_ids = Spree::Product.with_deleted.order(:id).ids
 
-      stores.find_each do |store|
-        prepared_values = product_ids.map { |id| "(#{id}, #{store.id}, '#{Time.current.to_s(:db)}', '#{Time.current.to_s(:db)}')" }.join(', ')
-        next if prepared_values.empty?
+      if product_ids.any? && Spree::StoreProduct.respond_to?(:insert_all)
+        stores.find_each do |store|
+          records = product_ids.map { |product_id| { product_id: product_id, store_id: store.id } }
 
-        begin
-          execute "INSERT INTO spree_products_stores (product_id, store_id, created_at, updated_at) VALUES #{prepared_values};"
-        rescue ActiveRecord::RecordNotUnique; end
+          # Rails 5 does not have insert_all
+          Spree::StoreProduct.insert_all(records)
+        end
       end
     end
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -68,7 +68,7 @@ module Spree
             inside dummy_path do
               inject_require_for(gem)
             end
-          rescue
+          rescue StandardError, LoadError
           end
         end
       end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -35,4 +35,6 @@ Dummy::Application.configure do
   config.active_support.deprecation = :stderr
 
   config.active_job.queue_adapter = :test
+
+  config.cache_store = :redis_cache_store
 end

data/lib/spree/core/controller_helpers/store.rb

@@ -22,6 +22,20 @@ module Spree
           current_store.default_locale
         end
 
+        def ensure_current_store(object)
+          return if object.nil?
+
+          if object.has_attribute?(:store_id)
+            if object.store.present? && object.store != current_store
+              raise Spree.t('errors.messages.store_is_already_set')
+            else
+              object.store = current_store
+            end
+          elsif object.class.method_defined?(:stores) && object.stores.exclude?(current_store)
+            object.stores << current_store
+          end
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.3.0.rc1'.freeze
+  VERSION = '4.3.1'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -8,6 +8,8 @@ module Spree
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
+      :menu_attributes,
+      :menu_item_attributes,
       :option_type_attributes,
       :option_value_attributes,
       :payment_attributes,
@@ -62,6 +64,11 @@ module Spree
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
+    @@menu_attributes = [:name, :locale, :location]
+
+    @@menu_item_attributes = [:name, :subtite, :destination, :new_window, :item_type,
+                              :linked_resource_type, :linked_resource_id, :code, :menu_id]
+
     @@option_type_attributes = [:name, :presentation, :option_values_attributes]
 
     @@option_value_attributes = [:name, :presentation]

data/lib/spree/testing_support/factories/product_factory.rb

@@ -36,6 +36,12 @@ FactoryBot.define do
         after :create do |product|
           product.master.stock_items.first.adjust_count_on_hand(10)
         end
+
+        trait :without_backorder do
+          after :create do |product|
+            product.master.stock_items.update_all(backorderable: false)
+          end
+        end
       end
 
       factory :product_with_option_types do

data/lib/spree/testing_support/locale_helpers.rb

@@ -48,7 +48,7 @@ module Spree
             remember_me: 'Se souvenir de moi',
             my_account: 'Mon compte',
             my_orders: 'Mes commandes',
-            logged_in_succesfully: 'Connexion réussie'
+            logged_in_successfully: 'Connexion réussie'
           })
       end
       # rubocop:enable Layout/ArgumentAlignment

data/lib/spree/testing_support/rspec_retry_config.rb

@@ -7,4 +7,9 @@ RSpec.configure do |config|
   config.around :each, type: :feature do |ex|
     ex.run_with_retry retry: ENV.fetch('RSPEC_RETRY_RETRY_COUNT', 3).to_i
   end
+
+  # callback to be run between retries
+  config.retry_callback = proc do |ex|
+    Rails.cache.clear
+  end
 end

data/spree_core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
     "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "documentation_uri" => "https://dev-docs.spreecommerce.org/",
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc1
+  version: 4.3.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -472,6 +472,7 @@ files:
 - app/models/concerns/spree/display_link.rb
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/filter_param.rb
+- app/models/concerns/spree/image_methods.rb
 - app/models/concerns/spree/memoized_data.rb
 - app/models/concerns/spree/multi_store_resource.rb
 - app/models/concerns/spree/named_type.rb
@@ -483,6 +484,7 @@ files:
 - app/models/concerns/spree/user_methods.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
+- app/models/concerns/spree/user_roles.rb
 - app/models/concerns/spree/vat_price_calculation.rb
 - app/models/friendly_id/slug_decorator.rb
 - app/models/spree/ability.rb
@@ -697,6 +699,8 @@ files:
 - app/services/spree/account/update.rb
 - app/services/spree/build_localized_redirect_url.rb
 - app/services/spree/cart/add_item.rb
+- app/services/spree/cart/associate.rb
+- app/services/spree/cart/change_currency.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/destroy.rb
 - app/services/spree/cart/empty.rb
@@ -722,7 +726,6 @@ files:
 - app/sorters/spree/products/sort.rb
 - app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
-- app/views/spree/shared/_purchased_items_table.text.erb
 - config/initializers/active_storage.rb
 - config/initializers/friendly_id.rb
 - config/initializers/inflections.rb
@@ -1192,9 +1195,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc1
-  documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.1
+  documentation_uri: https://dev-docs.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1210,7 +1213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree

data/app/views/spree/shared/_purchased_items_table.text.erb

@@ -1,25 +0,0 @@
-<% line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
-<% end %>
-============================================================
-<%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>
-<% if order.line_item_adjustments.exists? %>
-  <% if order.all_adjustments.promotion.eligible.exists? %>
-    <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-      <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
-  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
-<% end %>
-
-<% if order.additional_tax_total != 0 %>
-  <%= Spree.t(:tax) %>: <%= order.display_additional_tax_total.to_html %>
-<% end %>
-
-<% order.adjustments.eligible.each do |adjustment| %>
-  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-  <%= adjustment.label %> <%= adjustment.display_amount %>
-<% end %>