spree_core 5.0.4 → 5.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dad7a44435e17f7a0b717356dfe3f8f70cac0e9a18f38f505ded42f3908faf5
-  data.tar.gz: 109859dd8b1790ab9c0a22c1457e03e81708d79007664f0c8afae841573dd43e
+  metadata.gz: f8150046e1776256aacec11512b848d9cbd5074d17b7aacafd7b2736cfd934c3
+  data.tar.gz: 8a04db5d73b2abf21a587ea66313d4fb7ff7120ed46ef9d22f38ddf1b3c5f295
 SHA512:
-  metadata.gz: f09637caac881e203c1ff4f1104c2035c89df6cf671d619b7b9e4786a82a4d65332e6537fa4932545e1782203c82f1b41bb6e4c416674df57de95ccbb014410f
-  data.tar.gz: 2e499043d9f6393d208ce6cdb823059e734748e79924612d408e6de48d5e36c89cb1799405dd62da06e53aa6b8df3693033a267948fb3e6a4fc2077d4efbce2d
+  metadata.gz: 8024d8aa8b617d7be12713acf1787a7c4569dc708d74cbf34850ec6bc8fcea5630c15fdfe6efa4796c82825fc9724d637b219da887f888f909dd29d22582178f
+  data.tar.gz: 60db3009f9a9a30bfca2b8c6895b7777a35eaac8819ca06a112e2315e234137ee87e5fea3796335e53e8a8e5c562f22183d7d8c6c3c3b1f8e9466d76ba3bbde5

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

@@ -7,14 +7,6 @@ module Spree
         @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
       end
 
-      def call
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
-          Please use Spree::Countries::Find.new.execute instead
-        DEPRECATION
-        execute
-      end
-
       def execute
         countries = by_shippability(scope)
 

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

@@ -11,6 +11,7 @@ module Spree
         @currency         = params.dig(:filter, :currency) || params[:currency] || Spree::Store.default.default_currency
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
+        @taxonomies       = params.dig(:filter, :taxonomy_ids).to_h
         @name             = params.dig(:filter, :name)
         @slug             = params.dig(:filter, :slug)
         @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
@@ -52,6 +53,7 @@ module Spree
         products = show_only_backorderable(products)
         products = show_only_purchasable(products)
         products = show_only_out_of_stock(products)
+        products = by_taxonomies(products)
         products = ordered(products)
         products = by_vendor_ids(products)
 
@@ -62,7 +64,7 @@ module Spree
 
       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, :tags,
-                  :query, :vendor_ids, :out_of_stock, :slug
+                  :query, :vendor_ids, :out_of_stock, :slug, :taxonomies
 
       def query?
         query.present?
@@ -169,6 +171,21 @@ module Spree
         products.where(id: product_ids)
       end
 
+      def by_taxonomies(products)
+        return products if taxonomies.none?
+
+        taxon_groups = taxonomies.values.map { |taxonomy| taxon_ids(taxonomy[:taxon_ids].join(',')) }.compact_blank
+
+        return products if taxon_groups.empty?
+
+        taxonomies_products = products.joins(:classifications).where(Classification.table_name => { taxon_id: taxon_groups.flatten.uniq })
+
+        # No need to filter if there is only one taxonomy
+        return taxonomies_products if taxonomies.size == 1
+
+        products.where(id: products_matching_all_taxonomies_ids(taxonomies_products.ids, taxon_groups))
+      end
+
       def by_name(products)
         return products unless name?
 
@@ -336,6 +353,16 @@ module Spree
       def order_by_best_selling(scope)
         scope.by_best_selling(:desc)
       end
+
+      def products_matching_all_taxonomies_ids(products_ids, taxon_groups)
+        classifications = Spree::Classification.grouped_taxon_ids_for_products(products_ids, taxon_groups.flatten)
+        classifications_hash = classifications.to_h.transform_values { |taxon_ids| taxon_ids.split(',') }
+
+        # Find products ids that match all taxonomies to tighten filter results
+        classifications_hash.filter_map do |product_id, product_taxon_ids|
+          product_id if taxon_groups.all? { |group| group.intersect?(product_taxon_ids) }
+        end
+      end
     end
   end
 end

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

