Associate return items with return authorization

This change ensures that return items built for a new return
authorization are correctly associated with it. This will ensure that
the display_* methods use the currency from the return authorization,
instead of the default store currency.

Co-authored-by: Alistair Norman <alistair@super.gd>

Author: 2 people

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

@@ -40,10 +40,13 @@ def load_return_items
         associated_inventory_units = @return_authorization.return_items.map(&:inventory_unit)
         unassociated_inventory_units = all_inventory_units - associated_inventory_units
 
-        new_return_items = unassociated_inventory_units.map do |new_unit|
-          Spree::ReturnItem.new(inventory_unit: new_unit).tap(&:set_default_amount)
+        unassociated_inventory_units.each do |new_unit|
+          @return_authorization.return_items.
+            build(inventory_unit: new_unit).
+            tap(&:set_default_amount)
         end
-        @form_return_items = (@return_authorization.return_items + new_return_items).sort_by(&:inventory_unit_id)
+
+        @form_return_items = @return_authorization.return_items.sort_by(&:inventory_unit_id)
       end
 
       def load_reimbursement_types

backend/spec/controllers/spree/admin/return_authorizations_controller_spec.rb

@@ -102,6 +102,19 @@
           expect(assigns(:form_return_items).size).to eq 3
           expect(assigns(:form_return_items).select(&:new_record?).size).to eq 3
         end
+
+        context 'with an order with currency other than the store default' do
+          let!(:order) { create(:shipped_order, line_items_count: 3, currency: 'EUR') }
+
+          it 'sets the currency on the return items from the order' do
+            subject
+            expect(
+              assigns(:form_return_items).all? { |ri|
+                ri.display_amount.currency.iso_code == 'EUR'
+              }
+            ).to be true
+          end
+        end
       end
     end