allow stock_location_id for shipment on Importer::Order

solidusio · Jun 5, 2020 · 448d504 · 448d504
1 parent 822a71d
commit 448d504
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/lib/spree/core/importer/order.rb b/core/lib/spree/core/importer/order.rb
@@ -56,7 +56,9 @@ def self.create_shipments_from_params(shipments_hash, order)
           shipments_hash.each do |target|
             shipment = Shipment.new
             shipment.tracking       = target[:tracking]
-            shipment.stock_location = Spree::StockLocation.find_by(admin_name: target[:stock_location]) || Spree::StockLocation.find_by!(name: target[:stock_location])
+            shipment.stock_location = Spree::StockLocation.find_by(id: target[:stock_location_id]) ||
+            Spree::StockLocation.find_by(admin_name: target[:stock_location]) ||
+            Spree::StockLocation.find_by!(name: target[:stock_location])
 
             inventory_units = target[:inventory_units] || []
             inventory_units.each do |inventory_unit|

diff --git a/core/spec/lib/spree/core/importer/order_spec.rb b/core/spec/lib/spree/core/importer/order_spec.rb
@@ -325,6 +325,15 @@ module Core
           }.to raise_error ActiveRecord::RecordNotFound
         end
 
+        it "accepts stock_location_id" do
+          params[:shipments_attributes][0][:stock_location] = nil
+          params[:shipments_attributes][0][:stock_location_id] = stock_location.id
+          order = Importer::Order.import(user, params)
+          shipment = order.shipments.first
+
+          expect(shipment.stock_location).to eq stock_location
+        end
+
         context 'when completed_at and shipped_at present' do
           let(:params) do
             {