@@ -68,7 +68,7 @@ module Spree
         if Spree.use_translations?
           taxons.joins(:parent).
             join_translation_table(Taxon, 'parents_spree_taxons').
-            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
+            where(Taxon.translation_table_alias => { permalink: parent_permalink })
         else
           taxons.joins(:parent).where(parent: { permalink: parent_permalink })
         end

data/app/helpers/spree/base_helper.rb

@@ -136,10 +136,7 @@ module Spree
     def pretty_time(time)
       return '' if time.blank?
 
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#pretty_time` is deprecated and will be removed in Spree 6.0.
-        Please add `local_time` gem to your Gemfile and use `local_time(time)` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#pretty_time is deprecated and will be removed in Spree 6.0. Please add `local_time` gem to your Gemfile and use `local_time(time)` instead')
 
       [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
     end
@@ -147,10 +144,7 @@ module Spree
     def pretty_date(date)
       return '' if date.blank?
 
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#pretty_date` is deprecated and will be removed in Spree 6.0.
-        Please add `local_time` gem to your Gemfile and use `local_date(date)` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#pretty_date is deprecated and will be removed in Spree 6.0. Please add `local_time` gem to your Gemfile and use `local_date(date)` instead')
 
       [I18n.l(date.to_date, format: :long)].join(' ')
     end
@@ -219,19 +213,13 @@ module Spree
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#default_image_for_product` is deprecated and will be removed in Spree 6.0.
-        Please use `product.default_image` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#default_image_for_product is deprecated and will be removed in Spree 6.0. Please use product.default_image instead')
 
       product.default_image
     end
 
     def default_image_for_product_or_variant(product_or_variant)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#default_image_for_product_or_variant` is deprecated and will be removed in Spree 6.0.
-        Please use `product_or_variant.default_image` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#default_image_for_product_or_variant is deprecated and will be removed in Spree 6.0. Please use product_or_variant.default_image instead')
 
       product_or_variant.default_image
     end

data/app/helpers/spree/integrations_helper.rb

@@ -0,0 +1,15 @@
+module Spree
+  module IntegrationsHelper
+    def store_integrations
+      @store_integrations ||= current_store.integrations.active.to_a
+    end
+
+    def store_integration(name)
+      store_integrations.find { |integration| integration.type.to_s.demodulize.underscore == name }
+    end
+
+    def grouped_available_store_integrations
+      Rails.application.config.spree.integrations.group_by(&:integration_group).sort_by { |group, _| group }
+    end
+  end
+end

data/app/helpers/spree/mail_helper.rb

@@ -1,10 +1,11 @@
 module Spree
   module MailHelper
-    include BaseHelper
+    include Spree::BaseHelper
+    include Spree::ImagesHelper
 
     def variant_image_url(variant)
-      image = default_image_for_product_or_variant(variant)
-      image ? main_app.cdn_image_url(image.url(:small)) : image_url('noimage/small.png')
+      image = variant.default_image
+      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100) : image_url('noimage/small.png')
     end
 
     def name_for(order)

data/app/helpers/spree/products_helper.rb

@@ -121,10 +121,7 @@ module Spree
     end
 
     def related_products
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
-        Please use ProductsHelper#relations from now on.
-      DEPRECATION
+      Spree::Deprecation.warn('ProductsHelper#related_products is deprecated and will be removed in Spree 6.0. Please use ProductsHelper#relations from now on.')
 
       return [] unless @product.respond_to?(:has_related_products?)
 

data/app/javascript/spree/core/controllers/disable_submit_button_controller.js

