spree_core 4.4.0 → 4.5.0

data/app/models/spree/state_change.rb

@@ -1,6 +1,6 @@
 module Spree
   class StateChange < Spree::Base
-    belongs_to :user, class_name: Spree.user_class.to_s, optional: true
+    belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
     belongs_to :stateful, polymorphic: true
 
     def <=>(other)

data/app/models/spree/stock/availability_validator.rb

@@ -14,9 +14,15 @@ module Spree
         display_name = variant.name.to_s
         display_name += " (#{variant.options_text})" unless variant.options_text.blank?
 
-        line_item.errors.add(:quantity,
-                             :selected_quantity_not_available,
-                             message: Spree.t(:selected_quantity_not_available, item: display_name.inspect))
+        if variant.available?
+          line_item.errors.add(:quantity,
+                               :selected_quantity_not_available,
+                               message: Spree.t(:selected_quantity_not_available, item: display_name.inspect))
+        else
+          line_item.errors.add(:base,
+                               :only_active_products_can_be_added_to_cart,
+                               message: Spree.t(:only_active_products_can_be_added_to_cart))
+        end
       end
 
       private

data/app/models/spree/stock/content_item.rb

@@ -12,7 +12,7 @@ module Spree
         delegate :line_item,
                  :quantity,
                  :variant, to: :inventory_unit
-        delegate :price, to: :variant
+        delegate :price, to: :line_item
         delegate :dimension,
                  :volume,
                  :weight, to: :variant, prefix: true

data/app/models/spree/stock/quantifier.rb

@@ -12,7 +12,7 @@ module Spree
         @total_on_hand ||= if variant.should_track_inventory?
                              stock_items.sum(:count_on_hand)
                            else
-                             Float::INFINITY
+                             BigDecimal::INFINITY
                            end
       end
 

data/app/models/spree/stock_item.rb

@@ -2,6 +2,11 @@ module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
 
+    include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     with_options inverse_of: :stock_items do
       belongs_to :stock_location, class_name: 'Spree::StockLocation'
       belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'

data/app/models/spree/stock_location.rb

@@ -1,6 +1,15 @@
 module Spree
   class StockLocation < Spree::Base
     include UniqueName
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::StockLocations)
+      include Spree::Security::StockLocations
+    end
+    if defined?(Spree::VendorConcern)
+      include Spree::VendorConcern
+    end
 
     has_many :shipments
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
@@ -51,9 +60,15 @@ module Spree
     # @param variant Variant instance or Variant ID
     #
     # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
-    def stock_item_or_create(variant)
-      variant_id = variant.is_a?(Spree::Variant) ? variant.id : variant
-      stock_item(variant_id) || stock_items.create(variant_id: variant_id)
+    def stock_item_or_create(variant_or_variant_id)
+      if variant_or_variant_id.is_a?(Spree::Variant)
+        variant_id = variant_or_variant_id.id
+        variant = variant_or_variant_id
+      else
+        variant_id = variant_or_variant_id
+        variant = Spree::Variant.find(variant_or_variant_id)
+      end
+      stock_item(variant_id) || propagate_variant(variant)
     end
 
     def count_on_hand(variant)
@@ -86,8 +101,7 @@ module Spree
     end
 
     def fill_status(variant, quantity)
-      if item = stock_item(variant)
-
+      if item = stock_item_or_create(variant)
         if item.count_on_hand >= quantity
           on_hand = quantity
           backordered = 0

data/app/models/spree/stock_movement.rb

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

data/app/models/spree/stock_transfer.rb

@@ -4,6 +4,9 @@ module Spree
     include NumberIdentifier
     include NumberAsParam
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     has_many :stock_movements, as: :originator
 

data/app/models/spree/store.rb

@@ -1,5 +1,12 @@
 module Spree
   class Store < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::Stores)
+      include Spree::Security::Stores
+    end
+
     typed_store :settings, coder: ActiveRecord::TypedStore::IdentityCoder do |s|
       # Spree Digital Asset Configurations
       s.boolean :limit_digital_download_count, default: true, null: false
@@ -9,8 +16,7 @@ module Spree
       s.integer :digital_asset_link_expire_time, default: 300, null: false # 5 minutes in seconds
     end
 
-    MAILER_LOGO_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
-    FAVICON_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freeze
+    attr_accessor :skip_validate_not_last
 
     acts_as_paranoid
 
@@ -58,7 +64,7 @@ module Spree
 
     validates :digital_asset_authorized_clicks, numericality: { only_integer: true, greater_than: 0 }
     validates :digital_asset_authorized_days, numericality: { only_integer: true, greater_than: 0 }
