solidus_core 2.9.6 → 2.11.0

data/app/models/spree/stock_quantities.rb

@@ -8,8 +8,8 @@ module Spree
 
     # @param quantities [Hash<Spree::Variant=>Numeric>]
     def initialize(quantities = {})
-      raise ArgumentError unless quantities.keys.all?{ |v| v.is_a?(Spree::Variant) }
-      raise ArgumentError unless quantities.values.all?{ |v| v.is_a?(Numeric) }
+      raise ArgumentError unless quantities.keys.all?{ |value| value.is_a?(Spree::Variant) }
+      raise ArgumentError unless quantities.values.all?{ |value| value.is_a?(Numeric) }
 
       @quantities = quantities
     end
@@ -33,16 +33,16 @@ module Spree
     # Adds two StockQuantities together
     # @return [Spree::StockQuantities]
     def +(other)
-      combine_with(other) do |_variant, a, b|
-        (a || 0) + (b || 0)
+      combine_with(other) do |_variant, first, second|
+        (first || 0) + (second || 0)
       end
     end
 
     # Subtracts another StockQuantities from this one
     # @return [Spree::StockQuantities]
     def -(other)
-      combine_with(other) do |_variant, a, b|
-        (a || 0) - (b || 0)
+      combine_with(other) do |_variant, first, second|
+        (first || 0) - (second || 0)
       end
     end
 
@@ -50,9 +50,10 @@ module Spree
     # stock which exists in both StockQuantities.
     # @return [Spree::StockQuantities]
     def &(other)
-      combine_with(other) do |_variant, a, b|
-        next unless a && b
-        [a, b].min
+      combine_with(other) do |_variant, first, second|
+        next unless first && second
+
+        [first, second].min
       end
     end
 
@@ -72,9 +73,9 @@ module Spree
     def combine_with(other)
       self.class.new(
         (variants | other.variants).map do |variant|
-          a = self[variant]
-          b = other[variant]
-          value = yield variant, a, b
+          self_v = self[variant]
+          other_v = other[variant]
+          value = yield variant, self_v, other_v
           [variant, value]
         end.to_h.compact
       )

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'
@@ -18,10 +12,10 @@ class Spree::StoreCredit < Spree::PaymentSource
   ADJUSTMENT_ACTION = 'adjustment'
   INVALIDATE_ACTION = 'invalidate'
 
-  belongs_to :user, class_name: Spree::UserClassHandle.new
-  belongs_to :created_by, class_name: Spree::UserClassHandle.new
-  belongs_to :category, class_name: "Spree::StoreCreditCategory"
-  belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
+  belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
+  belongs_to :created_by, class_name: Spree::UserClassHandle.new, optional: true
+  belongs_to :category, class_name: "Spree::StoreCreditCategory", optional: true
+  belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id', optional: true
   has_many :store_credit_events
 
   validates_presence_of :user_id, :category_id, :type_id, :created_by_id, :currency
@@ -63,7 +57,7 @@ class Spree::StoreCredit < Spree::PaymentSource
     end
 
     if validate_authorization(amount, order_currency)