@@ -0,0 +1,19 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["button"]
+
+  connect() {
+    this.element.addEventListener('submit', this.toggleDisabledButton)
+  }
+
+  disconnect() {
+    this.element.removeEventListener('submit', this.toggleDisabledButton)
+  }
+
+  toggleDisabledButton = () => {
+    if (this.hasButtonTarget) {
+      this.buttonTarget.disabled = !this.buttonTarget.disabled
+    }
+  }
+}

data/app/mailers/spree/invitation_mailer.rb

@@ -0,0 +1,24 @@
+module Spree
+  class InvitationMailer < BaseMailer
+    # invitation email, sending email to the invited to let them know they have been invited to join a store/account/vendor
+    def invitation_email(invitation)
+      @invitation = invitation
+      mail(to: invitation.email,
+           from: from_address,
+           reply_to: reply_to_address,
+           subject: Spree.t('invitation_mailer.invitation_email.subject',
+                            resource_name: invitation.resource&.name))
+    end
+
+    # sending email to the inviter to let them know the invitee has accepted the invitation
+    def invitation_accepted(invitation)
+      @invitation = invitation
+      mail(to: invitation.inviter.email,
+           from: from_address,
+           reply_to: reply_to_address,
+           subject: Spree.t('invitation_mailer.invitation_accepted.subject',
+                            invitee_name: invitation.invitee&.name,
+                            resource_name: invitation.resource&.name))
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module IntegrationsConcern
+    def store_integrations
+      @store_integrations ||= Spree::Store.current.integrations.active.to_a
+    end
+
+    def store_integration(name)
+      store_integrations.find { |integration| integration.type.to_s.demodulize.underscore == name }
+    end
+  end
+end

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

@@ -49,11 +49,11 @@ module Spree
       add_simple_scopes simple_scopes
 
       add_search_scope :ascend_by_master_price do
-        order("#{price_table_name}.amount ASC")
+        order(price_table_name => { amount: :asc })
       end
 
       add_search_scope :descend_by_master_price do
-        order("#{price_table_name}.amount DESC")
+        order(price_table_name => { amount: :desc })
       end
 
       add_search_scope :price_between do |low, high|
@@ -61,11 +61,11 @@ module Spree
       end
 
       add_search_scope :master_price_lte do |price|
-        where("#{price_table_name}.amount <= ?", price)
+        where(Price.table_name => { amount: ..price })
       end
 
       add_search_scope :master_price_gte do |price|
-        where("#{price_table_name}.amount >= ?", price)
+        where(Price.table_name => { amount: price.. })
       end
 
       add_search_scope :in_stock do
@@ -137,11 +137,11 @@ module Spree
           joins(:properties).
             join_translation_table(Property).
             join_translation_table(ProductProperty).
-            where("#{ProductProperty.translation_table_alias}.value = ?", value).
+            where(ProductProperty.translation_table_alias => { value: value }).
             where(property_conditions(property))
         else
           joins(:properties).
-            where("#{ProductProperty.table_name}.value = ?", value).
+            where(ProductProperty.table_name => { value: value }).
             where(property_conditions(property))
         end
       end

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

@@ -20,6 +20,10 @@ module Spree
       def translation_table_alias
         "#{self::Translation.table_name}_#{Mobility.normalize_locale(Mobility.locale)}"
       end
+
+      def arel_table_alias
+        Arel::Table.new(translation_table_alias)
+      end
     end
   end
 end

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

@@ -15,9 +15,23 @@ module Spree
                              end
         translatable_class_foreign_key = "#{translatable_class.table_name.singularize}_id"
 
