spree_core 4.3.0.rc1 → 4.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b031163e0c77da6776854068fb9769ed6cd44ff048e75a088ee6526c40db986
-  data.tar.gz: 2cfbcbfb7a1c5221270e7b677222a94047b5965cb32e5144ca6540d927f2b51b
+  metadata.gz: 7688ca0eb67dbbcd2236ebafb2c3eed22d8d29dbf40924d82b52eba8bf52db9e
+  data.tar.gz: '0689424db68d0822931238faad67fcc9292e0f2cd5487ed6c234acbea8b79720'
 SHA512:
-  metadata.gz: 375bd44efe93e706a1bd58abcc9be1fb3f2af0b0a993fe223a1e093033193105012284e0a7f03413fad0099feb105fa4b1526b8d576d76e58e62e37967c67768
-  data.tar.gz: c82f2406e121b6fff092677e91d0344e35c5b6e19aee5aca1916ee819d7909a42ef854653922413e215c67934cb73df2a1af002fbe3d48f53db99ff854d80f93
+  metadata.gz: 4d8dd9a06af740248a017b5f2b608f11cf19f5df647129837de2c3248c529da621402928dce4c5d9338ded7bb4282509eb0723d772a1a93b9006c8845d213fc6
+  data.tar.gz: 7d9689023479c36a36407b650d870d0640f38bff6c456b4722579f5bd0cb9b29a937a9b8c476862e1adcc8bc3339dd801ae4e2b6e8ecf0564e35830d8abc3842

data/app/finders/spree/option_values/find_available.rb

@@ -9,12 +9,20 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope)
+        find_available(scope, products_scope).select(select_args).order(order_args)
       end
 
       private
 
       attr_reader :scope, :products_scope
+
+      def select_args
+        "#{OptionValue.table_name}.*, #{OptionType.table_name}.position AS option_type_position"
+      end
+
+      def order_args
+        "option_type_position, #{OptionValue.table_name}.position"
+      end
     end
   end
 end

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?
@@ -148,7 +154,7 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products_ids = options.map { |key, value| products.with_option_value(key, value).ids }
+        products_ids = options.map { |key, value| products.with_option_value(key, value)&.ids }.compact.uniq
         products.where(id: products_ids.reduce(&:intersection))
       end
 
@@ -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

@@ -65,7 +65,7 @@ module Spree
                      elsif current_store.logo.attached? && current_store.logo.image?
                        main_app.url_for(current_store.logo)
                      else
-                       Spree::Config[:logo]
+                      'logo/spree_50.png'
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -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
 
@@ -267,9 +269,5 @@ module Spree
 
       tag('meta', name: 'robots', content: current_store.seo_robots)
     end
-
-    def taxon_wysiwyg_editor_enabled?
-      Spree::Config[:taxon_wysiwyg_editor_enabled]
-    end
   end
 end

data/app/helpers/spree/currency_helper.rb

@@ -1,7 +1,7 @@
 module Spree
   module CurrencyHelper
     def currency_options(selected_value = nil)
-      selected_value ||= Spree::Config[:currency]
+      selected_value ||= Spree::Store.default.default_currency
       currencies = ::Money::Currency.table.map do |_code, details|
         iso = details[:iso_code]
         [iso, "#{details[:name]} (#{iso})"]

data/app/helpers/spree/products_helper.rb

@@ -44,20 +44,6 @@ module Spree
       variants_option_types_presenter(variants, product).options
     end
 
-    def product_wysiwyg_editor_enabled?
-      Spree::Config[:product_wysiwyg_editor_enabled]
-    end
-
-    # converts line breaks in product description into <p> tags (for html display purposes)
-    def product_description(product)
-      description = if Spree::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled?
-                      product.description
-                    else
-                      product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
-                    end
-      description.blank? ? Spree.t(:product_has_no_description) : description
-    end
-
     def line_item_description_text(description_text)
       if description_text.present?
         truncate(strip_tags(description_text.gsub('&nbsp;', ' ').squish), length: 100)
@@ -82,7 +68,7 @@ module Spree
       cache_key_elements.compact.join('/')
     end
 
-    def limit_descritpion(string)
+    def limit_description(string)
       return string if string.length <= 450
 
       string.slice(0..449) + '...'

data/app/jobs/spree/base_job.rb

@@ -0,0 +1,4 @@
+module Spree
+  class BaseJob < ApplicationJob
+  end
+end

data/app/jobs/spree/stock_locations/stock_items/create_job.rb

@@ -0,0 +1,13 @@
+module Spree
+  module StockLocations
+    module StockItems
+      class CreateJob < Spree::BaseJob
+        queue_as :spree_stock_location_stock_items
+
+        def perform(stock_location)
+          Spree::StockLocations::StockItems::Create.call(stock_location: stock_location)
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Spree
 
     included do
       has_one :default_price,
-              -> { with_deleted.where(currency: Spree::Config[:currency]) },
+              -> { with_deleted.where(currency: Spree::Store.default.default_currency) },
               class_name: 'Spree::Price',
               dependent: :destroy
 

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

@@ -17,13 +17,19 @@ 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))
+
+            amount = args_list.blank? ? send(method_name) : send(method_name, **args_list)
+
+            Spree::Money.new(amount, 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/memoized_data.rb

@@ -3,7 +3,7 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      # reset cache on save inside trasaction and transaction commit
+      # reset cache on save inside transaction and transaction commit
       after_save :reset_memoized_data
       after_commit :reset_memoized_data
 

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

@@ -0,0 +1,10 @@
+module Spree
+  module Metadata
+    extend ActiveSupport::Concern
+
+    included do
+      store :public_metadata, coder: JSON
+      store :private_metadata, coder: JSON
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Spree
       errors.add(:stores, Spree.t(:must_have_one_store))
     end
 
-    # this can be overriden on model basis
+    # this can be overridden on model basis
     def disable_store_presence_validation?
       Spree::Config[:disable_store_presence_validation]
     end

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

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false }
+      include UniqueName
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Spree
+  module NumberIdentifier
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :uppercase_number
+
+      validates :number, presence: true, length: { maximum: 32, allow_blank: true },
+                         uniqueness: { allow_blank: true, case_sensitive: true, scope: spree_base_uniqueness_scope }
+    end
+
+    protected
+
+    def uppercase_number
+      number&.to_s&.upcase!
+    end
+  end
+end

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

