spree_core 6.0.0 → 6.0.2

data/app/workflows/spree/seller_transfers/reverse.rb

@@ -202,34 +202,15 @@ module Spree
               kind: 'refund_reversal',
               provider: @earning.provider,
               status: 'pending'
-            }.merge(settlement_of(bounded))
+            }.merge(@earning.reversal_settlement(bounded))
           )
         end
       end
 
-      # A clawback has to settle where its earning settled. Payouts are swept by
-      # settlement currency, so a reversal left in the sale's currency would
-      # never join the batch that pays the earning it cancels — the seller would
-      # be paid in full for goods that came back, and the row would sit in a
-      # currency their account cannot pay.
-      #
-      # Prorated from the earning's own settled figure rather than converted at
-      # today's rate, so the money comes back at the rate it went out at.
-      def settlement_of(bounded)
-        return {} if @earning.settled_amount.blank? || @earning.amount.zero?
-
-        share = @earning.settled_amount * (bounded / @earning.amount)
-
-        {
-          settled_amount: -Spree::Money::Rounding.quantize(
-            share, Spree::Money::Rounding.precision(@earning.settlement_currency)
-          ),
-          settled_currency: @earning.settled_currency
-        }
-      end
-
+      # Asked of the provider that made the earning — see
+      # {Spree::SellerTransfer#payout_provider_instance}.
       def execute_reversal
-        provider.reverse!(reversal)
+        @earning.payout_provider_instance.reverse!(reversal)
       rescue Spree::Core::AmbiguousGatewayError => e
         # Whether the clawback happened is the provider's to say. Recorded as
         # such rather than as a refusal, so an operator reconciling knows which
@@ -238,31 +219,11 @@ module Spree
         Rails.error.report(e, handled: true, context: { seller_transfer_id: reversal.id }, source: 'spree.core')
         failure(reversal, e.message)
       rescue StandardError => e
+        # Left retryable: `ExecutePendingJob` asks the provider again.
         reversal.update!(status: 'processing')
         Rails.error.report(e, handled: true, context: { seller_transfer_id: reversal.id }, source: 'spree.core')
         failure(reversal, e.message)
       end
-
-      # The provider that made the earning, not whichever one the store uses
-      # now. A marketplace that changes provider still has money sitting with
-      # the old one, and asking the new one to reverse a transfer it never
-      # made leaves the original standing — the seller keeps a refunded sale.
-      def provider
-        @provider ||= begin
-          configured = Spree.payout_providers.find { |candidate| candidate.to_s == @earning.provider }
-
-          # No silent fallback to whatever the store uses now. A provider that
-          # is no longer installed still holds the transfer this reverses, and
-          # handing the job to a different one would mark the row reversed
-          # while the money stayed where it was. An operator has to know.
-          if configured.nil?
-            raise Spree::Core::GatewayError,
-                  "Payout provider #{@earning.provider} is not registered, so its transfer cannot be reversed"
-          end
-
-          configured.new
-        end
-      end
     end
   end
 end

data/db/migrate/20260809150001_promote_shipping_categories_to_delivery_profiles.rb

@@ -52,6 +52,7 @@ class PromoteShippingCategoriesToDeliveryProfiles < ActiveRecord::Migration[8.1]
     remove_column :spree_product_types, :fulfillment_types
 
     backfill_store_defaults
+    copy_first_zone_onto_methods
 
     drop_table :spree_delivery_method_zones
   end
@@ -141,13 +142,21 @@ class PromoteShippingCategoriesToDeliveryProfiles < ActiveRecord::Migration[8.1]
       # never carried a category, so they all belong to the default profile.
       MigrationProduct.where(store_id: store.id, delivery_profile_id: nil).update_all(delivery_profile_id: profile.id)
 
