solidus_core 4.3.5 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94aaf314615fe63ec5c41581cd2b1b1fe537d9cf83bf24d5ce7de347b69cb2f
-  data.tar.gz: e391dc6f778dcdecc5640abbab4d8034570ccd276e318008081994b6bf6e8760
+  metadata.gz: 26085f8db02874db3e6107dee9429c843c213f42d32a55a71a10cba46acf75b7
+  data.tar.gz: bc4bf5cfb609e38878f5abbac50be9d6565b5ca555f19bf662506b42992f0312
 SHA512:
-  metadata.gz: f2e16434691f8d081fd2a8bb9de77728d396da83019fad6bc88901757ed816d349fef10e7d3c65c267b4fc696a483e004c3ebe2b8913deb7bba4677d66a8bace
-  data.tar.gz: 59034679f50f30a91d7883a2b3f31cbeaf957d992bee8a62ea9fb60f283ff9b130a420446bc98a476ff35bec8a117bf83a640161caf77bc9d3ab2c3fff7132d4
+  metadata.gz: e0c721a6c89879768639749bb8f3ff110beb622b2d93442ec77e3a5ef1e4511def197a38aecd436ec9e1962821d0a26b8a5348499f9696b467be1bf32441c6bd
+  data.tar.gz: d6e9c27b1441d31ffd3c25a6e205a38c363d7b6c1dc63e69db3bea9c74370552ab63bdd61632faec39a690cf836be1f97f94a6ad54547f0eb235de6e6e3075a7

data/app/helpers/spree/base_helper.rb

@@ -48,7 +48,7 @@ module Spree
 
     def meta_data_tags
       meta_data.map do |name, content|
-        tag('meta', name: name, content: content)
+        tag('meta', name:, content:)
       end.join("\n")
     end
 
@@ -111,7 +111,7 @@ module Spree
     end
 
     def available_countries(restrict_to_zone: Spree::Config[:checkout_zone])
-      countries = Spree::Country.available(restrict_to_zone: restrict_to_zone)
+      countries = Spree::Country.available(restrict_to_zone:)
 
       country_names = Carmen::Country.all.map do |country|
         [country.code, country.name]

data/app/mailers/spree/base_mailer.rb

@@ -11,7 +11,7 @@ module Spree
     end
 
     def money(amount, currency = Spree::Config[:currency])
-      Spree::Money.new(amount, currency: currency).to_s
+      Spree::Money.new(amount, currency:).to_s
     end
     helper_method :money
 

data/app/mailers/spree/carton_mailer.rb

@@ -19,7 +19,7 @@ module Spree
       @store = @order.store
       subject = (options[:resend] ? "[#{t('spree.resend').upcase}] " : '')
       subject += "#{@store.name} #{t('spree.shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address(@store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject:)
     end
   end
 end

data/app/mailers/spree/order_mailer.rb

@@ -7,7 +7,7 @@ module Spree
       @store = @order.store
       subject = build_subject(t('.subject'), resend)
 
-      mail(to: @order.email, bcc: bcc_address(@store), from: from_address(@store), subject: subject)
+      mail(to: @order.email, bcc: bcc_address(@store), from: from_address(@store), subject:)
     end
 
     def cancel_email(order, resend = false)
@@ -15,7 +15,7 @@ module Spree
       @store = @order.store
       subject = build_subject(t('.subject'), resend)
 
