solidus_core 2.10.5 → 3.0.8

data/app/models/spree/state.rb

@@ -14,10 +14,6 @@ module Spree
         )
       )
     end
-    class << self
-      alias_method :find_all_by_name_or_abbr, :with_name_or_abbr
-      deprecate find_all_by_name_or_abbr: :with_name_or_abbr, deprecator: Spree::Deprecation
-    end
 
     self.whitelisted_ransackable_attributes = %w[name]
 

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

@@ -11,10 +11,10 @@ module Spree
           display_name = variant.name.to_s
           display_name += %{ (#{variant.options_text})} unless variant.options_text.blank?
 
-          line_item.errors[:quantity] << I18n.t(
+          line_item.errors.add(:quantity, I18n.t(
             'spree.selected_quantity_not_available',
             item: display_name.inspect
-          )
+          ))
           false
         end
       end

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

@@ -9,13 +9,24 @@ module Spree
 
       def units
         @order.line_items.flat_map do |line_item|
-          Array.new(line_item.quantity) do
-            Spree::InventoryUnit.new(
-              pending: true,
-              variant: line_item.variant,
-              line_item: line_item
-            )
-          end
+          build_units(line_item, line_item.quantity)
+        end
+      end
+
+      def missing_units_for_line_item(line_item)
+        quantity = line_item.quantity - line_item.inventory_units.count
+        build_units(line_item, quantity)
+      end
+
+      private
+
+      def build_units(line_item, quantity)
+        Array.new(quantity) do
+          Spree::InventoryUnit.new(
+            pending: true,
+            variant: line_item.variant,
+            line_item: line_item
+          )
         end
       end
     end

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

@@ -34,11 +34,9 @@ module Spree
       end
 
       def unstock_inventory_units
-        inventory_units.group_by(&:shipment_id).each_value do |inventory_units_for_shipment|
-          inventory_units_for_shipment.group_by(&:line_item_id).each_value do |units|
-            shipment = units.first.shipment
-            line_item = units.first.line_item
-            shipment.stock_location.unstock line_item.variant, units.count, shipment
+        inventory_units.group_by(&:shipment).each do |shipment, units_by_shipment|
+          units_by_shipment.group_by(&:variant).each do |variant, units|
+            shipment.stock_location.unstock variant, units.count, shipment
           end
         end
       end

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

@@ -5,10 +5,10 @@ module Spree
     class InventoryValidator < ActiveModel::Validator
       def validate(line_item)
         if line_item.inventory_units.count != line_item.quantity
-          line_item.errors[:inventory] << I18n.t(
+          line_item.errors.add(:inventory, I18n.t(
             'spree.inventory_not_available',
             item: line_item.variant.name
-          )
+          ))
         end
       end
     end

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

@@ -86,7 +86,7 @@ module Spree
       #   counting only those in the given state if it was specified
       def quantity(state = nil)
         matched_contents = state.nil? ? contents : contents.select { |content| content.state.to_s == state.to_s }
-        matched_contents.map(&:quantity).sum
+        matched_contents.sum(&:quantity)
       end
 
       # @return [Boolean] true if there are no inventory units in this

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

@@ -51,9 +51,7 @@ module Spree
         # Allocate any available on hand inventory and remaining desired inventory from backorders
         on_hand_packages, backordered_packages, leftover = @allocator.allocate_inventory(@desired)
 
-        unless leftover.empty?
-          raise Spree::Order::InsufficientStock
-        end
+        raise Spree::Order::InsufficientStock.new(items: leftover.quantities) unless leftover.empty?
 
         packages = @stock_locations.map do |stock_location|
           # Combine on_hand and backorders into a single package per-location
@@ -75,11 +73,16 @@ module Spree
         packages = split_packages(packages)
 
         # Turn the Stock::Packages into a Shipment with rates
-        packages.map do |package|
+        shipments = packages.map do |package|
           shipment = package.shipment = package.to_shipment
           shipment.shipping_rates = Spree::Config.stock.estimator_class.new.shipping_rates(package)
           shipment
         end
+
+        # Make sure we don't add the proposed shipments to the order
+        order.shipments = order.shipments - shipments
+
+        shipments
       end
 
       def split_packages(initial_packages)
@@ -89,20 +92,6 @@ module Spree
         end
       end
 
-      def allocate_inventory(availability_by_location)
-        sorted_availability = sort_availability(availability_by_location)
-
-        sorted_availability.transform_values do |available|
-          # Find the desired inventory which is available at this location
-          packaged = available & @desired
-          # Remove found inventory from desired
-          @desired -= packaged
-          packaged
-        end
-      end
-      deprecate allocate_inventory: 'allocate_inventory is deprecated. Please write your own allocator defining' \
-        'a Spree::Stock::Allocator::Base subclass', deprecator: Spree::Deprecation
-
       def sort_availability(availability)
         sorted_availability = availability.sort_by do |stock_location_id, _|
           @stock_locations.find_index do |stock_location|

data/app/models/spree/stock/splitter/base.rb

@@ -6,13 +6,8 @@ module Spree
       class Base
         attr_reader :stock_location, :next_splitter
 
-        def initialize(stock_location_or_packer, next_splitter = nil)
-          if stock_location_or_packer.is_a?(Spree::StockLocation)
-            @stock_location = stock_location_or_packer
-          else
-            Spree::Deprecation.warn("Initializing Splitters with a Packer is DEPRECATED. Pass a StockLocation instead.")
-            @stock_location = stock_location_or_packer.stock_location
-          end
+        def initialize(stock_location, next_splitter = nil)
+          @stock_location = stock_location
           @next_splitter = next_splitter
         end
 

data/app/models/spree/stock_item.rb

@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   class StockItem < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items, optional: true
-    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :stock_items, optional: true
+    belongs_to :variant, -> { with_discarded }, class_name: 'Spree::Variant', inverse_of: :stock_items, optional: true
     has_many :stock_movements, inverse_of: :stock_item
 
     validates :stock_location, :variant, presence: true
@@ -116,13 +110,7 @@ module Spree
     end
 
     def inventory_cache_threshold
-      # only warn if store is setting binary_inventory_cache (default = false)
-      @cache_threshold ||= if Spree::Config.binary_inventory_cache
-        Spree::Deprecation.warn "Spree::Config.binary_inventory_cache=true is DEPRECATED. Instead use Spree::Config.inventory_cache_threshold=1"
-        1
-      else
-        Spree::Config.inventory_cache_threshold
-      end
+      @cache_threshold ||= Spree::Config.inventory_cache_threshold
     end
   end
 end

data/app/models/spree/stock_movement.rb

@@ -4,6 +4,7 @@ module Spree
   class StockMovement < Spree::Base
     belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements, optional: true
     belongs_to :originator, polymorphic: true, optional: true
+    has_one :variant, through: :stock_item
 
     after_create :update_stock_item_quantity
 
@@ -12,6 +13,7 @@ module Spree
 
     scope :recent, -> { order(created_at: :desc) }
 
+    self.whitelisted_ransackable_associations = %w[variant]
     self.whitelisted_ransackable_attributes = ['quantity']
 
     def readonly?

data/app/models/spree/store.rb

@@ -17,7 +17,7 @@ module Spree
 
     has_many :orders, class_name: "Spree::Order"
 
-    validates :code, presence: true, uniqueness: { allow_blank: true }
+    validates :code, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
     validates :name, presence: true
     validates :url, presence: true
     validates :mail_from_address, presence: true
@@ -25,12 +25,6 @@ module Spree
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
-    scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
-
-    class << self
-      deprecate by_url: "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
-    end
-
     def available_locales
       locales = super()
       if locales
@@ -49,12 +43,6 @@ module Spree
       end
     end
 
-    def self.current(store_key)
-      Spree::Deprecation.warn "Spree::Store.current is DEPRECATED"
-      current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first if store_key
-      current_store || Store.default
-    end
-
     def self.default
       where(default: true).first || new
     end

data/app/models/spree/store_credit.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 class Spree::StoreCredit < Spree::PaymentSource
-  acts_as_paranoid
-  include Spree::ParanoiaDeprecations
-
-  include Discard::Model
-  self.discard_column = :deleted_at
+  include Spree::SoftDeletable
 
   VOID_ACTION       = 'void'
   CREDIT_ACTION     = 'credit'
@@ -46,6 +40,14 @@ class Spree::StoreCredit < Spree::PaymentSource
   extend Spree::DisplayMoney
   money_methods :amount, :amount_used, :amount_authorized
 
+  # Sets this store credit's amount to a new value,
+  # parsing it as a localized number if the new value is a string.
+  #
+  # @param number [String, #to_d] a new amount
+  def amount=(number)
+    self[:amount] = Spree::LocalizedNumber.parse(number)
+  end
+
   def amount_remaining
     return 0.0.to_d if invalidated?
     amount - amount_used - amount_authorized

data/app/models/spree/store_credit_category.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
 class Spree::StoreCreditCategory < Spree::Base
+  GIFT_CARD = 'Gift Card'
+  REIMBURSEMENT = 'Reimbursement'
+
   class_attribute :non_expiring_credit_types
   self.non_expiring_credit_types = [Spree::StoreCreditType::NON_EXPIRING]
 
-  class_attribute :reimbursement_category_name
-  self.reimbursement_category_name = I18n.t('spree.store_credit_category.default')
-
-  def self.reimbursement_category(_reimbursement)
-    Spree::StoreCreditCategory.find_by(name: reimbursement_category_name) ||
-      Spree::StoreCreditCategory.first
-  end
-
   def non_expiring?
     self.class.non_expiring_credit_types.include? name
   end

data/app/models/spree/store_credit_event.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   class StoreCreditEvent < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     belongs_to :store_credit, optional: true
     belongs_to :originator, polymorphic: true, optional: true

data/app/models/spree/store_credit_reason.rb

@@ -4,8 +4,4 @@ class Spree::StoreCreditReason < Spree::Base
   include Spree::NamedType
 
   has_many :store_credit_events, inverse_of: :store_credit_reason
-
-  validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
-
-  scope :active, -> { where(active: true) }
 end

data/app/models/spree/tax/tax_helpers.rb

@@ -9,7 +9,7 @@ module Spree
         @rates_for_order ||= Spree::TaxRate.for_address(item.order.tax_address)
 
         @rates_for_order.select do |rate|
-          rate.tax_categories.map(&:id).include?(item.tax_category_id)
+          rate.active? && rate.tax_categories.map(&:id).include?(item.tax_category_id)
         end
       end
     end

data/app/models/spree/tax_calculator/shipping_rate.rb

@@ -13,22 +13,12 @@ module Spree
     class ShippingRate
       include Spree::Tax::TaxHelpers
 
-      attr_reader :shipping_rate
-
       # Create a new tax calculator.
       #
       # @param [Spree::Order] order the order to calculate taxes on
       # @return [Spree::TaxCalculator::ShippingRate]
       def initialize(order)
-        if order.is_a?(::Spree::ShippingRate)
-          Spree::Deprecation.warn "passing a single shipping rate to Spree::TaxCalculator::ShippingRate is DEPRECATED. It now expects an order"
-          shipping_rate = order
-          @order = shipping_rate.order
-          @shipping_rate = shipping_rate
-        else
-          @order = order
-          @shipping_rate = nil
-        end
+        @order = order
       end
 
       # Calculate taxes for a shipping rate.
@@ -38,7 +28,6 @@ module Spree
       # @return [Array<Spree::Tax::ItemTax>] the calculated taxes for the
       #   shipping rate
       def calculate(shipping_rate)
-        shipping_rate ||= @shipping_rate
         rates_for_item(shipping_rate).map do |rate|
           amount = rate.compute_amount(shipping_rate)
 

data/app/models/spree/tax_category.rb

@@ -1,21 +1,15 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   class TaxCategory < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     after_discard do
       self.tax_rate_tax_categories = []
     end
 
     validates :name, presence: true
-    validates_uniqueness_of :name, unless: :deleted_at
+    validates_uniqueness_of :name, case_sensitive: true, unless: :deleted_at
 
     has_many :tax_rate_tax_categories,
       class_name: 'Spree::TaxRateTaxCategory',

data/app/models/spree/tax_rate.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   class TaxRate < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     # Need to deal with adjustments before calculator is destroyed.
     before_destroy :remove_adjustments_from_incomplete_orders
@@ -37,6 +31,12 @@ module Spree
     scope :for_address, ->(address) { joins(:zone).merge(Spree::Zone.for_address(address)) }
     scope :for_country,
           ->(country) { for_address(Spree::Tax::TaxLocation.new(country: country)) }
+    scope :active, -> do
+      table = arel_table
+      time = Time.current
+      where(table[:starts_at].eq(nil).or(table[:starts_at].lt(time))).
+        where(table[:expires_at].eq(nil).or(table[:expires_at].gt(time)))
+    end
 
     # Finds geographically matching tax rates for a tax zone.
     # We do not know if they are/aren't applicable until we attempt to apply these rates to
@@ -87,23 +87,6 @@ module Spree
     end
     scope :included_in_price, -> { where(included_in_price: true) }
 
-    # Creates necessary tax adjustments for the order.
-    #
-    # @deprecated Please use `Spree::Tax::OrderAdjuster#adjust!` instead
-    def adjust(_order_tax_zone, item)
-      Spree::Deprecation.warn("`Spree::TaxRate#adjust` is deprecated. Please use `Spree::Tax::OrderAdjuster#adjust!` instead.", caller)
-
-      amount = compute_amount(item)
-
-      item.adjustments.create!(
-        source: self,
-        amount: amount,
-        order_id: item.order_id,
-        label: adjustment_label(amount),
-        included: included_in_price
-      )
-    end
-
     # This method is used by Adjustment#update to recalculate the cost.
     def compute_amount(item)
       calculator.compute(item)
@@ -123,16 +106,6 @@ module Spree
       )
     end
 
-    def tax_category=(category)
-      self.tax_categories = [category]
-    end
-
-    def tax_category
-      tax_categories[0]
-    end
-
-    deprecate :tax_category => :tax_categories, :tax_category= => :tax_categories=, deprecator: Spree::Deprecation
-
     private
 
     def amount_for_adjustment_label

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree::Taxon::ActiveStorageAttachment
+  extend ActiveSupport::Concern
+  include Spree::ActiveStorageAdapter
+
+  included do
+    has_attachment :icon,
+                   styles: { mini: '32x32>', normal: '128x128>' },
+                   default_style: :mini
+    validate :icon_is_an_image
+  end
+end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -19,10 +19,6 @@ module Spree::Taxon::PaperclipAttachment
     icon.present?
   end
 
-  def attachment_partial_name
-    'paperclip'
-  end
-
   def destroy_attachment(definition)
     return false unless respond_to?(definition)
 

data/app/models/spree/taxon.rb

@@ -29,17 +29,6 @@ module Spree
 
     self.whitelisted_ransackable_attributes = %w[name]
 
-    # @note This method is meant to be overridden on a store by store basis.
-    # @return [Array] filters that should be used for a taxon
-    def applicable_filters
-      Spree::Deprecation.warn "Spree::Taxon#applicable_filters is deprecated, if you are using this functionality please move it into your own application."
-
-      fs = []
-      fs << Spree::Core::ProductFilters.price_filter if Spree::Core::ProductFilters.respond_to?(:price_filter)
-      fs << Spree::Core::ProductFilters.brand_filter if Spree::Core::ProductFilters.respond_to?(:brand_filter)
-      fs
-    end
-
     # @return [String] meta_title if set otherwise a string containing the
     #   root name and taxon name
     def seo_title
@@ -134,7 +123,7 @@ module Spree
 
     def touch_ancestors_and_taxonomy
       # Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
-      self.class.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.current)
+      self.class.default_scoped.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.current)
       # Have taxonomy touch happen in #touch_ancestors_and_taxonomy rather than association option in order for imports to override.
       taxonomy.try!(:touch)
     end