-      MigrationMethod.where(store_id: store.id).find_each do |method|
-        zone_ids = MigrationMethodZone.where(delivery_method_id: method.id).order(:id).pluck(:delivery_zone_id)
-        if zone_ids.size > 1
-          say "Delivery method #{method.id} was linked to #{zone_ids.size} zones; keeping the first — recreate the method for the other zones if both were intended."
-        end
-        method.update_columns(delivery_profile_id: profile.id, delivery_origin_group_id: origin_group.id, delivery_zone_id: zone_ids.first)
+      MigrationMethod.where(store_id: store.id).update_all(delivery_profile_id: profile.id, delivery_origin_group_id: origin_group.id)
+    end
+  end
+
+  # Runs for every method, including 5.x rows whose store_id is still nil: the
+  # link table is dropped right after, so this is the last chance to keep it.
+  def copy_first_zone_onto_methods
+    zone_ids_by_method = MigrationMethodZone.order(:id).pluck(:delivery_method_id, :delivery_zone_id).
+      group_by(&:first).transform_values { |pairs| pairs.map(&:last) }
+
+    zone_ids_by_method.each do |method_id, zone_ids|
+      if zone_ids.size > 1
+        say "Delivery method #{method_id} was linked to #{zone_ids.size} zones; keeping the first — recreate the method for the other zones if both were intended."
       end
+      MigrationMethod.where(id: method_id).update_all(delivery_zone_id: zone_ids.first)
     end
   end
 end

data/db/migrate/20261029100001_add_lockout_columns_to_spree_admin_users.rb

@@ -0,0 +1,8 @@
+# Spree::AccountLockout reads these columns. Installs upgraded from a Devise
+# admin model without :lockable reach 6.0 with neither of them.
+class AddLockoutColumnsToSpreeAdminUsers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :spree_admin_users, :failed_attempts, :integer unless column_exists?(:spree_admin_users, :failed_attempts)
+    add_column :spree_admin_users, :locked_at, :datetime unless column_exists?(:spree_admin_users, :locked_at)
+  end
+end

data/db/migrate/20261030100001_scope_payment_sources_profile_id_uniqueness_to_payment_method.rb

@@ -0,0 +1,38 @@
+class ScopePaymentSourcesProfileIdUniquenessToPaymentMethod < ActiveRecord::Migration[8.1]
+  LEGACY_INDEX_NAME = 'index_payment_sources_on_type_and_gateway_payment_profile_id'.freeze
+  INDEX_NAME = 'index_payment_sources_on_type_profile_id_and_payment_method'.freeze
+
+  def up
+    remove_index :spree_payment_sources, name: LEGACY_INDEX_NAME
+    add_index :spree_payment_sources, [:type, :gateway_payment_profile_id, :payment_method_id],
+              unique: true, name: INDEX_NAME
+  end
+
+  # The legacy index cannot come back once a buyer holds the same gateway profile under two
+  # payment methods, which is what `up` exists to allow. Checked before anything is dropped so a
+  # refusal leaves both indexes intact on MySQL, which has no transactional DDL.
+  def down
+    if cross_payment_method_duplicates?
+      raise ActiveRecord::IrreversibleMigration,
+            'Payment sources share a gateway_payment_profile_id across payment methods, which ' \
+            'the globally unique index cannot represent. Reconcile those rows before rolling back.'
+    end
+
+    remove_index :spree_payment_sources, name: INDEX_NAME
+    add_index :spree_payment_sources, [:type, :gateway_payment_profile_id],
+              unique: true, name: LEGACY_INDEX_NAME
+  end
+
+  private
+
+  # NULLs are distinct in a unique index, so only fully populated pairs could ever have collided.
+  def cross_payment_method_duplicates?
+    connection.select_value(<<~SQL).present?
+      SELECT 1 FROM spree_payment_sources
+      WHERE type IS NOT NULL AND gateway_payment_profile_id IS NOT NULL
+      GROUP BY type, gateway_payment_profile_id
+      HAVING COUNT(*) > 1
+      LIMIT 1
+    SQL
+  end
+end

data/db/migrate/20261031000001_add_last_active_at_to_spree_admin_users.rb