-      mail(to: @order.email, from: from_address(@store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject:)
     end
 
     def inventory_cancellation_email(order, inventory_units, resend = false)
@@ -23,7 +23,7 @@ module Spree
       @store = @order.store
       subject = build_subject(t('spree.order_mailer.inventory_cancellation.subject'), resend)
 
-      mail(to: @order.email, from: from_address(@store), subject: subject)
+      mail(to: @order.email, from: from_address(@store), subject:)
     end
 
     private

data/app/mailers/spree/reimbursement_mailer.rb

@@ -7,7 +7,7 @@ module Spree
       store = @reimbursement.order.store
       subject = (resend ? "[#{t('spree.resend').upcase}] " : '')
       subject += "#{store.name} #{t('.subject')} ##{@reimbursement.order.number}"
-      mail(to: @reimbursement.order.email, from: from_address(store), subject: subject)
+      mail(to: @reimbursement.order.email, from: from_address(store), subject:)
     end
   end
 end

data/app/models/concerns/spree/active_storage_adapter/normalization.rb

@@ -32,7 +32,7 @@ module Spree
                    end
         attachable.rewind
 
-        { io: attachable, filename: filename }
+        { io: attachable, filename: }
       end
     end
   end

data/app/models/concerns/spree/active_storage_adapter.rb

@@ -34,7 +34,7 @@ module Spree
         method_name = attachment_name
         override = Module.new do
           define_method method_name do |*args|
-            attachment = Attachment.new(super(), styles: styles)
+            attachment = Attachment.new(super(), styles:)
             if args.empty?
               attachment
             else

data/app/models/concerns/spree/display_money.rb

@@ -24,7 +24,7 @@ module Spree
         money_method = { money_method => {} } unless money_method.is_a? Hash
         money_method.each do |method_name, opts|
           define_method("display_#{method_name}") do
-            default_opts = respond_to?(:currency) ? { currency: currency } : {}
+            default_opts = respond_to?(:currency) ? { currency: } : {}
             Spree::Money.new(send(method_name), default_opts.merge(opts))
           end
         end

data/app/models/concerns/spree/ordered_property_value_list.rb

@@ -18,8 +18,8 @@ module Spree
 
     def property_name=(name)
       unless name.blank?
-        unless property = Spree::Property.find_by(name: name)
-          property = Spree::Property.create(name: name, presentation: name)
+        unless property = Spree::Property.find_by(name:)
+          property = Spree::Property.create(name:, presentation: name)
         end
         self.property = property
       end

data/app/models/concerns/spree/user_address_book.rb

@@ -120,7 +120,7 @@ module Spree
         remove_from_address_book(address_attributes[:id])
       end
 
-      user_addresses.mark_default(user_address, address_type: address_type) if default || first_one
+      user_addresses.mark_default(user_address, address_type:) if default || first_one
 
       if persisted?
         user_address.save!
@@ -140,15 +140,15 @@ module Spree
     end
 
     def mark_default_ship_address(address)
-      user_addresses.mark_default(user_addresses.find_by(address: address))
+      user_addresses.mark_default(user_addresses.find_by(address:))
     end
 
     def mark_default_bill_address(address)
-      user_addresses.mark_default(user_addresses.find_by(address: address), address_type: :billing)
+      user_addresses.mark_default(user_addresses.find_by(address:), address_type: :billing)
     end
 
     def remove_from_address_book(address_id)
-      user_address = user_addresses.find_by(address_id: address_id)
+      user_address = user_addresses.find_by(address_id:)
       if user_address
         remove_user_address_reference(address_id)
         user_address.update(archived: true, default: false)

data/app/models/concerns/spree/user_methods.rb

@@ -58,7 +58,7 @@ module Spree
     def last_incomplete_spree_order(store: nil, only_frontend_viewable: true)
       self_orders = orders
       self_orders = self_orders.where(frontend_viewable: true) if only_frontend_viewable
-      self_orders = self_orders.where(store: store) if store
+      self_orders = self_orders.where(store:) if store
       self_orders = self_orders.where('updated_at > ?', Spree::Config.completable_order_updated_cutoff_days.days.ago) if Spree::Config.completable_order_updated_cutoff_days
       self_orders = self_orders.where('created_at > ?', Spree::Config.completable_order_created_cutoff_days.days.ago) if Spree::Config.completable_order_created_cutoff_days
       last_order = self_orders.order(:created_at).last
@@ -73,8 +73,8 @@ module Spree
 
     def display_available_store_credit_total(currency:)
       Spree::Money.new(
-        available_store_credit_total(currency: currency),
-        currency: currency,
+        available_store_credit_total(currency:),
+        currency:,
       )
     end
 

data/app/models/spree/address.rb

@@ -97,14 +97,14 @@ module Spree
     # @return [Hash] an ActiveMerchant compatible address hash
     def active_merchant_hash
       {
-        name: name,
-        address1: address1,
-        address2: address2,
-        city: city,
+        name:,
+        address1:,
+        address2:,
+        city:,
         state: state_text,
         zip: zipcode,
         country: country.try(:iso),
-        phone: phone
+        phone:
       }
     end
 
@@ -132,7 +132,7 @@ module Spree
     # @return [Country] setter that sets self.country to the Country with a matching 2 letter iso
     # @raise [ActiveRecord::RecordNotFound] if country with the iso doesn't exist
     def country_iso=(iso)
-      self.country = Spree::Country.find_by!(iso: iso)
+      self.country = Spree::Country.find_by!(iso:)
     end
 
     def country_iso

data/app/models/spree/adjustment.rb

@@ -4,29 +4,18 @@ module Spree
   # Adjustments represent a change to the +item_total+ of an Order. Each
   # adjustment has an +amount+ that can be either positive or negative.
   #
-  # Adjustments can be "opened" or "closed". Once an adjustment is closed, it
+  # Adjustments can be "unfinalized" or "finalized". Once an adjustment is finalized, it
   # will not be automatically updated.
-  #
-  # == Boolean attributes
-  #
-  # 1. *eligible?*
-  #
-  #    This boolean attributes stores whether this adjustment is currently
-  #    eligible for its order. Only eligible adjustments count towards the
-  #    order's adjustment total. This allows an adjustment to be preserved if
-  #    it becomes ineligible so it might be reinstated.
   class Adjustment < Spree::Base
     belongs_to :adjustable, polymorphic: true, touch: true, optional: true
     belongs_to :source, polymorphic: true, optional: true
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :all_adjustments, optional: true
-    belongs_to :promotion_code, class_name: 'Spree::PromotionCode', optional: true
     belongs_to :adjustment_reason, class_name: 'Spree::AdjustmentReason', inverse_of: :adjustments, optional: true
 
     validates :adjustable, presence: true
     validates :order, presence: true
     validates :label, presence: true
     validates :amount, numericality: true
-    validates :promotion_code, presence: true, if: :require_promotion_code?
 
     scope :not_finalized, -> { where(finalized: false) }
     scope :finalized, -> { where(finalized: true) }
@@ -38,18 +27,23 @@ module Spree
     end
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(adjustable_type: 'Spree::Shipment') }
-    scope :eligible, -> { where(eligible: true) }
+    scope :eligible, -> { all }
+    class << self
+      deprecate :eligible, deprecator: Spree.deprecator
+    end
     scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
     scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
