Skip to content

Commit 8b66984

Browse files
committed
Filter virtual items from default shipment
1 parent 710519d commit 8b66984

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,13 +1241,18 @@ extension OrderDetailsDataSource {
12411241
siteID: order.siteID,
12421242
orderID: order.orderID,
12431243
index: "0",
1244-
items: order.items.map { item in
1245-
var subItems: [String] = []
1246-
for index in 0..<item.quantity.intValue {
1247-
subItems.append("\(item.itemID)-sub-\(index)")
1244+
items: order.items
1245+
.filter { item in
1246+
let matchingProduct = products.first(where: { $0.productID == item.productOrVariationID })
1247+
return matchingProduct?.virtual == false
12481248
}
1249-
return WooShippingShipmentItem(id: item.itemID, subItems: subItems)
1250-
},
1249+
.map { item in
1250+
var subItems: [String] = []
1251+
for index in 0..<item.quantity.intValue {
1252+
subItems.append("\(item.itemID)-sub-\(index)")
1253+
}
1254+
return WooShippingShipmentItem(id: item.itemID, subItems: subItems)
1255+
},
12511256
shippingLabel: nil
12521257
)]
12531258
}()

0 commit comments

Comments
 (0)