-        joins("LEFT OUTER JOIN #{translatable_class::Translation.table_name} #{translatable_class.translation_table_alias}
-             ON #{translatable_class.translation_table_alias}.#{translatable_class_foreign_key} = #{join_on_table_name}.id
-             AND #{translatable_class.translation_table_alias}.locale = '#{Mobility.locale}'")
+        joins(
+          Arel::Nodes::OuterJoin.new(
+            Arel::Table.new(translatable_class::Translation.table_name).alias(translatable_class.translation_table_alias),
+            Arel::Nodes::On.new(
+              Arel::Nodes::And.new([
+                Arel::Nodes::Equality.new(
+                  Arel::Table.new(translatable_class.translation_table_alias)[translatable_class_foreign_key],
+                  Arel::Table.new(join_on_table_name)[:id]
+                ),
+                Arel::Nodes::Equality.new(
+                  Arel::Table.new(translatable_class.translation_table_alias)[:locale],
+                  Arel::Nodes::Quoted.new(Mobility.locale.to_s)
+                )
+              ])
+            )
+          )
+        )
       end
     end
   end

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

@@ -3,6 +3,8 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
+      auto_strip_attributes :name
+
       validates :name, presence: true,
                        uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
     end

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

@@ -0,0 +1,33 @@
+module Spree
+  module UserManagement
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :role_users, class_name: 'Spree::RoleUser', as: :resource, dependent: :destroy
+      has_many :users, through: :role_users, source: :user, source_type: Spree.admin_user_class.to_s
+      has_many :invitations, class_name: 'Spree::Invitation', as: :resource, dependent: :destroy
+    end
+
+    # Adds a user to the resource with the default user role
+    # If no role is provided, the default user role will be used
+    # If a role is provided, it will be used instead of the default user role
+    # @param user [Spree.admin_user_class] The user to add to the resource
+    # @param role [Spree::Role] The role to add the user to
+    def add_user(user, role = nil)
+      role = role || default_user_role
+      role_users.find_or_create_by!(user: user, role: role)
+    end
+
+    # Revokes a user's access to the resource
+    # @param user [Spree.admin_user_class] The user to remove from the resource
+    # @return [void]
+    def remove_user(user)
+      role_users.where(user: user).destroy_all
+    end
+
+    # this can be overridden in the base model to use a different user role, eg. 'vendor'
+    def default_user_role
+      Spree::Role.default_admin_role
+    end
+  end
+end

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

@@ -84,6 +84,11 @@ module Spree
       end
     end
 
+    # Returns the last incomplete spree order for the current store
+    # @param [Spree::Store] store
+    # @param [Hash] options
+    # @option options [Array<Symbol>] :includes
+    # @return [Spree::Order]
     def last_incomplete_spree_order(store, options = {})
       orders.where(store: store).incomplete.not_canceled.
         includes(options[:includes]).
@@ -91,12 +96,19 @@ module Spree
         first
     end
 
+    # Returns the total available store credit for the current store per currency
+    # @param [Spree::Store] store
+    # @param [String] currency
+    # @return [Float]
     def total_available_store_credit(currency = nil, store = nil)
       store ||= Store.default
       currency ||= store.default_currency
       store_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
+    # Returns the available store credits for the current store per currency
+    # @param [Spree::Store] store
+    # @return [Array<Spree::Money>]
     def available_store_credits(store)
       store ||= Store.default
 
@@ -105,12 +117,18 @@ module Spree
       end
     end
 
+    # Returns the default wishlist for the current store
+    # if no default wishlist exists, it creates one
+    # @param [Spree::Store] current_store
+    # @return [Spree::Wishlist]
     def default_wishlist_for_store(current_store)
       wishlists.find_by(is_default: true, store_id: current_store.id) || ActiveRecord::Base.connected_to(role: :writing) do
         wishlists.create!(store: current_store, is_default: true, name: Spree.t(:default_wishlist_name))
       end
     end
 
+    # Returns true if the user can be deleted
+    # @return [Boolean]
     def can_be_deleted?
       orders.complete.none?
     end
@@ -140,6 +158,7 @@ module Spree
       use_billing.in?([true, 'true', '1'])
     end
 
+    # Scrambles the email and names of the user
     def scramble_email_and_names
       self.email = "#{SecureRandom.uuid}@example.net"
       self.first_name = 'Deleted'

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

@@ -5,38 +5,64 @@ module Spree
     included do
       has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, as: :user, dependent: :destroy
       has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
+      has_many :stores, through: :role_users, source: :resource, source_type: 'Spree::Store'
+      has_many :invitations, class_name: 'Spree::Invitation', foreign_key: :invitee_id, dependent: :destroy
 
-      scope :spree_admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }
+      scope :spree_admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: Spree::Role::ADMIN_ROLE }) }
 