-    scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
-    scope :non_promotion, -> { where.not(source_type: 'Spree::PromotionAction') }
+    scope :promotion, -> { where(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
+    scope :non_promotion, -> { where.not(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
     scope :is_included, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
 
     singleton_class.deprecate :return_authorization, deprecator: Spree.deprecator
 
+    allowed_ransackable_attributes << 'label'
+
     extend DisplayMoney
     money_methods :amount
 
@@ -75,7 +69,7 @@ module Spree
 
     # @return [Boolean] true when this is a promotion adjustment (Promotion adjustments have a {PromotionAction} source)
     def promotion?
-      source_type == 'Spree::PromotionAction'
+      source_type.to_s.in?(Spree::Config.adjustment_promotion_source_types.map(&:to_s))
     end
 
     # @return [Boolean] true when this is a tax adjustment (Tax adjustments have a {TaxRate} source)
@@ -88,56 +82,9 @@ module Spree
       source_type == 'Spree::UnitCancel'
     end
 
-    # Recalculate and persist the amount from this adjustment's source based on
-    # the adjustable ({Order}, {Shipment}, or {LineItem})
-    #
-    # If the adjustment has no source (such as when created manually from the
-    # admin) or is closed, this is a noop.
-    #
-    # @return [BigDecimal] New amount of this adjustment
-    def recalculate
-      if finalized? && !tax?
-        return amount
-      end
-
-      # If the adjustment has no source, do not attempt to re-calculate the
-      # amount.
-      # Some scenarios where this happens:
-      #   - Adjustments that are manually created via the admin backend
-      #   - PromotionAction adjustments where the PromotionAction was deleted
-      #     after the order was completed.
-      if source.present?
-        self.amount = source.compute_amount(adjustable)
-
-        if promotion?
-          self.eligible = calculate_eligibility
-        end
-
-        # Persist only if changed
-        # This is only not a save! to avoid the extra queries to load the order
-        # (for validations) and to touch the adjustment.
-        update_columns(eligible: eligible, amount: amount, updated_at: Time.current) if changed?
-      end
-      amount
-    end
-
-    # Calculates based on attached promotion (if this is a promotion
-    # adjustment) whether this promotion is still eligible.
-    # @api private
-    # @return [true,false] Whether this adjustment is eligible
-    def calculate_eligibility
-      if !finalized? && source && promotion?
-        source.promotion.eligible?(adjustable, promotion_code: promotion_code)
-      else
-        eligible?
-      end
-    end
-    deprecate :calculate_eligibility, deprecator: Spree.deprecator
-
-    private
-
-    def require_promotion_code?
-      promotion? && !source.promotion.apply_automatically && source.promotion.codes.any?
+    def eligible?
+      true
     end
+    alias_method :eligible, :eligible?
   end
 end

data/app/models/spree/calculator/returns/default_refund_amount.rb

@@ -14,7 +14,7 @@ module Spree
       private
 
       def weighted_order_adjustment_amount(inventory_unit)
-        inventory_unit.order.adjustments.eligible.non_tax.sum(:amount) * percentage_of_order_total(inventory_unit)
+        inventory_unit.order.adjustments.non_tax.sum(:amount) * percentage_of_order_total(inventory_unit)
       end
 
       def weighted_line_item_amount(inventory_unit)

data/app/models/spree/carton.rb

@@ -46,11 +46,11 @@ class Spree::Carton < Spree::Base
   end
 
   def manifest
-    @manifest ||= Spree::ShippingManifest.new(inventory_units: inventory_units).items
+    @manifest ||= Spree::ShippingManifest.new(inventory_units:).items
   end
 
   def manifest_for_order(order)
-    Spree::ShippingManifest.new(inventory_units: inventory_units).for_order(order).items
+    Spree::ShippingManifest.new(inventory_units:).for_order(order).items
   end
 
   def any_exchanges?

data/app/models/spree/credit_card.rb

@@ -155,12 +155,12 @@ module Spree
     #   card that represents this credit card
     def to_active_merchant
       ActiveMerchant::Billing::CreditCard.new(
-        number: number,
-        month: month,
-        year: year,
-        verification_value: verification_value,
-        first_name: first_name,
-        last_name: last_name
+        number:,
+        month:,
+        year:,
+        verification_value:,
+        first_name:,
+        last_name:
       )
     end
 

data/app/models/spree/deprecated_configurable_class.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Spree
+  class DeprecatedConfigurableClass
+    def self.new(*_args, &_block)
+      @deprecation_proxy ||= DeprecationProxy.new
+    end
+
+    def self.method_missing(method_name, *args, &block)
+      @deprecation_proxy ||= DeprecationProxy.new
+      @deprecation_proxy.send(method_name, args, block)
+    end
+
+    def self.respond_to_missing?(_method_name, _include_private = false)
+      true
+    end
+
+    class DeprecationProxy
+      def method_missing(_method_name, *_args, &_block)
+        issue_deprecation_warning
+        self
+      end
+
+      def respond_to_missing?(_method_name, _include_private = false)
+        true
+      end
+
+      private
+
+      def issue_deprecation_warning
+        Spree.deprecator.warn(
+          <<-WARNING
+            It appears you are using Solidus' Legacy promotion system. This system has been extracted into the
+            `solidus_legacy_promotions` gem. Please add the gem to your Gemfile and follow in the instructions in the README.
+          WARNING
+        )
+      end
+    end
+  end
+end

data/app/models/spree/fulfilment_changer.rb

@@ -107,14 +107,14 @@ module Spree
         # We order by state, because `'backordered' < 'on_hand'`.
         current_shipment.
           inventory_units.
-          where(variant: variant).
+          where(variant:).
           order(state: :asc).
           limit(new_on_hand_quantity).
           update_all(shipment_id: desired_shipment.id, state: :on_hand)
 
         current_shipment.
           inventory_units.
-          where(variant: variant).
+          where(variant:).
           order(state: :asc).
           limit(quantity - new_on_hand_quantity).
           update_all(shipment_id: desired_shipment.id, state: :backordered)
@@ -127,7 +127,7 @@ module Spree
       ActiveRecord::Base.transaction do
         current_shipment.
           inventory_units.
-          where(variant: variant).
+          where(variant:).
           order(state: :asc).
           limit(quantity).
           update_all(shipment_id: desired_shipment.id)
@@ -145,7 +145,7 @@ module Spree
       if current_stock_location != desired_stock_location
         0
       else
-        current_shipment.inventory_units.where(variant: variant).on_hand.count
+        current_shipment.inventory_units.where(variant:).on_hand.count
       end
     end
 

data/app/models/spree/inventory_unit.rb

@@ -64,7 +64,7 @@ module Spree
     #   stock location that is associated with this inventory unit's variant
     def find_stock_item
       Spree::StockItem.where(stock_location_id: shipment.stock_location_id,
-        variant_id: variant_id).first
+        variant_id:).first
     end
 
     # @return [Spree::ReturnItem] a valid return item for this inventory unit
@@ -114,7 +114,7 @@ module Spree
 
     def ensure_can_destroy
       if !backordered? && !on_hand?
-        errors.add(:state, :cannot_destroy, state: state)
+        errors.add(:state, :cannot_destroy, state:)
         throw :abort
       end
 

data/app/models/spree/line_item.rb

@@ -19,9 +19,6 @@ module Spree
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
     has_many :inventory_units, inverse_of: :line_item
 
-    has_many :line_item_actions, dependent: :destroy
-    has_many :actions, through: :line_item_actions
-
     before_validation :normalize_quantity
     before_validation :set_required_attributes
 
@@ -62,7 +59,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.select { |value| !value.tax? && value.eligible? }.sum(&:amount)
+      amount + adjustments.reject(&:tax?).sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this line item before VAT tax

data/app/models/spree/null_promotion_adjuster.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionAdjuster
+    def initialize(order)
+      @order = order
+    end
+
+    def call
+      @order
+    end
+  end
+end

data/app/models/spree/null_promotion_advertiser.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionAdvertiser
+    def self.for_product(_product)
+      []
+    end
+  end
+end

data/app/models/spree/null_promotion_finder.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Spree
+  module NullPromotionFinder
+    def self.by_code_or_id(*)
+      raise ActiveRecord::RecordNotFound, "No promotion system configured."
+    end
+  end
+end

data/app/models/spree/null_promotion_handler.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionHandler
+    attr_reader :order, :coupon_code
+
+    def initialize(order)
+      @order = order
+      @coupon_code = order.coupon_code&.downcase
+    end
+
+    def activate
+      @order
+    end
+
+    def apply
+      self
+    end
+
+    def can_apply?
+      true
+    end
+
+    def error
+      nil
+    end
+
+    def success
+      true
+    end
+
+    def successful?
+      true
+    end
+
+    def status_code
+      :coupon_code_applied
+    end
+
+    def status
+      I18n.t(:coupon_code_applied, scope: [:spree, :null_promotion_handler])
+    end
+  end
+end