spree_core 4.8.3 → 4.10.0

data/app/models/spree/stock_item/webhooks.rb

@@ -0,0 +1,6 @@
+module Spree
+  class StockItem < Spree::Base
+    module Webhooks
+    end
+  end
+end

data/app/models/spree/stock_item.rb

@@ -3,9 +3,7 @@ module Spree
     acts_as_paranoid
 
     include Spree::Metadata
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
+    include Spree::StockItem::Webhooks
 
     with_options inverse_of: :stock_items do
       belongs_to :stock_location, class_name: 'Spree::StockLocation'

data/app/models/spree/stock_location.rb

@@ -11,6 +11,8 @@ module Spree
       include Spree::VendorConcern
     end
 
+    acts_as_paranoid
+
     has_many :shipments
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :variants, through: :stock_items
@@ -122,6 +124,19 @@ module Spree
       end
     end
 
+    def address
+      Spree::Address.new(
+        address1: address1,
+        address2: address2,
+        city: city,
+        state: state,
+        state_name: state_name,
+        country: country,
+        zipcode: zipcode,
+        phone: phone
+      )
+    end
+
     private
 
     def create_stock_items

data/app/models/spree/stock_movement/webhooks.rb

@@ -0,0 +1,6 @@
+module Spree
+  class StockMovement < Spree::Base
+    module Webhooks
+    end
+  end
+end

data/app/models/spree/stock_movement.rb

@@ -5,9 +5,7 @@ module Spree
       min: -2**31
     }.freeze
 
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
+    include Spree::StockMovement::Webhooks
 
     belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements
     belongs_to :originator, polymorphic: true

data/app/models/spree/store.rb