-    validates :code, uniqueness: { conditions: -> { with_deleted } }
+    validates :code, uniqueness: { case_sensitive: false, conditions: -> { with_deleted } }
     validates :mail_from_address, email: { allow_blank: false }
 
     # FIXME: we should remove this condition in v5
@@ -71,19 +77,18 @@ module Spree
 
     default_scope { order(created_at: :asc) }
 
-    has_one_attached :logo
-    has_one_attached :mailer_logo
-    has_one_attached :favicon_image
+    has_one :logo, class_name: 'Spree::StoreLogo', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :logo, reject_if: :all_blank
+
+    has_one :mailer_logo, class_name: 'Spree::StoreMailerLogo', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :mailer_logo, reject_if: :all_blank
 
-    validates :mailer_logo, content_type: MAILER_LOGO_CONTENT_TYPES
-    validates :favicon_image, content_type: FAVICON_CONTENT_TYPES,
-                              dimension: { max: 256..256 },
-                              aspect_ratio: :square,
-                              size: { less_than_or_equal_to: 1.megabyte }
+    has_one :favicon_image, class_name: 'Spree::StoreFaviconImage', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :favicon_image, reject_if: :all_blank
 
     before_save :ensure_default_exists_and_is_unique
     before_save :ensure_supported_currencies, :ensure_supported_locales, :ensure_default_country
-    before_destroy :validate_not_last
+    before_destroy :validate_not_last, unless: :skip_validate_not_last
     before_destroy :pass_default_flag_to_other_store
 
     scope :by_url, ->(url) { where('url like ?', "%#{url}%") }
@@ -176,9 +181,9 @@ module Spree
     end
 
     def favicon
-      return unless favicon_image.attached?
+      return unless favicon_image&.attachment&.attached?
 
-      favicon_image.variant(resize: '32x32')
+      favicon_image.attachment.variant(resize_to_limit: [32, 32])
     end
 
     def can_be_deleted?

data/app/models/spree/store_credit.rb

@@ -2,6 +2,9 @@ module Spree
   class StoreCredit < Spree::Base
     include SingleStoreResource
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     acts_as_paranoid
 
@@ -15,7 +18,7 @@ module Spree
 
     DEFAULT_CREATED_BY_EMAIL = 'spree@example.com'.freeze
 
-    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id'
+    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'

data/app/models/spree/store_favicon_image.rb

@@ -0,0 +1,17 @@
+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,
+              content_type: VALID_CONTENT_TYPES,
+              dimension: { max: 256..256 },
+              aspect_ratio: :square,
+              size: { less_than_or_equal_to: 1.megabyte }
+  end
+end

data/app/models/spree/store_logo.rb

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,13 @@
+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
+  end
+end

data/app/models/spree/tax_category.rb

@@ -1,9 +1,15 @@
 module Spree
   class TaxCategory < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     acts_as_paranoid
     validates :name, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope.push(:deleted_at) }
 
     has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
+    has_many :products, dependent: :nullify
+    has_many :variants, dependent: :nullify
 
     before_save :set_default_category
 

data/app/models/spree/tax_rate.rb

@@ -4,6 +4,10 @@ module Spree
 
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
+    include Spree::Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     with_options inverse_of: :tax_rates do
       belongs_to :zone, class_name: 'Spree::Zone', optional: true
@@ -114,7 +118,8 @@ module Spree
 
       ' ' + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
-        locale: I18n.locale
+        locale: I18n.locale,
+        strip_insignificant_zeros: true
       )
     end
   end

data/app/models/spree/taxon.rb

@@ -4,6 +4,9 @@ require 'stringex'
 module Spree
   class Taxon < Spree::Base
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     extend FriendlyId
     friendly_id :permalink, slug_column: :permalink, use: :history
@@ -39,7 +42,7 @@ module Spree
 
     before_validation :copy_taxonomy_from_parent
     after_save :touch_ancestors_and_taxonomy
-    after_save :sync_taxonomy_name
+    after_update :sync_taxonomy_name
     after_touch :touch_ancestors_and_taxonomy
 
     has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'

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

@@ -5,7 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          has_one_attached :attachment
+          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/
 

data/app/models/spree/taxon_image.rb

@@ -6,10 +6,11 @@ module Spree
 
     def styles
       self.class.styles.map do |_, size|