@@ -0,0 +1,7 @@
+# Written whenever a session starts or refreshes (see Spree::RefreshToken), so
+# it outlives the sessions themselves, which signing out deletes.
+class AddLastActiveAtToSpreeAdminUsers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :spree_admin_users, :last_active_at, :datetime
+  end
+end

data/db/migrate/20261031100001_delete_orphaned_spree_option_value_variants.rb

@@ -0,0 +1,10 @@
+class DeleteOrphanedSpreeOptionValueVariants < ActiveRecord::Migration[8.1]
+  # Replacing a variant's option_value_variants used to nullify the old join rows instead of
+  # deleting them. Rows with no variant belong to nothing and block new variants from reusing
+  # their option values through the uniqueness validation scoped to a NULL variant_id.
+  def up
+    execute 'DELETE FROM spree_option_value_variants WHERE variant_id IS NULL'
+  end
+
+  def down; end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -40,7 +40,6 @@ module Spree
       args << '--skip-git'
       args << '--skip-keeps'
       args << '--skip-rc'
-      args << '--skip-spring'
       args << '--skip-test'
       args << '--skip-bootsnap'
       args << '--skip-docker'

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,6 +1,3 @@
-<% if agent_number = ENV['TC_AGENT_NUMBER']
-database_prefix = agent_number + '_'
-end %>
 <% if options[:lib_name]
   lib_name = options[:lib_name].gsub('/', '_')
 end %>
@@ -37,13 +34,13 @@ mysql: &mysql
 
 development:
   <<: *mysql
-  database: <%= database_prefix %><%= lib_name %>_spree_development
+  database: <%= lib_name %>_spree_development
 test:
   <<: *mysql
-  database: <%= database_prefix %><%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
+  database: <%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
 production:
   <<: *mysql
-  database: <%= database_prefix %><%= lib_name %>_spree_production
+  database: <%= lib_name %>_spree_production
 <% when 'postgres' %>
 postgres: &postgres
   adapter: postgresql
@@ -61,13 +58,13 @@ postgres: &postgres
 
 development:
   <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_development
+  database: <%= lib_name %>_spree_development
 test:
   <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
+  database: <%= lib_name %>_spree_test<%%= ENV['TEST_ENV_NUMBER'] %>
 production:
   <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_production
+  database: <%= lib_name %>_spree_production
 <% else %>
 development:
   adapter: sqlite3

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -1,11 +1,11 @@
-Dummy::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.enable_reloading = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.public_file_server.enabled = true
@@ -17,8 +17,9 @@ Dummy::Application.configure do
 
   config.eager_load = false
 
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  # Raise unexpected exceptions; render the ones Rails maps to a status, such
+  # as a 404 for an unknown route, the way production does.
+  config.action_dispatch.show_exceptions = :rescuable
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
@@ -138,7 +139,10 @@ Dummy::Application.configure do
       %r{/spree/orders/complete\.rb:\d+:in '[^']*#place_sibling'},
       # Each requested line is priced, stock-checked, saved and taxed as it
       # is written.
-      %r{/spree/carts/upsert_items\.rb:\d+:in '[^']*#apply_item'}
+      %r{/spree/carts/upsert_items\.rb:\d+:in '[^']*#apply_item'},
+      # An import writes each row on its own, inside the request when the
+      # import is set to run inline.
+      %r{/spree/import_row\.rb:\d+:in '[^']*#process!'}
     ]
 
     # A purchase's billing and shipping addresses, and a transfer's two

data/lib/generators/spree/dummy_model/templates/migration.rb.tt

@@ -1,4 +1,4 @@
-class CreateSpreeDummyModels < ActiveRecord::Migration[5.1]
+class CreateSpreeDummyModels < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :spree_dummy_models do |t|
       t.string :name

data/lib/spree/checkout/default_requirements.rb

@@ -10,6 +10,12 @@ module Spree
     #
     # @see Requirements
     class DefaultRequirements
+      # Everything the discontinuation and stock checks read, so a set of
+      # lines is checked at once.
+      STOCK_CHECK_ASSOCIATIONS = {
+        variant: [{ product: %i[store product_publications] }, { stock_levels: %i[stock_location active_stock_reservations] }]
+      }.freeze
+
       # @param cart [Spree::Cart]
       def initialize(cart)
         @cart = cart