@@ -110,11 +110,7 @@ module Spree
     after_commit :clear_cache
 
     def self.current(url = nil)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `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
+      Spree::Dependencies.current_store_finder.constantize.new(url: url).execute
     end
 
     # FIXME: we need to drop `or_initialize` in v5
@@ -131,9 +127,7 @@ module Spree
     end
 
     def self.available_locales
-      Rails.cache.fetch('stores_available_locales') do
-        Spree::Store.all.map(&:supported_locales_list).flatten.uniq
-      end
+      Spree::Store.all.map(&:supported_locales_list).flatten.uniq
     end
 
     def default_menu(location)
@@ -249,7 +243,6 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
-      Rails.cache.delete('stores_available_locales')
     end
 
     def ensure_default_country

data/app/models/spree/store_credit.rb

@@ -19,13 +19,16 @@ module Spree
     DEFAULT_CREATED_BY_EMAIL = 'spree@example.com'.freeze
 
     belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id'
-    belongs_to :category, class_name: 'Spree::StoreCreditCategory'
-    belongs_to :created_by, class_name: Spree.admin_user_class.to_s, foreign_key: 'created_by_id'
-    belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
+    belongs_to :category, class_name: 'Spree::StoreCreditCategory', optional: true
+    belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", foreign_key: 'created_by_id', optional: true
+    belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id', optional: true
     belongs_to :store, class_name: 'Spree::Store'
+
     has_many :store_credit_events, class_name: 'Spree::StoreCreditEvent'
+    has_many :payments, as: :source, class_name: 'Spree::Payment'
+    has_many :orders, through: :payments, class_name: 'Spree::Order'
 
-    validates :user, :category, :credit_type, :created_by, :currency, :store, presence: true
+    validates :currency, :store, presence: true
     validates :amount, numericality: { greater_than: 0 }
     validates :amount_used, numericality: { greater_than_or_equal_to: 0 }
     validate :amount_used_less_than_or_equal_to_amount
@@ -36,7 +39,10 @@ module Spree
 
     scope :order_by_priority, -> { includes(:credit_type).order('spree_store_credit_types.priority ASC') }
 
-    before_validation :associate_credit_type
+    scope :not_authorized, -> { where(amount_authorized: 0) }
+    scope :not_used, -> { where(amount_authorized: 0) }
+    scope :available, -> { not_authorized.not_used }
+
     after_save :store_event
     before_destroy :validate_no_amount_used
 
@@ -249,12 +255,5 @@ module Spree
         throw(:abort)
       end
     end
-
-    def associate_credit_type
-      unless type_id
-        credit_type_name = category.try(:non_expiring?) ? 'Non-expiring' : 'Expiring'
-        self.credit_type = Spree::StoreCreditType.find_or_create_by(name: credit_type_name)
-      end
-    end
   end
 end

data/app/models/spree/store_favicon_image.rb

@@ -1,11 +1,5 @@
 module Spree
   class StoreFaviconImage < Asset
-    if Spree.public_storage_service_name
-      has_one_attached :attachment, service: Spree.public_storage_service_name
-    else
-      has_one_attached :attachment
-    end
-
     VALID_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freeze
 
     validates :attachment,

data/app/models/spree/store_logo.rb

@@ -1,9 +1,4 @@
 module Spree
   class StoreLogo < Asset
-    if Spree.public_storage_service_name
-      has_one_attached :attachment, service: Spree.public_storage_service_name
-    else
-      has_one_attached :attachment
-    end
   end
 end

data/app/models/spree/store_mailer_logo.rb

@@ -1,11 +1,5 @@
 module Spree
   class StoreMailerLogo < Asset
-    if Spree.public_storage_service_name
-      has_one_attached :attachment, service: Spree.public_storage_service_name
-    else
-      has_one_attached :attachment
-    end
-
     VALID_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
 
     validates :attachment, content_type: VALID_CONTENT_TYPES

data/app/models/spree/tax_rate.rb

@@ -115,11 +115,13 @@ module Spree
 
     def amount_for_label
       return '' unless show_rate_in_label?
+      return '' if amount.zero?
 
       ' ' + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
         locale: I18n.locale,
-        strip_insignificant_zeros: true
+        strip_insignificant_zeros: true,
+        precision: 2
       )
     end
   end

data/app/models/spree/taxon.rb

@@ -13,7 +13,6 @@ module Spree
     extend FriendlyId
     friendly_id :permalink, slug_column: :permalink, use: :history
     before_validation :set_permalink, on: :create, if: :name
-    alias_attribute :slug, :permalink
 
     acts_as_nested_set dependent: :destroy
 
@@ -21,6 +20,8 @@ module Spree
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
+    delegate :store, to: :taxonomy
+
     has_many :menu_items, as: :linked_resource
     has_many :cms_sections, as: :linked_resource
 
@@ -44,9 +45,13 @@ module Spree
     end
 
     before_validation :copy_taxonomy_from_parent
+    before_save :set_pretty_name
+    before_save :set_permalink
     after_save :touch_ancestors_and_taxonomy
     after_update :sync_taxonomy_name
     after_touch :touch_ancestors_and_taxonomy
+    after_commit :regenerate_pretty_name_and_permalink, on: :update, if: :should_regenerate_pretty_name_and_permalink?
+    after_move :regenerate_pretty_name_and_permalink
 
     has_one :store, through: :taxonomy
 
@@ -59,17 +64,45 @@ module Spree
 
     scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
 
-    TRANSLATABLE_FIELDS = %i[name description permalink].freeze
+    TRANSLATABLE_FIELDS = %i[name pretty_name description permalink].freeze
     translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
 
+    def slug
+      permalink
+    end
+
+    def slug=(value)
+      self.permalink = value
+    end
+
     self::Translation.class_eval do
-      alias_attribute :slug, :permalink
       before_save :set_permalink
+      before_save :set_pretty_name
+
+      def slug
+        permalink
+      end
+
+      def slug=(value)
+        self.permalink = value
+      end
 
       def set_permalink
         self.permalink = generate_slug
       end
 
+      def set_pretty_name
+        self[:pretty_name] = generate_pretty_name
+      end
+
+      def name_with_fallback
+        name.blank? ? translated_model.name : name
+      end
+
+      def pretty_name_with_fallback
+        pretty_name.blank? ? translated_model.pretty_name : pretty_name
+      end
+
       private
 
       def generate_slug
@@ -82,12 +115,22 @@ module Spree
         end
       end
 
+      def generate_pretty_name
+        if parent.present?
+          generate_pretty_name_including_parent
+        elsif pretty_name.blank?
+          pretty_name_with_fallback
+        else
+          pretty_name
+        end
+      end
+
       def generate_permalink_including_parent
         [parent_permalink_with_fallback, (permalink.blank? ? name_with_fallback.to_url : permalink.split('/').last.to_url)].join('/')
       end
 
-      def name_with_fallback
-        name.blank? ? translated_model.name : name
+      def generate_pretty_name_including_parent
+        [parent_pretty_name_with_fallback, (pretty_name.blank? ? name_with_fallback : pretty_name)].compact.join(' -> ')
       end
 
       def parent
@@ -98,6 +141,11 @@ module Spree
         localized_parent = parent.translations.find_by(locale: locale)
         localized_parent.present? ? localized_parent.permalink : parent.permalink
       end
+
+      def parent_pretty_name_with_fallback
+        localized_parent = parent.translations.find_by(locale: locale)
+        localized_parent.present? ? localized_parent.pretty_name : parent.pretty_name
+      end
     end
 
     # indicate which filters should be used for a taxon
@@ -117,13 +165,12 @@ module Spree
       meta_title.blank? ? name : meta_title
     end
 
-    # Creates permalink base for friendly_id
-    def set_permalink
-      if Spree.use_translations?
-        translations.each(&:set_permalink)
-      else
-        self.permalink = generate_slug
-      end
+    def set_pretty_name
+      self[:pretty_name] = generate_pretty_name
+    end
+
+    def generate_pretty_name
+      [parent&.pretty_name, name].compact.join(' -> ')
     end
 
     def generate_slug
@@ -136,15 +183,30 @@ module Spree
       end
     end
 
+    def set_permalink
+      if Spree.use_translations?
+        translations.each(&:set_permalink)
+      else
+        self.permalink = generate_slug
+      end
+    end
+
     def active_products
       products.active
     end
 
-    def pretty_name
-      ancestor_chain = ancestors.inject('') do |name, ancestor|
-        name += "#{ancestor.name} -> "
-      end
-      ancestor_chain + name.to_s
+    def regenerate_pretty_name_and_permalink
+      set_permalink
+      update_columns(pretty_name: generate_pretty_name, updated_at: Time.current)
+
+      children.reload.each(&:regenerate_pretty_name_and_permalink_as_child)
+    end
+
+    def regenerate_pretty_name_and_permalink_as_child
+      set_permalink
+      update_columns(pretty_name: generate_pretty_name, updated_at: Time.current)
+
+      children.reload.each(&:regenerate_pretty_name_and_permalink_as_child)
     end
 
     def cached_self_and_descendants_ids
@@ -165,6 +227,10 @@ module Spree
 
     private
 
+    def should_regenerate_pretty_name_and_permalink?
+      saved_changes.key?(:name) || saved_changes.key?(:permalink)
+    end
+
     def sync_taxonomy_name
       if saved_changes.key?(:name) && root?
         return if taxonomy.name.to_s == name.to_s

data/app/models/spree/taxon_image/configuration/active_storage.rb

@@ -5,12 +5,6 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          if Spree.public_storage_service_name
-            has_one_attached :attachment, service: Spree.public_storage_service_name
-          else
-            has_one_attached :attachment
-          end
-
           validates :attachment, content_type: /\Aimage\/.*\z/
 
           default_scope { includes(attachment_attachment: :blob) }

data/app/models/spree/taxonomy.rb

@@ -2,6 +2,7 @@ module Spree
   class Taxonomy < Spree::Base
     include Spree::TranslatableResource
     include Spree::Metadata
+    include Spree::SingleStoreResource
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end

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

@@ -0,0 +1,6 @@
+module Spree
+  class Variant < Spree::Base
+    module Webhooks
+    end
+  end
+end

data/app/models/spree/variant.rb

@@ -5,9 +5,7 @@ module Spree
 
     include Spree::MemoizedData
     include Spree::Metadata
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
+    include Spree::Variant::Webhooks
 
     MEMOIZED_METHODS = %w(purchasable in_stock backorderable tax_category options_text compare_at_price)
 
@@ -108,6 +106,14 @@ module Spree
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
     end
+
+    scope :with_option_value, lambda { |option_name, option_value|
+      option_type_ids = OptionType.where(name: option_name).ids
+      return none if option_type_ids.empty?
+
+      joins(:option_values).where(Spree::OptionValue.table_name => { name: option_value, option_type_id: option_type_ids })
+    }
+
     # FIXME: cost price should be represented with DisplayMoney class
     LOCALIZED_NUMBERS = %w(cost_price weight depth width height)
 
@@ -122,13 +128,18 @@ module Spree
     self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
 
     def self.product_name_or_sku_cont(query)
+      sanitized_query = ActiveRecord::Base.sanitize_sql_like(query.to_s.downcase.strip)
+      query_pattern = "%#{sanitized_query}%"
+      sku_condition = arel_table[:sku].lower.matches(query_pattern)
+
       if Spree.use_translations?
+        product_name_condition = Product.translation_table[:name].lower.matches(query_pattern)
         joins(:product).
           join_translation_table(Product).
-          where("LOWER(#{Product.translation_table_alias}.name) LIKE LOWER(:query)
-                 OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+          where(product_name_condition.or(sku_condition))
       else
-        joins(:product).where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query) OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+        product_name_condition = Product.arel_table[:name].lower.matches(query_pattern)
+        joins(:product).where(product_name_condition.or(sku_condition))
       end
     end
 
@@ -172,6 +183,18 @@ module Spree
       !!deleted_at
     end
 
+    # Returns an array of hashes with the option type name, value and presentation
+    # @return [Array<Hash>]
+    def options
+      option_values.includes(:option_type).map do |option_value|
+        {
+          name: option_value.option_type.name,
+          value: option_value.name,
+          presentation: option_value.presentation
+        }
+      end
+    end
+
     def options=(options = {})
       options.each do |option|
         next if option[:name].blank? || option[:value].blank?

data/app/models/spree/wishlist.rb

@@ -15,6 +15,8 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
 
     has_many :wished_items, class_name: 'Spree::WishedItem', dependent: :destroy
+    has_many :variants, through: :wished_items, source: :variant, class_name: 'Spree::Variant'
+    has_many :products, -> { distinct }, through: :variants, source: :product, class_name: 'Spree::Product'
 
     after_commit :ensure_default_exists_and_is_unique
     validates :name, :store, :user, presence: true
@@ -27,6 +29,13 @@ module Spree
       token
     end
 
+    # returns the number of wished items in the wishlist
+    #
+    # @return [Integer]
+    def wished_items_count
+      @wished_items_count ||= variant_ids.count
+    end
+
     def self.get_by_param(param)
       find_by(token: param)
     end

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

@@ -19,10 +19,22 @@ module Spree
         join_options(options)
       end
 
+      def to_hash
+        options = option_values
+        options = sort_options(options)
+        options = present_options_as_hash(options)
+
+        join_hash_options(options)
+      end
+
       private
 
       def sort_options(options)
-        options.sort_by { |o| o.option_type.position }
+        if options.first&.association(:option_type)&.loaded?
+          options.sort_by { |o| o.option_type.position }
+        else
+          options.includes(:option_type).sort_by { |o| o.option_type.position }
+        end
       end
 
       def present_options(options)
@@ -34,7 +46,7 @@ module Spree
       end
 
       def present_color_option(option)
-        "#{option.option_type.presentation}: #{option.name}"
+        "#{option.option_type.presentation}: #{option.presentation}"
       end
 
       def present_option(option)
@@ -44,6 +56,26 @@ module Spree
       def join_options(options)
         options.to_sentence(words_connector: WORDS_CONNECTOR, two_words_connector: WORDS_CONNECTOR)
       end
+
+      def present_options_as_hash(options)
+        options.map do |ov|
+          method = "present_#{ov.option_type.name}_option_as_hash"
+
+          respond_to?(method, true) ? send(method, ov) : present_option_as_hash(ov)
+        end
+      end
+
+      def present_option_as_hash(option)
+        {}.tap do |hash|
+          hash.store(option.option_type.presentation.downcase, option.presentation)
+        end
+      end
+
+      def join_hash_options(options)
+        return {} if options.empty?
+
+        options.inject(:merge).symbolize_keys
+      end
     end
   end
 end

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

@@ -16,6 +16,8 @@ module Spree
         options ||= {}
         quantity ||= 1
 
+        return failure(variant, "#{variant.name} is not available in #{order.currency}") if variant.amount_in(order.currency).nil?
+
         line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
 
         line_item_created = line_item.nil?

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

@@ -7,31 +7,41 @@ module Spree
         run :check_if_can_be_destroyed
         run :cancel_shipments
         run :void_payments
+        run :clear_addresses
         run :destroy_order
       end
 
       private
 
       def check_if_can_be_destroyed(order:)
-        return failure(Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?
+        return failure(false, Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?
 
         success(order: order)
       end
 
       def cancel_shipments(order:)
-        order.shipments.each(&:cancel!)
+        order.shipments.each(&:cancel)
 
         success(order: order)
       end
 
       def void_payments(order:)
-        order.payments.each(&:void!)
+        order.payments.each(&:void)
+
+        success(order: order)
+      end
+
+      def clear_addresses(order:)
+        order.ship_address = nil unless order.ship_address&.can_be_deleted?
+        order.bill_address = nil unless order.bill_address&.can_be_deleted?
 
         success(order: order)
       end
 
       def destroy_order(order:)
-        order.destroy
+        destroyed_result = order.destroy
+
+        return failure(false, Spree.t(:cannot_be_destroyed)) unless destroyed_result.present?
 
         success(order)
       end

data/app/services/spree/seeds/all.rb

@@ -21,6 +21,9 @@ module Spree
           # store & stock location
           Stores.call
           StockLocations.call
+
+          # add store resources
+          PaymentMethods.call
         end
       end
     end

data/app/services/spree/seeds/payment_methods.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Seeds
+    class PaymentMethods
+      prepend Spree::ServiceModule::Base
+
+      def call
+        payment_method = Spree::PaymentMethod::StoreCredit.find_or_initialize_by(
+          name: Spree.t(:store_credit_name),
+          description: Spree.t(:store_credit_name),
+          active: true
+        )
+
+        payment_method.stores = Spree::Store.all if payment_method.new_record?
+        payment_method.save!
+      end
+    end
+  end
+end

data/app/services/spree/seeds/stock_locations.rb

@@ -6,7 +6,7 @@ module Spree
       def call
         country = Spree::Store.default.default_country
         Spree::StockLocation.find_or_create_by!(
-          name: 'default',
+          name: Spree.t(:default_stock_location_name),
           propagate_all_variants: false,
           country: country,
           active: true,