resolve merge conflict

openfoodfoundation · Oct 15, 2020 · 84b38e4 · 84b38e4
1 parent 955a0a7
commit 84b38e4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
@@ -605,7 +605,9 @@ def create_proposed_shipments
       adjustments.shipping.delete_all
       shipments.destroy_all
 
-      packages = OrderManagement::Stock::Coordinator.new(self).packages
+      packages = OrderManagement::Stock::Coordinator.new(self).packages(
+        checkout: true, apply_tags: true
+      )
       packages.each do |package|
         shipments << package.to_shipment
       end