@@ -33,6 +39,7 @@ module Spree
           r << req('address', 'email', I18n.t('spree.checkout_requirements.email_required')) unless @cart.email.present?
           r << req('address', 'ship_address', I18n.t('spree.checkout_requirements.ship_address_required')) if @cart.shipping_address_required? && @cart.ship_address.blank?
           r << req('delivery', 'delivery_method', I18n.t('spree.checkout_requirements.delivery_method_required')) if delivery_step_required? && !delivery_method_selected?
+          r.concat(undeliverable_errors)
           r << req('payment', 'payment', I18n.t('spree.checkout_requirements.payment_required')) if payment_required? && !payment_satisfied?
           r << req('address', 'po_number', I18n.t('spree.checkout_requirements.po_number_required')) if po_number_missing?
           r << order_minimum_requirement if below_order_minimum?
@@ -102,16 +109,37 @@ module Spree
         end
       end
 
+      # A rebuild drops a proposal no method can quote with only a transient
+      # warning, so part of a line can be in no fulfillment. Advisory, so the
+      # buyer reads it while they can still change the address or the cart.
+      def undeliverable_errors
+        return [] unless delivery_step_required? && @cart.fulfillments.any?
+
+        undelivered_line_items.map do |line_item|
+          req('delivery', 'line_items', I18n.t('spree.cart_line_item.delivery_unavailable', li_name: line_item.name),
+              code: 'delivery_unavailable')
+        end
+      end
+
+      # A line short of stock is packed short too; the stock check already
+      # names it. Only lines short of a fulfillment pay for that check, so a
+      # cart read stays at one query.
+      def undelivered_line_items
+        allocated = Spree::FulfillmentItem.where(fulfillment_id: @cart.fulfillments.select(:id))
+                                          .group(:line_item_id).sum(:quantity)
+        short = @cart.line_items.select { |line_item| allocated.fetch(line_item.id, 0) < line_item.quantity }
+        return [] if short.empty?
+
+        ActiveRecord::Associations::Preloader.new(records: short, associations: STOCK_CHECK_ASSOCIATIONS).call
+        short.reject { |line_item| discontinued?(line_item) || !line_item.sufficient_stock? }
+      end
+
       def discontinued?(line_item)
         line_item.variant.nil? || line_item.variant.discontinued? || line_item.variant.product.discontinued?
       end
 
       def completion_line_items
-        # Everything the discontinuation and stock checks read, for every line
-        # at once.
-        @completion_line_items ||= @cart.line_items.includes(
-          variant: [{ product: %i[store product_publications] }, { stock_levels: %i[stock_location active_stock_reservations] }]
-        ).to_a
+        @completion_line_items ||= @cart.line_items.includes(STOCK_CHECK_ASSOCIATIONS).to_a
       end
 
       def delivery_step_required?

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.0.2'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -39,8 +39,6 @@ require 'ransack'
 require 'active_storage_validations'
 require 'wannabe_bool'
 require 'geocoder'
-
-require 'safely_block'
 require 'ar_lazy_preload'
 require 'sqids'
 
@@ -125,7 +123,6 @@ module Spree
       collections: :default,
       stock_location_stock_levels: :default,
       coupon_codes: :default,
-      themes: :default,
       addresses: :default,
       gift_cards: :default,
       webhooks: :default,
@@ -666,6 +663,7 @@ require 'spree/i18n'
 require 'spree/iso_data'
 require 'spree/localized_number'
 require 'spree/measurement'
+require 'spree/time_zones'
 require 'spree/translations'
 require 'spree/money'
 require 'spree/service_module'

data/lib/spree/testing_support/common_rake.rb

@@ -3,11 +3,12 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 
 desc 'Generates a dummy app for testing'
 namespace :common do
