Merge pull request #6466 from Matt-Yorkley/package-optimisation

Optimise Shipment#to_package

app/models/spree/shipment.rb

@@ -249,8 +249,11 @@ def inventory_units_for(variant)
 
     def to_package
       package = OrderManagement::Stock::Package.new(stock_location, order)
-      inventory_units.includes(:variant).each do |inventory_unit|
-        package.add inventory_unit.variant, 1, inventory_unit.state_name
+      grouped_inventory_units = inventory_units.includes(:variant).group_by do |iu|
+        [iu.variant, iu.state_name]
+      end
+      grouped_inventory_units.each do |(variant, state_name), inventory_units|
+        package.add variant, inventory_units.count, state_name
       end
       package
     end