-      update_attributes!({
+      update!({
         action: AUTHORIZE_ACTION,
         action_amount: amount,
         action_originator: options[:action_originator],
@@ -95,7 +89,7 @@ class Spree::StoreCredit < Spree::PaymentSource
         errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
         false
       else
-        update_attributes!({
+        update!({
           action: CAPTURE_ACTION,
           action_amount: amount,
           action_originator: options[:action_originator],
@@ -114,7 +108,7 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def void(authorization_code, options = {})
     if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
-      update_attributes!({
+      update!({
         action: VOID_ACTION,
         action_amount: auth_event.amount,
         action_authorization_code: authorization_code,
@@ -235,7 +229,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       store_credit_events.where(action: ALLOCATION_ACTION).first_or_initialize
     end
 
-    event.update_attributes!({
+    event.update!({
       amount: action_amount || amount,
       authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
       amount_remaining: amount_remaining,

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,18 +1,12 @@
 # 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
-    belongs_to :originator, polymorphic: true
-    belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events
+    belongs_to :store_credit, optional: true
+    belongs_to :originator, polymorphic: true, optional: true
+    belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events, optional: true
 
     validates_presence_of :store_credit_reason, if: :action_requires_reason?
 

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

@@ -2,7 +2,7 @@
 
 module Spree
   class StorePaymentMethod < Spree::Base
-    belongs_to :store, inverse_of: :store_payment_methods
-    belongs_to :payment_method, inverse_of: :store_payment_methods
+    belongs_to :store, inverse_of: :store_payment_methods, optional: true
+    belongs_to :payment_method, inverse_of: :store_payment_methods, optional: true
   end
 end

data/app/models/spree/store_shipping_method.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class StoreShippingMethod < Spree::Base
-    belongs_to :store, inverse_of: :store_shipping_methods
-    belongs_to :shipping_method, inverse_of: :store_shipping_methods
+    belongs_to :store, inverse_of: :store_shipping_methods, optional: true
+    belongs_to :shipping_method, inverse_of: :store_shipping_methods, optional: true
   end
 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/default.rb

@@ -8,10 +8,6 @@ module Spree
     # The class used for tax calculation is configurable, so that the
     # calculation can easily be pushed to third-party services. Users looking
     # to provide their own calculator should adhere to the API of this class.
-    #
-    # @api experimental
-    # @note This API is currently in development and likely to change.
-    #   Specifically, the input format is not yet finalized.
     class Default
       include Spree::Tax::TaxHelpers
 

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

@@ -10,9 +10,6 @@ module Spree
     # class.
     #
     # @see Spree::Tax::ShippingRateTaxer
-    # @api experimental
-    # @note This API is currently in development and likely to change.
-    #   Specifically, the input format is not yet finalized.
     class ShippingRate
       include Spree::Tax::TaxHelpers
 

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
@@ -17,7 +11,7 @@ module Spree
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
 
-    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
+    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates, optional: true
 
     has_many :tax_rate_tax_categories,
       class_name: 'Spree::TaxRateTaxCategory',
@@ -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
@@ -88,7 +88,11 @@ module Spree
     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!(

data/app/models/spree/tax_rate_tax_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class TaxRateTaxCategory < Spree::Base
-    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories
+    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories, optional: true
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories, optional: true
   end
 end

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/taxon/paperclip_attachment.rb

@@ -18,4 +18,17 @@ module Spree::Taxon::PaperclipAttachment
   def icon_present?
     icon.present?
   end
+
+  def attachment_partial_name
+    'paperclip'
+  end
+
+  def destroy_attachment(definition)
+    return false unless respond_to?(definition)
+
+    attached_file = send(definition)
+    return false unless attached_file.exists?
+
+    attached_file.destroy
+  end
 end

data/app/models/spree/unit_cancel.rb

@@ -7,7 +7,7 @@ class Spree::UnitCancel < Spree::Base
   SHORT_SHIP = 'Short Ship'
   DEFAULT_REASON = 'Cancel'
 
-  belongs_to :inventory_unit
+  belongs_to :inventory_unit, optional: true
   has_one :adjustment, as: :source, dependent: :destroy
 
   validates :inventory_unit, presence: true
@@ -41,7 +41,10 @@ class Spree::UnitCancel < Spree::Base
   private
 
   def weighted_line_item_amount(line_item)
-    line_item.total_before_tax / quantity_of_line_item(line_item)
+    quantity_of_line_item = quantity_of_line_item(line_item)
+    raise ZeroDivisionError, "Line Item does not have any inventory units available to cancel" if quantity_of_line_item.zero?
+
+    line_item.total_before_tax / quantity_of_line_item
   end
 
   def quantity_of_line_item(line_item)

data/app/models/spree/user_address.rb

@@ -2,11 +2,11 @@
 
 module Spree
   class UserAddress < Spree::Base
-    belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id"
-    belongs_to :address, class_name: "Spree::Address"
+    belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id", optional: true
+    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