-      # 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
-        Spree::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
+      # Adds a role to a resource
+      #
+      # @param role_name [String] The name of the role to add, eg. 'admin'
+      # @param resource [Spree::Base] The resource to add the role to
+      # @return [Spree::RoleUser] The role user created
+      def add_role(role_name, resource = nil)
+        resource ||= Spree::Store.current
+        role = Spree::Role.find_by(name: role_name)
+        return if role.nil?
 
-        spree_admin
+        role_users.find_or_create_by!(role: role, resource: resource)
       end
 
-      def self.admin_created?
-        Spree::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
+      # Removes a role from a resource
+      #
+      # @param role_name [String] The name of the role to remove, eg. 'admin'
+      # @param resource [Spree::Base] The resource to remove the role from
+      def remove_role(role_name, resource = nil)
+        resource ||= Spree::Store.current
+        role = Spree::Role.find_by(name: role_name)
+        return if role.nil?
 
-        spree_admin_created?
+        role_users.where(role: role, resource: resource).destroy_all
       end
 
-      def admin?
-        Spree::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
+      # has_spree_role? simply needs to return true or false whether a user has a role or not.
+      #
+      # @param role_name [String] The name of the role to check for
+      # @param resource [Spree::Base] The resource to get roles for
+      # @return [Boolean] Whether the user has the role for the resource
+      def has_spree_role?(role_name, resource = nil)
+        resource ||= Spree::Store.current
 
-        spree_admin?
+        role_users.where(resource: resource).joins(:role).where(Spree::Role.table_name => { name: role_name }).exists?
       end
 
       def self.spree_admin_created?
         spree_admin.exists?
       end
 
-      def spree_admin?
-        has_spree_role?('admin')
+      # Returns true if the user has the admin role for a given resource
+      #
+      # @param resource [Spree::Base] The resource to check the admin role for
+      # @return [Boolean] Whether the user has the admin role for the resource
+      def spree_admin?(resource = nil)
+        resource ||= Spree::Store.current
+        has_spree_role?(Spree::Role::ADMIN_ROLE, resource)
+      end
+
+      # Returns the user who invited the current user
+      # @return [Spree.admin_user_class]
+      def invited_by
+        invitations.first&.inviter
       end
     end
   end

data/app/models/spree/ability.rb

@@ -23,15 +23,16 @@ module Spree
       abilities.delete(ability)
     end
 
-    def initialize(user)
+    def initialize(user, options = {})
       alias_cancan_delete_action
 
       user ||= Spree.user_class.new
+      store ||= options[:store] || Spree::Current.store
 
-      if user.persisted? && user.try(:spree_admin?)
-        apply_admin_permissions(user)
+      if user.persisted? && user.is_a?(Spree.admin_user_class) && user.try(:spree_admin?, store)
+        apply_admin_permissions(user, options)
       else
-        apply_user_permissions(user)
+        apply_user_permissions(user, options)
       end
 
       # Include any abilities registered by extensions, etc.
@@ -56,7 +57,7 @@ module Spree
       alias_action :create, :update, :destroy, to: :modify
     end
 
-    def apply_admin_permissions(user)
+    def apply_admin_permissions(_user, _options)
       can :manage, :all
       cannot :cancel, Spree::Order
       can :cancel, Spree::Order, &:allow_cancel?
@@ -64,7 +65,7 @@ module Spree
       cannot [:edit, :update], Spree::ReimbursementType, mutable: false
     end
 
-    def apply_user_permissions(user)
+    def apply_user_permissions(user, _options)
       can :read, ::Spree::Country
       can :read, ::Spree::OptionType
       can :read, ::Spree::OptionValue
