solidus_core 2.10.3 → 2.11.4

data/app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb

@@ -23,7 +23,7 @@ module Spree
         # blue pants with 34 waist and 32 inseam
 
         def self.eligible_variants(variant, options = {})
-          product_variants = SameProduct.eligible_variants(variant, options).includes(option_values: :option_type)
+          product_variants = SameProduct.eligible_variants(variant, **options).includes(option_values: :option_type)
           relevant_option_values = variant.option_values.select { |ov| option_type_restrictions.include? ov.option_type.name }
 
           if relevant_option_values.present?

data/app/models/spree/role.rb

@@ -5,7 +5,7 @@ module Spree
     has_many :role_users, class_name: "Spree::RoleUser", dependent: :destroy
     has_many :users, through: :role_users
 
-    validates_uniqueness_of :name
+    validates_uniqueness_of :name, case_sensitive: true
 
     def admin?
       name == "admin"

data/app/models/spree/shipment.rb

@@ -150,7 +150,7 @@ module Spree
     end
 
     def item_cost
-      line_items.map(&:total).sum
+      line_items.sum(&:total)
     end
 
     def ready_or_pending?
@@ -262,7 +262,7 @@ module Spree
     def to_package
       package = Stock::Package.new(stock_location)
       package.shipment = self
-      inventory_units.includes(:variant).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
+      inventory_units.includes(variant: :product).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
         package.add_multiple state_inventory_units, state.to_sym
       end
       package

data/app/models/spree/shipping_calculator.rb

@@ -13,7 +13,7 @@ module Spree
     private
 
     def total(content_items)
-      content_items.map(&:amount).sum
+      content_items.sum(&:amount)
     end
   end
 end

data/app/models/spree/shipping_manifest.rb

@@ -16,7 +16,7 @@ class Spree::ShippingManifest
   def items
     # Grouping by the ID means that we don't have to call out to the association accessor
     # This makes the grouping by faster because it results in less SQL cache hits.
-    @inventory_units.group_by(&:variant_id).map do |_variant_id, variant_units|
+    @inventory_units.group_by(&:variant_id).flat_map do |_variant_id, variant_units|
       variant_units.group_by(&:line_item_id).map do |_line_item_id, units|
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
@@ -25,6 +25,6 @@ class Spree::ShippingManifest
 
         ManifestItem.new(first_unit.line_item, first_unit.variant, units.length, states)
       end
-    end.flatten
+    end
   end
 end

data/app/models/spree/shipping_method.rb

@@ -1,17 +1,10 @@
 # frozen_string_literal: true
 
-require 'discard'
-
 module Spree
   # Represents a means of having a shipment delivered, such as FedEx or UPS.
   #
   class ShippingMethod < Spree::Base
-    acts_as_paranoid
-    include Spree::ParanoiaDeprecations
-
-    include Discard::Model
-    self.discard_column = :deleted_at
-
+    include Spree::SoftDeletable
     include Spree::CalculatedAdjustments
     DISPLAY = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
       [:both, :front_end, :back_end],
@@ -28,7 +21,7 @@ module Spree
     has_many :shipping_method_zones, dependent: :destroy
     has_many :zones, through: :shipping_method_zones
 
-    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :tax_category, -> { with_discarded }, class_name: 'Spree::TaxCategory', optional: true
     has_many :shipping_method_stock_locations, dependent: :destroy, class_name: "Spree::ShippingMethodStockLocation"
     has_many :stock_locations, through: :shipping_method_stock_locations
 

data/app/models/spree/shipping_rate.rb

@@ -6,7 +6,7 @@ module Spree
   #
   class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
-    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
+    belongs_to :shipping_method, -> { with_discarded }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
 
     has_many :taxes,
              class_name: "Spree::ShippingRateTax",

data/app/models/spree/shipping_rate_tax.rb

@@ -6,7 +6,7 @@ module Spree
   # @attr [Spree::TaxRate] tax_rate The tax rate used to calculate the tax amount
   # @since 1.3.0
   # @see Spree::Tax::ShippingRateTaxer
-  class ShippingRateTax < ActiveRecord::Base
+  class ShippingRateTax < Spree::Base
     belongs_to :shipping_rate, class_name: "Spree::ShippingRate", optional: true
     belongs_to :tax_rate, class_name: "Spree::TaxRate", optional: true
 

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/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

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

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

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'

data/app/models/spree/store_credit_category.rb

@@ -1,18 +1,45 @@
 # 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]
 
+  # @deprecated
   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
+  # @deprecated
+  def self.reimbursement_category(reimbursement)
+    reimbursement.store_credit_category
   end
 
   def non_expiring?
     self.class.non_expiring_credit_types.include? name
   end
+
+  public_instance_methods.grep(/^reimbursement_category_name/).each do |method|
+    deprecate(
+      method => 'Use Spree::Reimbursement#store_credit_category.name instead',
+      deprecator: Spree::Deprecation
+    )
+  end
+
+  class << self
+    public_instance_methods.grep(/^reimbursement_category_name/).each do |method|
+      deprecate(
+        method => 'Use Spree::Reimbursement.store_credit_category.name instead',
+        deprecator: Spree::Deprecation
+      )
+    end
+
+    public_instance_methods.grep(/^reimbursement_category$/).each do |method|
+      deprecate(
+        method => 'Use Spree::Reimbursement.store_credit_category instead',
+        deprecator: Spree::Deprecation
+      )
+    end
+  end
 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_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

data/app/models/spree/taxon.rb

@@ -134,7 +134,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/taxon/active_storage_attachment.rb

@@ -0,0 +1,19 @@
+# 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
+
+  def attachment_partial_name
+    'paperclip'
+  end
+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,9 +15,15 @@ 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) }
 
+    scope :default, -> do
+      Spree::Deprecation.warn "This scope is deprecated. Please start using ::default_shipping."
+      default_shipping
+    end
+
     default_scope -> { order([default: :desc, updated_at: :desc]) }
   end
 end

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, 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
@@ -391,9 +385,9 @@ module Spree
     #
     # @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