solidus_core 2.9.6 → 2.11.0

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -28,7 +28,7 @@ module Spree
         private
 
         def validators
-          @validators ||= permitted_eligibility_validators.map{ |v| v.new(@return_item) }
+          @validators ||= permitted_eligibility_validators.map{ |validator| validator.new(@return_item) }
         end
       end
     end

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

@@ -3,8 +3,8 @@
 module Spree
   class RoleUser < Spree::Base
     self.table_name = "spree_roles_users"
-    belongs_to :role, class_name: "Spree::Role"
-    belongs_to :user, class_name: Spree::UserClassHandle.new
+    belongs_to :role, class_name: "Spree::Role", optional: true
+    belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
 
     after_create :auto_generate_spree_api_key
 

data/app/models/spree/shipment.rb

@@ -4,8 +4,8 @@ module Spree
   # An order's planned shipments including tracking and cost.
   #
   class Shipment < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
-    belongs_to :stock_location, class_name: 'Spree::StockLocation'
+    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments, optional: true
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', optional: true
 
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
@@ -31,7 +31,7 @@ module Spree
     scope :ready,   -> { with_state('ready') }
     scope :shipped, -> { with_state('shipped') }
     scope :trackable, -> { where("tracking IS NOT NULL AND tracking != ''") }
-    scope :with_state, ->(*s) { where(state: s) }
+    scope :with_state, ->(*state) { where(state: state) }
     # sort by most recent shipped_at, falling back to created_at. add "id desc" to make specs that involve this scope more deterministic.
     scope :reverse_chronological, -> {
       order(Arel.sql("coalesce(#{Spree::Shipment.table_name}.shipped_at, #{Spree::Shipment.table_name}.created_at) desc"), id: :desc)
@@ -39,41 +39,7 @@ module Spree
 
     scope :by_store, ->(store) { joins(:order).merge(Spree::Order.by_store(store)) }
 
-    # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-    state_machine initial: :pending, use_transactions: false do
-      event :ready do
-        transition from: :pending, to: :shipped, if: :can_transition_from_pending_to_shipped?
-        transition from: :pending, to: :ready, if: :can_transition_from_pending_to_ready?
-      end
-
-      event :pend do
-        transition from: :ready, to: :pending
-      end
-
-      event :ship do
-        transition from: [:ready, :canceled], to: :shipped
-      end
-      after_transition to: :shipped, do: :after_ship
-
-      event :cancel do
-        transition to: :canceled, from: [:pending, :ready]
-      end
-      after_transition to: :canceled, do: :after_cancel
-
-      event :resume do
-        transition from: :canceled, to: :ready, if: :can_transition_from_canceled_to_ready?
-        transition from: :canceled, to: :pending
-      end
-      after_transition from: :canceled, to: [:pending, :ready, :shipped], do: :after_resume
-
-      after_transition do |shipment, transition|
-        shipment.state_changes.create!(
-          previous_state: transition.from,
-          next_state:     transition.to,
-          name:           'shipment'
-        )
-      end
-    end
+    include ::Spree::Config.state_machines.shipment
 
     self.whitelisted_ransackable_associations = ['order']
     self.whitelisted_ransackable_attributes = ['number']
@@ -142,7 +108,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.select { |a| !a.tax? && a.eligible? }.sum(&:amount)
+      amount + adjustments.select { |adjustment| !adjustment.tax? && adjustment.eligible? }.sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this shipment before VAT tax
@@ -184,7 +150,7 @@ module Spree
     end
 
     def item_cost
-      line_items.map(&:total).sum
+      line_items.sum(&:total)
     end
 
     def ready_or_pending?
@@ -219,7 +185,7 @@ module Spree
     def select_shipping_method(shipping_method)
       estimator = Spree::Config.stock.estimator_class.new
       rates = estimator.shipping_rates(to_package, false)
-      rate = rates.detect { |r| r.shipping_method_id == shipping_method.id }
+      rate = rates.detect { |detected| detected.shipping_method_id == shipping_method.id }
       rate.selected = true
       self.shipping_rates = [rate]
     end
@@ -296,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
@@ -326,7 +292,7 @@ module Spree
 
     # Update Shipment and make sure Order states follow the shipment changes
     def update_attributes_and_order(params = {})
-      if update_attributes params
+      if update(params)
         if params.key? :selected_shipping_rate_id
           # Changing the selected Shipping Rate won't update the cost (for now)
           # so we persist the Shipment#cost before running `order.recalculate`

data/app/models/spree/shipping_calculator.rb

@@ -2,10 +2,6 @@
 
 module Spree
   class ShippingCalculator < Calculator
-    def compute_shipment(_shipment)
-      raise NotImplementedError, "Please implement 'compute_shipment(shipment)' in your calculator: #{self.class.name}"
-    end
-
     def compute_package(_package)
       raise NotImplementedError, "Please implement 'compute_package(package)' in your calculator: #{self.class.name}"
     end
@@ -17,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,15 +16,15 @@ 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 }
 
