Deprecate skip_customer_return_processing

Walk back the use of skip_customer_return_processing and restore the
call to process_return! within process_inventory_unit!.

backend/app/controllers/spree/admin/customer_returns_controller.rb

@@ -70,8 +70,6 @@ def build_return_items_from_params
  return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
  return_item.assign_attributes(item_params)
 
- return_item.skip_customer_return_processing = true
-
  if item_params[:reception_status_event].blank?
  return redirect_to(new_object_url, flash: { error: 'Reception status choice required' })
  end

core/app/models/spree/return_item.rb

@@ -90,8 +90,13 @@ def reception_completed?
  COMPLETED_RECEPTION_STATUSES.map(&:to_s).include?(reception_status.to_s)
  end
 
-
- attr_accessor :skip_customer_return_processing
+ def skip_customer_return_processing=(value)
+ @skip_customer_return_processing = value
+ Deprecation.warn \
+ 'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
+ 'nothing, and #process_inventory_unit! will restore calling ' \
+ 'customer_return#process_return!', caller(1)
+ end
 
  # @param inventory_unit [Spree::InventoryUnit] the inventory for which we
  # want a return item
@@ -201,8 +206,11 @@ def process_inventory_unit!
  customer_return.stock_location.restock(inventory_unit.variant, 1, customer_return)
  end
 
- if customer_return && !skip_customer_return_processing
- Deprecation.warn 'From Solidus v2.9 onwards, #process_inventory_unit! will not call customer_return#process_return!'
+ unless @skip_customer_return_processing.nil?
+ Deprecation.warn \
+ 'From Solidus v2.11 onwards, #skip_customer_return_processing does ' \
+ 'nothing, and #process_inventory_unit! will restore calling ' \
+ 'customer_return#process_return!'
  end
 
  customer_return&.process_return!

core/lib/spree/testing_support/factories/return_item_factory.rb

@@ -6,7 +6,6 @@
 
 FactoryBot.define do
  factory :return_item, class: 'Spree::ReturnItem' do
- skip_customer_return_processing { true }
  association(:inventory_unit, factory: :inventory_unit, state: :shipped)
  association(:return_reason, factory: :return_reason)
  return_authorization do |_return_item|

core/spec/models/spree/return_item_spec.rb

@@ -43,8 +43,8 @@
  subject
  end
 
- context 'when the `skip_customer_return_processing` flag is not set to true' do
- before { return_item.skip_customer_return_processing = false }
+ context 'when the `skip_customer_return_processing` flag is set' do
+ before { Spree::Deprecation.silence { return_item.skip_customer_return_processing = false } }
 
  it 'shows a deprecation warning' do
  expect(Spree::Deprecation).to receive(:warn)
@@ -811,4 +811,16 @@
  end
  end
  end
+
+ describe '#skip_customer_return_processing=' do
+ context 'when it receives a value' do
+ let(:return_item) { described_class.new }
+ subject { return_item.skip_customer_return_processing = :foo }
+
+ it 'shows a deprecation warning' do
+ expect(Spree::Deprecation).to receive(:warn)
+ subject
+ end
+ end
+ end
 end

sample/db/samples/reimbursements.rb

@@ -38,7 +38,6 @@
  stock_location: stock_location
 )
 return_item.reload
-return_item.skip_customer_return_processing = true
 return_item.receive!
 customer_return.process_return!