data/app/models/spree/user_address.rb

@@ -6,7 +6,7 @@ module Spree
     belongs_to :address, class_name: "Spree::Address", optional: true
 
     validates_uniqueness_of :address_id, scope: :user_id
-    validates_uniqueness_of :user_id, conditions: -> { active.default }, message: :default_address_exists, if: :default?
+    validates_uniqueness_of :user_id, conditions: -> { active.default_shipping }, message: :default_address_exists, if: :default?
 
     scope :with_address_values, ->(address_attributes) do
       joins(:address).merge(
@@ -15,7 +15,8 @@ module Spree
     end
 
     scope :all_historical, -> { unscope(where: :archived) }
-    scope :default, -> { where(default: true) }
+    scope :default_shipping, -> { where(default: true) }
+    scope :default_billing, -> { where(default_billing: true) }
     scope :active, -> { where(archived: false) }
 
     default_scope -> { order([default: :desc, updated_at: :desc]) }

data/app/models/spree/variant.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   # == Master Variant
   #
@@ -20,11 +18,7 @@ module Spree
   class Variant < Spree::Base
     acts_as_list scope: :product
 
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
+    include Spree::SoftDeletable
 
     after_discard do
       stock_items.discard_all
@@ -36,11 +30,11 @@ module Spree
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
-    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
+    belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants_including_master, optional: false
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
-    delegate :name, :description, :slug, :available_on, :shipping_category_id,
-             :meta_description, :meta_keywords, :shipping_category,
+    delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
+             :shipping_category_id, :meta_description, :meta_keywords, :shipping_category,
              to: :product
     delegate :tax_category, to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
@@ -80,7 +74,7 @@ module Spree
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates_uniqueness_of :sku, allow_blank: true, if: :enforce_unique_sku?
+    validates_uniqueness_of :sku, allow_blank: true, case_sensitive: true, if: :enforce_unique_sku?
 
     after_create :create_stock_items
     after_create :set_position
@@ -89,7 +83,7 @@ module Spree
     after_save :clear_in_stock_cache
     after_touch :clear_in_stock_cache
 
-    after_real_destroy :destroy_option_values_variants
+    after_destroy :destroy_option_values_variants
 
     # Returns variants that are in stock. When stock locations are provided as
     # a parameter, the scope is limited to variants that are in stock in the
@@ -127,17 +121,6 @@ module Spree
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
 
-    # Returns variants that are not deleted and have a price in the given
-    # currency.
-    #
-    # @deprecated Please use the .with_prices scope instead
-    # @param currency [String] the currency to filter by; defaults to Spree's default
-    # @return [ActiveRecord::Relation]
-    def self.active(currency = nil)
-      Spree::Deprecation.warn("`Variant.active(currency)` is deprecated. Please use `Variant.with_prices(pricing_options)` instead.", caller)
-      joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
-    end
-
     # Returns variants that have a price for the given pricing options
     # If you have modified the pricing options class, you might want to modify this scope too.
     #
@@ -310,26 +293,6 @@ module Spree
       diff && diff.zero?
     end
 
-    # Converts the variant's price to the given currency.
-    #
-    # @deprecated Please use #price_for(pricing_options) instead
-    # @param currency [String] the desired currency
-    # @return [Spree::Price] the price in the desired currency
-    def price_in(currency)
-      prices.currently_valid.find_by(currency: currency)
-    end
-    deprecate price_in: :price_for, deprecator: Spree::Deprecation
-
-    # Fetches the price amount in the specified currency.
-    #
-    # @deprecated Please use #price_for instead and use a money object rathern than a BigDecimal.
-    # @param currency (see #price)
-    # @return [Float] the amount in the specified currency.
-    def amount_in(currency)
-      price_in(currency).try(:amount)
-    end
-    deprecate amount_in: :price_for, deprecator: Spree::Deprecation
-
     # Generates a friendly name and sku string.
     #
     # @return [String]
@@ -373,27 +336,14 @@ module Spree
       track_inventory? && Spree::Config.track_inventory_levels
     end
 
-    # Image that can be used for the variant.
-    #
-    # Will first search for images on the variant. If it doesn't find any,
-    # it'll fallback to any variant image (unless +fallback+ is +false+) or to
-    # a new {Spree::Image}.
-    # @param fallback [Boolean] whether or not we should fallback to an image
-    #   not from this variant
-    # @return [Spree::Image] the image to display
-    def display_image(fallback: true)
-      Spree::Deprecation.warn('Spree::Variant#display_image is DEPRECATED. Choose an image from Spree::Variant#gallery instead')
-      images.first || (fallback && product.variant_images.first) || Spree::Image.new
-    end
-
     # Determines the variant's property values by verifying which of the product's
     # variant property rules apply to itself.
     #
     # @return [Array<Spree::VariantPropertyRuleValue>] variant_properties
     def variant_properties
-      product.variant_property_rules.map do |rule|
+      product.variant_property_rules.flat_map do |rule|
         rule.values if rule.applies_to_variant?(self)
-      end.flatten.compact
+      end.compact
     end
 
     # The gallery for the variant, which represents all the images