-        width, height = size[/(\d+)x(\d+)/].split('x')
+        width, height = size[/(\d+)x(\d+)/].split('x').map(&:to_i)
 
         {
-          url: polymorphic_path(attachment.variant(resize: size), only_path: true),
+          url: generate_url(size: size),
+          size: size,
           width: width,
           height: height
         }

data/app/models/spree/taxonomy.rb

@@ -1,6 +1,9 @@
 module Spree
   class Taxonomy < Spree::Base
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     acts_as_list
 
@@ -12,7 +15,7 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
 
     after_create :set_root
-    after_save :set_root_taxon_name
+    after_update :set_root_taxon_name
 
     default_scope { order("#{table_name}.position, #{table_name}.created_at") }
 

data/app/models/spree/variant.rb

@@ -5,20 +5,26 @@ module Spree
 
     include MemoizedData
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     MEMOIZED_METHODS = %w(purchasable in_stock backorderable tax_category options_text compare_at_price)
 
     belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
-    delegate :name, :name=, :description, :slug, :available_on, :shipping_category_id,
+    delegate :name, :name=, :description, :slug, :available_on, :make_active_at, :shipping_category_id,
              :meta_description, :meta_keywords, :shipping_category, to: :product
 
+    auto_strip_attributes :sku, nullify: false
+
     # we need to have this callback before any dependent: :destroy associations
     # https://github.com/rails/rails/issues/3458
-    before_destroy :ensure_no_line_items
+    before_destroy :ensure_not_in_complete_orders
+    after_destroy :remove_line_items_from_incomplete_orders
 
-    # must include this after ensure_no_line_items to make sure price won't be deleted before validation
+    # must include this after ensure_not_in_complete_orders to make sure price won't be deleted before validation
     include Spree::DefaultPrice
 
     with_options inverse_of: :variant do
@@ -140,7 +146,7 @@ module Spree
       @tax_category ||= if self[:tax_category_id].nil?
                           product.tax_category
                         else
-                          Spree::TaxCategory.find(self[:tax_category_id])
+                          Spree::TaxCategory.find_by(id: self[:tax_category_id]) || product.tax_category
                         end
     end
 
@@ -166,6 +172,8 @@ module Spree
 
     def options=(options = {})
       options.each do |option|
+        next if option[:name].blank? || option[:value].blank?
+
         set_option_value(option[:name], option[:value])
       end
     end
@@ -174,12 +182,12 @@ module Spree
       # no option values on master
       return if is_master
 
-      option_type = Spree::OptionType.where(name: opt_name).first_or_initialize do |o|
-        o.presentation = opt_name
+      option_type = Spree::OptionType.where(['LOWER(name) = ?', opt_name.downcase.strip]).first_or_initialize do |o|
+        o.name = o.presentation = opt_name
         o.save!
       end
 
-      current_value = option_values.detect { |o| o.option_type.name == opt_name }
+      current_value = find_option_value(opt_name)
 
       if current_value.nil?
         # then we have to check to make sure that the product has the option type
@@ -187,13 +195,13 @@ module Spree
           product.option_types << option_type
         end
       else
-        return if current_value.name == opt_value
+        return if current_value.name.downcase.strip == opt_value.downcase.strip
 
         option_values.delete(current_value)
       end
 
-      option_value = Spree::OptionValue.where(option_type_id: option_type.id, name: opt_value).first_or_initialize do |o|
-        o.presentation = opt_value
+      option_value = option_type.option_values.where(['LOWER(name) = ?', opt_value.downcase.strip]).first_or_initialize do |o|
+        o.name = o.presentation = opt_value
         o.save!
       end
 
@@ -201,12 +209,29 @@ module Spree
       save
     end
 
+    def find_option_value(opt_name)
+      option_values.detect { |o| o.option_type.name.downcase.strip == opt_name.downcase.strip }
+    end
+
     def option_value(opt_name)
-      option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
+      find_option_value(opt_name).try(:presentation)
     end
 
     def price_in(currency)
-      prices.detect { |price| price.currency == currency&.upcase } || prices.build(currency: currency&.upcase)
+      currency = currency&.upcase
+      find_or_build_price = lambda do
+        if prices.loaded?
+          prices.detect { |price| price.currency == currency } || prices.build(currency: currency)
+        else
+          prices.find_or_initialize_by(currency: currency)
+        end
+      end
+
+      Rails.cache.fetch("spree/prices/#{cache_key_with_version}/price_in/#{currency}") do
+        find_or_build_price.call
+      end
+    rescue TypeError
+      find_or_build_price.call
     end
 
     def amount_in(currency)
@@ -312,13 +337,17 @@ module Spree
 
     private
 