-        line_item = units.first.line_item
-        variant = units.first.variant
-        ManifestItem.new(line_item, variant, units.length, states)
+        first_unit = units.first
+
+        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'
+    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
 
@@ -41,7 +34,7 @@ module Spree
 
     scope :available_to_store, ->(store) do
       raise ArgumentError, "You must provide a store" if store.nil?
-      store.shipping_methods.empty? ? all : where(id: store.shipping_method_ids)
+      store.shipping_methods.empty? ? all : where(id: store.shipping_methods.ids)
     end
 
     # @param shipping_category_ids [Array<Integer>] ids of desired shipping categories

data/app/models/spree/shipping_method_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class ShippingMethodCategory < Spree::Base
-    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', optional: true
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories, optional: true
   end
 end

data/app/models/spree/shipping_method_stock_location.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class Spree::ShippingMethodStockLocation < Spree::Base
-  belongs_to :shipping_method
-  belongs_to :stock_location
+  belongs_to :shipping_method, optional: true
+  belongs_to :stock_location, optional: true
 end

data/app/models/spree/shipping_method_zone.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class ShippingMethodZone < Spree::Base
-    belongs_to :zone
-    belongs_to :shipping_method
+    belongs_to :zone, optional: true
+    belongs_to :shipping_method, optional: true
   end
 end

data/app/models/spree/shipping_rate.rb

@@ -5,8 +5,8 @@ module Spree
   # method has been selected to deliver the shipment.
   #
   class ShippingRate < Spree::Base
-    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true
-    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
+    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, 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,9 +6,9 @@ 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
-    belongs_to :shipping_rate, class_name: "Spree::ShippingRate"
-    belongs_to :tax_rate, class_name: "Spree::TaxRate"
+  class ShippingRateTax < Spree::Base
+    belongs_to :shipping_rate, class_name: "Spree::ShippingRate", optional: true
+    belongs_to :tax_rate, class_name: "Spree::TaxRate", optional: true
 
     extend DisplayMoney
     money_methods :absolute_amount

data/app/models/spree/state.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class State < Spree::Base
-    belongs_to :country, class_name: 'Spree::Country'
+    belongs_to :country, class_name: 'Spree::Country', optional: true
     has_many :addresses, dependent: :nullify
 
     validates :country, :name, presence: true
@@ -24,7 +24,7 @@ module Spree
     # table of { country.id => [ state.id , state.name ] }, arrays sorted by name
     # blank is added elsewhere, if needed
     def self.states_group_by_country_id
-      state_info = Hash.new { |h, k| h[k] = [] }
+      state_info = Hash.new { |hash, key| hash[key] = [] }
       order(:name).each { |state|
         state_info[state.country_id.to_s].push [state.id, state.name]
       }

data/app/models/spree/state_change.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class StateChange < Spree::Base
-    belongs_to :user
-    belongs_to :stateful, polymorphic: true
+    belongs_to :user, optional: true
+    belongs_to :stateful, polymorphic: true, optional: true
     before_create :assign_user
 
     def <=>(other)

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

@@ -14,7 +14,7 @@ module Spree
       end
 
       def missing?
-        missing.values.any? { |v| v > 0 }
+        missing.values.any? { |value| value > 0 }
       end
 
       private

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

@@ -85,8 +85,8 @@ module Spree
       # @return [Fixnum] the number of inventory units in the package,
       #   counting only those in the given state if it was specified
       def quantity(state = nil)
-        matched_contents = state.nil? ? contents : contents.select { |c| c.state.to_s == state.to_s }
-        matched_contents.map(&:quantity).sum
+        matched_contents = state.nil? ? contents : contents.select { |content| content.state.to_s == state.to_s }
+        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
-    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :stock_items
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', 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
@@ -111,7 +105,7 @@ module Spree
     def should_touch_variant?
       # the variant_id changes from nil when a new stock location is added
       inventory_cache_threshold &&
-        (saved_change_to_count_on_hand && saved_change_to_count_on_hand.any? { |c| c < inventory_cache_threshold }) ||
+        (saved_change_to_count_on_hand&.any? { |cache| cache < inventory_cache_threshold }) ||
         saved_change_to_variant_id?
     end
 

data/app/models/spree/stock_location.rb

@@ -16,8 +16,8 @@ module Spree
     has_many :user_stock_locations, dependent: :delete_all
     has_many :users, through: :user_stock_locations
 
-    belongs_to :state, class_name: 'Spree::State'
-    belongs_to :country, class_name: 'Spree::Country'
+    belongs_to :state, class_name: 'Spree::State', optional: true
+    belongs_to :country, class_name: 'Spree::Country', optional: true
 
     has_many :shipping_method_stock_locations, dependent: :destroy
     has_many :shipping_methods, through: :shipping_method_stock_locations

data/app/models/spree/stock_movement.rb

@@ -2,8 +2,9 @@
 
 module Spree
   class StockMovement < Spree::Base
-    belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements
-    belongs_to :originator, polymorphic: true
+    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?