+  # :authentication is ignored (test apps use the gem-owned auth models); it stays
+  # so extensions passing positional arguments keep working.
   task :test_app, [:authentication, :user_class, :admin_user_class] do |_t, args|
     # Support both Rake::TaskArguments (via invoke) and Hash (via execute)
     # When using execute with a Hash, args IS the hash directly
     defaults = {
-      authentication: 'dummy',
       user_class: 'Spree::Customer',
       admin_user_class: 'Spree::AdminUser',
     }
@@ -45,7 +46,7 @@ namespace :common do
       File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
     bundle_exec = use_root_gemfile ? "bundle exec --gemfile=#{root_gemfile}" : 'bundle exec'
     puts 'Running Spree install generator...'
-    system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]} --authentication=#{args[:authentication]}")
+    system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]}")
 
     unless ENV['NO_MIGRATE']
       puts 'Setting up dummy database...'

data/lib/spree/testing_support/lifecycle_events.rb

@@ -23,9 +23,7 @@ shared_examples_for 'lifecycle events' do |factory: nil, event_prefix: nil|
 
         # update_attribute, not update!: Spree::Fulfillment#update! shadows the
         # Active Record method with the legacy state-recalculation API.
-        Timecop.travel(1.minute.from_now) do
-          record.update_attribute(:updated_at, Time.current)
-        end
+        record.update_attribute(:updated_at, 1.minute.from_now)
       end
 
       it 'does not publish updated event on a bare touch' do

data/lib/spree/time_zones.rb

@@ -0,0 +1,34 @@
+module Spree
+  # Time zones are stored and exchanged as IANA identifiers (`Europe/Berlin`),
+  # the names browsers and every non-Ruby client understand. Rails' display
+  # names ("Eastern Time (US & Canada)") are converted to them on the way in.
+  module TimeZones
+    # The zones clients are offered: the IANA zones Rails gives a display name
+    # to, with plain `UTC` standing in for `Etc/UTC`. Any other valid IANA
+    # identifier is accepted too. The list comes with the Rails version rather
+    # than the machine's time zone database, so generated types match wherever
+    # the same Rails version runs.
+    SUGGESTED = (ActiveSupport::TimeZone::MAPPING.values - ['Etc/UTC'] + ['UTC']).uniq.sort.freeze
+
+    # @param identifier [String, nil]
+    # @return [Boolean] whether the value is an IANA time zone identifier
+    def self.valid?(identifier)
+      return false if identifier.blank?
+
+      TZInfo::Timezone.get(identifier.to_s)
+      true
+    rescue TZInfo::InvalidTimezoneIdentifier
+      false
+    end
+
+    # @param value [String, nil] an IANA identifier or a Rails time zone name
+    # @return [String, nil] the IANA identifier, or the value unchanged when it
+    #   names no zone the installed time zone database knows
+    def self.normalize(value)
+      return value if value.blank? || valid?(value)
+
+      identifier = ActiveSupport::TimeZone::MAPPING[value.to_s]
+      valid?(identifier) ? identifier : value
+    end
+  end
+end

data/lib/spree/upgrades/5_6_to_6_0/manifest.yml

@@ -212,7 +212,8 @@ steps:
     task: "spree:migrate_shipping_to_delivery"
     notes: |
       Rewrites stored 'Spree::Shipment' class-name strings (state changes,
-      stock movements, legacy adjustments), renames the terminal fulfillment
+      stock movements, legacy adjustments) and the calculators' 'Spree::ShippingMethod'
+      calculable type (so delivery methods find their calculator), renames the terminal fulfillment
       status 'shipped' -> 'fulfilled', backfills the fulfillment provider on
       delivery methods (DigitalDelivery calculators become the Digital
       provider) and copies the provider-derived type onto existing
@@ -597,6 +598,19 @@ steps:
       is dropped in 6.1. Idempotent — only rows without a capture_method are
       written.
 