-    def ensure_no_line_items
-      if line_items.any?
+    def ensure_not_in_complete_orders
+      if orders.complete.any?
         errors.add(:base, :cannot_destroy_if_attached_to_line_items)
         throw(:abort)
       end
     end
 
+    def remove_line_items_from_incomplete_orders
+      Spree::Variants::RemoveFromIncompleteOrdersJob.perform_later(self)
+    end
+
     def quantifier
       Spree::Stock::Quantifier.new(self)
     end

data/app/models/spree/wished_item.rb

@@ -1,5 +1,9 @@
 module Spree
   class WishedItem < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     extend DisplayMoney
     money_methods :total, :price
 

data/app/models/spree/wishlist.rb

@@ -1,10 +1,13 @@
 module Spree
   class Wishlist < Spree::Base
     include SingleStoreResource
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     has_secure_token
 
-    belongs_to :user, class_name: Spree.user_class.name, touch: true
+    belongs_to :user, class_name: "::#{Spree.user_class}", touch: true
     belongs_to :store, class_name: 'Spree::Store'
 
     has_many :wished_items, class_name: 'Spree::WishedItem', dependent: :destroy

data/app/models/spree/zone.rb

@@ -1,6 +1,9 @@
 module Spree
   class Zone < Spree::Base
     include UniqueName
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     with_options dependent: :destroy, inverse_of: :zone do
       has_many :zone_members, class_name: 'Spree::ZoneMember'

data/app/services/spree/addresses/create.rb

@@ -7,7 +7,7 @@ module Spree
       attr_accessor :country
 
       def call(address_params: {}, user: nil)
-        fill_country_and_state_ids(address_params)
+        address_params = fill_country_and_state_ids(address_params)
 
         address = Spree::Address.new(address_params)
         address.user = user if user.present?

data/app/services/spree/addresses/update.rb

@@ -8,12 +8,17 @@ module Spree
 
       def call(address:, address_params:)
         address_params[:country_id] ||= address.country_id
-        fill_country_and_state_ids(address_params)
+        address_params = fill_country_and_state_ids(address_params)
 
         if address&.editable?
           address.update(address_params) ? success(address) : failure(address)
         else
-          new_address(address_params).valid? ? address.destroy && success(new_address) : failure(new_address)
+          if new_address(address_params).valid?
+            address.destroy
+            success(new_address)
+          else
+            failure(new_address)
+          end
         end
       end
 

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

@@ -11,6 +11,7 @@ module Spree
                                                                             line_item: line_item,
                                                                             options: options)
         end
+        order.reload
         success(line_item)
       end
     end

data/app/services/spree/variants/remove_line_items.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Variants
+    class RemoveLineItems
+      prepend Spree::ServiceModule::Base
+
+      def call(variant:)
+        variant.line_items.joins(:order).where.not(spree_orders: { state: 'complete' }).find_each do |line_item|
+          Spree::Variants::RemoveLineItemJob.perform_later(line_item: line_item)
+        end
+
+        success(true)
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -91,6 +91,7 @@ en:
         name: Name
       spree/product:
         available_on: Available On
+        make_active_at: Make Active At
         discontinue_on: Discontinue On
         cost_currency: Cost Currency
         cost_price: Cost Price
@@ -360,7 +361,7 @@ en:
             discontinue_on:
               invalid_date_range: must be later than available date
             base:
-              cannot_destroy_if_attached_to_line_items: Cannot delete products once they are attached to line items.
+              cannot_destroy_if_attached_to_line_items: Cannot delete Products that are added to placed Orders. In such cases, please discontinue them.
         spree/refund:
           attributes:
             amount:
@@ -397,7 +398,7 @@ en:
         spree/variant:
           attributes:
             base:
-              cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
+              cannot_destroy_if_attached_to_line_items: Cannot delete Variants that are added to placed Orders. In such cases, please discontinue them.
               no_master_variant_found_to_infer_price: No master variant found to infer price
               must_supply_price_for_variant_or_master: Must supply price for variant or master price for product.
         spree/image:
@@ -583,6 +584,7 @@ en:
     auto_capture: Auto Capture
     availability: availability
     available_on: Available On
+    make_active_at: Make Active At
     available: Available
     average_order_value: Average Order Value
     avs_response: AVS Response
@@ -1120,6 +1122,7 @@ en:
     number: Number
     ok: OK
     on_hand: On Hand
+    only_active_products_can_be_added_to_cart: Draft and archived products cannot be added to cart, please mark the product as active before.
     open: Open
     open_all_adjustments: Open All Adjustments
     option_type: Option Type