@@ -27,16 +27,21 @@ module Spree
           next if name.to_s.include?('master_price')
 
           parts = name.to_s.match(/(.*)_by_(.*)/)
-          scope(name.to_s, -> { order(Arel.sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}")) })
+          scope(name.to_s, -> { order(Arel.sql(sanitize_sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}"))) })
         end
       end
 
       def self.property_conditions(property)
         properties = Property.table_name
         case property
-        when String   then { "#{properties}.name" => property }
         when Property then { "#{properties}.id" => property.id }
-        else { "#{properties}.id" => property.to_i }
+        when Integer  then { "#{properties}.id" => property }
+        else
+          if Property.column_for_attribute('id').type == :uuid
+            ["#{properties.name} = ? OR #{properties.id} = ?", property, property]
+          else
+            { "#{properties}.name" => property }
+          end
         end
       end
 
@@ -62,6 +67,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
       #
@@ -127,26 +144,34 @@ module Spree
       end
 
       add_search_scope :with_option do |option|
-        option_types = OptionType.table_name
-        conditions = case option
-                     when String     then { "#{option_types}.name" => option }
-                     when OptionType then { "#{option_types}.id" => option.id }
-                     else { "#{option_types}.id" => option.to_i }
-                     end
-
-        joins(:option_types).where(conditions)
+        if option.is_a?(OptionType)
+          joins(:option_types).where(spree_option_types: { id: option.id })
+        elsif option.is_a?(Integer)
+          joins(:option_types).where(spree_option_types: { id: option })
+        elsif OptionType.column_for_attribute('id').type == :uuid
+          joins(:option_types).where(spree_option_types: { name: option }).or(Product.joins(:option_types).where(spree_option_types: { id: option }))
+        else
+          joins(:option_types).where(spree_option_types: { name: option })
+        end
       end
 
       add_search_scope :with_option_value do |option, value|
-        option_values = OptionValue.table_name
         option_type_id = case option
-                         when String then OptionType.find_by(name: option) || option.to_i
                          when OptionType then option.id
-                         else option.to_i
+                         when Integer then option
+                         else
+                           if OptionType.column_for_attribute('id').type == :uuid
+                             OptionType.where(id: option).or(OptionType.where(name: option))&.first&.id
+                           else
+                             OptionType.where(name: option)&.first&.id
+                           end
                          end
 
-        conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-        group('spree_products.id').joins(variants_including_master: :option_values).where(conditions)
+        return Product.group("#{Spree::Product.table_name}.id").none if option_type_id.blank?
+
+        group("#{Spree::Product.table_name}.id").
+          joins(variants_including_master: :option_values).
+          where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
       end
 
       # Finds all products which have either:
@@ -233,7 +258,7 @@ module Spree
         scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
 
         unless Spree::Config.show_products_without_price
-          currency ||= Spree::Config[:currency]
+          currency ||= Spree::Store.default.default_currency
           scope = scope.with_currency(currency)
         end
 
@@ -265,6 +290,26 @@ module Spree
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end
 
+      # .search_by_name
+      if defined?(PgSearch)
+        include PgSearch::Model
+
+        if defined?(SpreeGlobalize)
+          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: :tsearch
+        else
+          pg_search_scope :search_by_name, against: :name, using: :tsearch
+        end
+      else
+        def self.search_by_name(query)
+          if defined?(SpreeGlobalize)
+            joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
+          else
+            where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
+          end
+        end
+      end
+      search_scopes << :search_by_name
+
       def self.price_table_name
         Price.quoted_table_name
       end
@@ -288,14 +333,11 @@ module Spree
       private_class_method :prepare_words
 
       def self.get_taxons(*ids_or_records_or_names)
-        taxons = Taxon.table_name
         ids_or_records_or_names.flatten.map do |t|
           case t
-          when Integer then Taxon.find_by(id: t)
           when ApplicationRecord then t
-          when String
-            Taxon.find_by(name: t) ||
-              Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
+          else
+            Taxon.where(name: t).or(Taxon.where(id: t)).or(Taxon.where("permalink LIKE ? OR permalink = ?", "%/#{t}/", "#{t}/")).first
           end
         end.compact.flatten.uniq
       end

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/unique_name.rb

@@ -0,0 +1,10 @@
+module Spree
+  module UniqueName
+    extend ActiveSupport::Concern
+
+    included do
+      validates :name, presence: true,
+                       uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
+    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'
 
@@ -27,6 +25,8 @@ module Spree
       belongs_to :ship_address, class_name: 'Spree::Address', optional: true
       belongs_to :bill_address, class_name: 'Spree::Address', optional: true
 
+      has_many :wishlists, class_name: 'Spree::Wishlist', foreign_key: :user_id
+
       self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses]
       self.whitelisted_ransackable_attributes = %w[id email]
 
@@ -47,11 +47,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 +60,21 @@ 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
+
+    def default_wishlist_for_store(current_store)
+      wishlists.find_or_create_by(is_default: true, store_id: current_store.id) do |wishlist|
+        wishlist.name = Spree.t(:default_wishlist_name)
+        wishlist.save
+      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.order(currency: :desc)
     end
   end
 end