+  - id: store_regional_settings
+    name: "Convert store time zones and admin languages to standard codes"
+    task_class: "Spree::MaintenanceTasks::Upgrade::StoreRegionalSettings"
+    notes: |
+      A store's time zone is now always an IANA name such as America/New_York,
+      and its admin language a locale code Spree lists, the forms the API
+      accepts and browsers understand. Rails time zone names such as
+      "Eastern Time (US & Canada)" and locale spellings such as en_US are
+      converted. A time zone that names no zone is reset to the store default,
+      which is what the store already ran on; an admin language Spree does not
+      list is cleared, so staff see their own language. Idempotent — stores
+      already on standard codes are skipped.
+
   - id: product_types_backfill
     name: "Backfill product type store ownership"
     task: "spree:product_types:backfill"

data/lib/tasks/delivery_migration.rake

@@ -29,6 +29,11 @@ namespace :spree do
       say.call "spree_adjustments.adjustable_type: #{count} rows Spree::Shipment → Spree::Fulfillment"
     end
 
+    # Calculators are polymorphic on the renamed shipping method; without this
+    # DeliveryMethod#calculator finds nothing.
+    count = Spree::Calculator.where(calculable_type: 'Spree::ShippingMethod').in_batches(of: batch_size).update_all(calculable_type: 'Spree::DeliveryMethod')
+    say.call "spree_calculators.calculable_type: #{count} rows Spree::ShippingMethod → Spree::DeliveryMethod"
+
     # The name column distinguishes the machine ('shipment' rows become
     # 'fulfillment'); the recorded states keep their history except the
     # renamed terminal value.
@@ -171,6 +176,11 @@ namespace :spree do
       end
     end
 
+    # 5.x methods have no store until backfill_delivery_and_stock_store_ids
+    # runs (later in the upgrade), and a DeliveryZone requires one. Resolve
+    # them to the default store, exactly as that backfill will.
+    default_store_id = Spree::Store.default&.id
+
     legacy_zones.find_each do |zone|
       if Spree::DeliveryZone.exists?(id: zone.id) && !migrated.value?(zone.id)
         puts "SKIP zone #{zone.id} (#{zone.name}): a DeliveryZone with the same id already exists — resolve manually"
@@ -178,7 +188,7 @@ namespace :spree do
       end
 
       methods_by_home = Spree::DeliveryMethod.unscoped.where(delivery_zone_id: zone.id).
-        group_by { |method| [method.store_id, method.delivery_profile_id] }
+        group_by { |method| [method.store_id || default_store_id, method.delivery_profile_id] }
 
       methods_by_home.each do |(store_id, profile_id), methods|
         profile_id ||= Spree::DeliveryProfile.where(store_id: store_id, default: true).pick(:id)
@@ -208,6 +218,12 @@ namespace :spree do
       puts "SKIP unreferenced shipping zone #{zone.id} (#{zone.name}) — no delivery method uses it"
     end
 
+    zoneless = Spree::DeliveryMethod.unscoped.where(delivery_zone_id: nil).pluck(:id, :name)
+    if zoneless.any?
+      puts "WARNING: #{zoneless.size} delivery methods have no delivery zone and return no rates at checkout. Assign a zone to each in the admin:"
+      zoneless.each { |id, name| puts "  - ##{id} #{name}" }
+    end
+
     puts 'migrate_zones_to_delivery_zones done. Tax-scoped zones stay on Spree::Zone for the tax provider migration.'
   end
 end

data/lib/tasks/remove_orphan_order_promotions.rake

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Deleting a promotion used to leave OrderPromotion rows on open carts pointing
+# at a promotion that no longer exists, which broke loading those carts.
+namespace :spree do
+  desc 'Remove order promotions whose promotion no longer exists and recalculate the affected carts'
+  task remove_orphan_order_promotions: :environment do
+    orphans = Spree::OrderPromotion.where.not(promotion_id: Spree::Promotion.unscoped.select(:id))
+    removed = 0
+
+    orphans.find_each do |order_promotion|
+      owner = order_promotion.owner
+      order_promotion.destroy
+      owner&.recalculate_totals! if owner.is_a?(Spree::Cart)
+      removed += 1
+    end
+
+    puts "remove_orphan_order_promotions done. removed: #{removed}"
+  end
+end