@@ -95,6 +96,7 @@ module Spree
       can [:create, :update, :destroy], ::Spree::WishedItem do |wished_item|
         wished_item.wishlist.user == user
       end
+      can :accept, Spree::Invitation, invitee_id: [user.id, nil], invitee_type: user.class.name, status: 'pending'
     end
 
     def protect_admin_role

data/app/models/spree/asset.rb

@@ -17,12 +17,7 @@ module Spree
 
     store_accessor :private_metadata, :session_uploaded_assets_uuid
     scope :with_session_uploaded_assets_uuid, lambda { |uuid|
-      case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL'
-        where("#{table_name}.private_metadata @> ?", { session_uploaded_assets_uuid: uuid }.to_json)
-      when 'Mysql2', 'SQLite'
-        where("JSON_EXTRACT(private_metadata, '$.session_uploaded_assets_uuid') = '#{uuid}'")
-      end
+      where(session_id: uuid)
     }
 
     def product

data/app/models/spree/base.rb

@@ -2,6 +2,7 @@ class Spree::Base < ApplicationRecord
   include Spree::Preferences::Preferable
   include Spree::RansackableAttributes
   include Spree::TranslatableResourceScopes
+  include Spree::IntegrationsConcern
 
   after_initialize do
     if has_attribute?(:preferences) && !preferences.nil?

data/app/models/spree/base_analytics_event_handler.rb

@@ -5,13 +5,16 @@ module Spree
     # @param opts [Hash] The options
     # @option opts [User] :user
     # @option opts [String] :session_id
+    # @option opts [Spree::Store] :store
     def initialize(opts = {})
       @user = opts[:user]
       @session = opts[:session]
       @request = opts[:request]
+      @store = opts[:store]
+      @visitor_id = opts[:visitor_id]
     end
 
-    attr_reader :user, :session, :request
+    attr_reader :user, :session, :request, :store, :visitor_id
 
     # Returns the client
     # @return [Object] The client object
@@ -42,7 +45,9 @@ module Spree
     def identity_hash
       {
         user_id: user&.id,
-        session_id: session&.id
+        # session.id is a custom class (not a string), which has overridden the `to_json` method, we have to convert it to a string first so it does not send garbage to the analytics service
+        session_id: session&.id&.to_s,
+        visitor_id: visitor_id
       }
     end
   end

data/app/models/spree/classification.rb

@@ -23,5 +23,18 @@ module Spree
         group("#{Spree::Classification.table_name}.id").
         reorder(completed_orders_count: order_direction, completed_orders_total: order_direction)
     }
+
+    scope :grouped_taxon_ids_for_products, lambda { |product_ids, taxon_groups|
+      where(product_id: product_ids, taxon_id: taxon_groups).
+        group(:product_id).
+        then do |query|
+        case ActiveRecord::Base.connection.adapter_name
+        when 'PostgreSQL'
+          query.pluck(:product_id, Arel.sql("STRING_AGG(taxon_id::text, ',')"))
+        when 'Mysql2', 'SQLite'
+          query.pluck(:product_id, Arel.sql('GROUP_CONCAT(taxon_id)'))
+        end
+      end
+    }
   end
 end

data/app/models/spree/custom_domain.rb

@@ -14,7 +14,7 @@ module Spree
     # Validations
     #
     validates :url, presence: true, uniqueness: true, format: {
-      with: %r{[a-z][a-z0-9-]*[a-z0-9]}i
+      with: %r{\A(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\z}i
     }, length: { in: 1..63 }
     validate :url_is_valid
 
@@ -26,6 +26,7 @@ module Spree
     after_validation :ensure_default, on: :create
 
     def url_is_valid
+      return if url.blank?
       parts = url.split('.')
 
       errors.add(:url, 'use domain or subdomain') if (parts[0] != 'www' && parts.size > 3) || (parts[0] == 'www' && parts.size > 4) || parts.size < 2