Merge branch 'trunk' into WOOMOB-618-voice-over-issues-in-shipping-labels

# Conflicts:
#	WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Author: RafaelKayumov

Modules/Package.swift

@@ -342,7 +342,7 @@ enum XcodeSupport {
             .xcodeTarget(
                 XcodeTargetNames.notificationExtension,
                 dependencies: [
-                    "Networking",
+                    "NetworkingCore",
                     "WooFoundation",
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                 ]

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -100,7 +100,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSaleOrdersi1:
             return true
         case .pointOfSaleOrdersi2:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .pointOfSaleBarcodeScanningi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         default:

Modules/Sources/Fakes/Networking.generated.swift

@@ -1451,6 +1451,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: .fake(),
             paperSize: .fake(),
             lastSelectedPackageID: .fake(),
+            lastOrderCompleted: .fake(),
             addPaymentMethodURL: .fake()
         )
     }
@@ -2483,6 +2484,19 @@ extension Networking.WooShippingSelectedRate {
         )
     }
 }
+extension Networking.WooShippingShipment {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.WooShippingShipment {
+        .init(
+            siteID: .fake(),
+            orderID: .fake(),
+            index: .fake(),
+            items: .fake(),
+            shippingLabel: .fake()
+        )
+    }
+}
 extension Networking.WooShippingShipmentItem {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Networking/Mapper/SingleItemMapper.swift

@@ -2,16 +2,20 @@ import Foundation
 
 /// SingleItemMapper: Maps generic REST API requests for a single item
 ///
-struct SingleItemMapper<Output: Decodable>: Mapper {
+public struct SingleItemMapper<Output: Decodable>: Mapper {
     /// Site Identifier associated to the items that will be parsed.
     ///
     /// We're injecting this field via `JSONDecoder.userInfo` because SiteID is not returned by our endpoints.
     ///
     let siteID: Int64
 
+    public init(siteID: Int64) {
+        self.siteID = siteID
+    }
+
     /// (Attempts) to convert a dictionary into Output.
     ///
-    func map(response: Data) throws -> Output {
+    public func map(response: Data) throws -> Output {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
         decoder.userInfo = [

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -2424,6 +2424,7 @@ extension Networking.ShippingLabelAccountSettings {
         isEmailReceiptsEnabled: CopiableProp<Bool> = .copy,
         paperSize: CopiableProp<ShippingLabelPaperSize> = .copy,
         lastSelectedPackageID: CopiableProp<String> = .copy,
+        lastOrderCompleted: CopiableProp<Bool> = .copy,
         addPaymentMethodURL: NullableCopiableProp<URL> = .copy
     ) -> Networking.ShippingLabelAccountSettings {
         let siteID = siteID ?? self.siteID
@@ -2438,6 +2439,7 @@ extension Networking.ShippingLabelAccountSettings {
         let isEmailReceiptsEnabled = isEmailReceiptsEnabled ?? self.isEmailReceiptsEnabled
         let paperSize = paperSize ?? self.paperSize
         let lastSelectedPackageID = lastSelectedPackageID ?? self.lastSelectedPackageID
+        let lastOrderCompleted = lastOrderCompleted ?? self.lastOrderCompleted
         let addPaymentMethodURL = addPaymentMethodURL ?? self.addPaymentMethodURL
 
         return Networking.ShippingLabelAccountSettings(
@@ -2453,6 +2455,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: isEmailReceiptsEnabled,
             paperSize: paperSize,
             lastSelectedPackageID: lastSelectedPackageID,
+            lastOrderCompleted: lastOrderCompleted,
             addPaymentMethodURL: addPaymentMethodURL
         )
     }
@@ -3481,7 +3484,7 @@ extension Networking.WooShippingAddress {
 extension Networking.WooShippingConfig {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,
-        shipments: CopiableProp<[String: [WooShippingShipmentItem]]> = .copy,
+        shipments: CopiableProp<[WooShippingShipment]> = .copy,
         shippingLabelData: NullableCopiableProp<WooShippingLabelData> = .copy
     ) -> Networking.WooShippingConfig {
         let siteID = siteID ?? self.siteID
@@ -3724,6 +3727,30 @@ extension Networking.WooShippingPackagesResponse {
     }
 }
 
+extension Networking.WooShippingShipment {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        orderID: CopiableProp<Int64> = .copy,
+        index: CopiableProp<String> = .copy,
+        items: CopiableProp<[WooShippingShipmentItem]> = .copy,
+        shippingLabel: NullableCopiableProp<ShippingLabel> = .copy
+    ) -> Networking.WooShippingShipment {
+        let siteID = siteID ?? self.siteID
+        let orderID = orderID ?? self.orderID
+        let index = index ?? self.index
+        let items = items ?? self.items
+        let shippingLabel = shippingLabel ?? self.shippingLabel
+
+        return Networking.WooShippingShipment(
+            siteID: siteID,
+            orderID: orderID,
+            index: index,
+            items: items,
+            shippingLabel: shippingLabel
+        )
+    }
+}
+
 extension Networking.WooShippingShipmentItem {
     public func copy(
         id: CopiableProp<Int64> = .copy,

Modules/Sources/Networking/Model/ShippingLabel/Shipments/WooShippingConfigResponse.swift

@@ -15,14 +15,14 @@ public struct WooShippingConfig: Decodable, Equatable, GeneratedFakeable, Genera
     /// The remote ID of the site that owns this shipping label config info.
     public let siteID: Int64
 
-    /// Shipments of this order. The keys are the ids of the shipment.
-    public let shipments: WooShippingShipments
+    /// Shipments of this order.
+    public let shipments: [WooShippingShipment]
 
     /// Holds info about the shipping labels
     public let shippingLabelData: WooShippingLabelData?
 
     public init(siteID: Int64,
-                shipments: WooShippingShipments,
+                shipments: [WooShippingShipment],
                 shippingLabelData: WooShippingLabelData?) {
         self.siteID = siteID
         self.shipments = shipments
@@ -39,17 +39,46 @@ public struct WooShippingConfig: Decodable, Equatable, GeneratedFakeable, Genera
             throw WooShippingConfigDecodingError.missingSiteID
         }
 
+        guard let orderID = decoder.userInfo[.orderID] as? Int64 else {
+            throw WooShippingConfigDecodingError.missingOrderID
+        }
+
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        let shipments: WooShippingShipments = {
+        let shippingLabelData = try container.decodeIfPresent(WooShippingLabelData.self, forKey: .shippingLabelData)
+
+        let shipments: [WooShippingShipment] = {
             guard let shipmentsString = try? container.decodeIfPresent(String.self, forKey: .shipments),
                   let data = shipmentsString.data(using: .utf8) else {
-                return [:]
+                return []
             }
 
-            return (try? JSONDecoder().decode(WooShippingShipments.self, from: data)) ?? [:]
+            guard let contents = (try? JSONDecoder().decode(WooShippingShipments.self, from: data)) else {
+                return []
+            }
+
+            let labels = shippingLabelData?.currentOrderLabels ?? []
+            var shipments = [WooShippingShipment]()
+            for (index, items) in contents {
+                let label: ShippingLabel? = {
+                    let purchasedLabels = labels.filter {
+                        $0.shipmentID == index && $0.status == .purchased
+                    }
+                    let sortedLabels = purchasedLabels.sorted { $0.dateCreated > $1.dateCreated }
+                    if let completedLabel = sortedLabels.first(where: { $0.refund == nil }) {
+                        return completedLabel
+                    } else {
+                        return sortedLabels.first
+                    }
+                }()
+                shipments.append(WooShippingShipment(siteID: siteID,
+                                                     orderID: orderID,
+                                                     index: index,
+                                                     items: items,
+                                                     shippingLabel: label))
+            }
+            return shipments
         }()
 
-        let shippingLabelData = try container.decodeIfPresent(WooShippingLabelData.self, forKey: .shippingLabelData)
         self.init(siteID: siteID,
                   shipments: shipments,
                   shippingLabelData: shippingLabelData)
@@ -135,4 +164,5 @@ public extension WooShippingLabelData {
 //
 enum WooShippingConfigDecodingError: Error {
     case missingSiteID
+    case missingOrderID
 }

Modules/Sources/Networking/Model/ShippingLabel/Shipments/WooShippingShipmentItem.swift

@@ -1,11 +1,42 @@
 import Foundation
 import Codegen
-import WooFoundation
 
-/// Represents a shipment in Shipping Labels for the WooCommerce Shipping extension.
+/// Represents a shipment from the WooCommerce Shipping extension.
+///
+public struct WooShippingShipment: Equatable, GeneratedFakeable, GeneratedCopiable {
+    /// ID of the site that the shipment belongs to.
+    public let siteID: Int64
+
+    /// ID of the order that the shipment belongs to.
+    public let orderID: Int64
+
+    /// Index of the shipment.
+    /// The expected format is a numeric string, e.g: "0", "1", etc.
+    public let index: String
+
+    /// Contents of the shipment
+    public let items: [WooShippingShipmentItem]
+
+    /// The latest label purchased for the shipment
+    public let shippingLabel: ShippingLabel?
+
+    public init(siteID: Int64,
+                orderID: Int64,
+                index: String,
+                items: [WooShippingShipmentItem],
+                shippingLabel: ShippingLabel?) {
+        self.siteID = siteID
+        self.orderID = orderID
+        self.index = index
+        self.items = items
+        self.shippingLabel = shippingLabel
+    }
+}
+
+/// Represents a shipment item from the WooCommerce Shipping extension.
 ///
 public struct WooShippingShipmentItem: Codable, Equatable, GeneratedFakeable, GeneratedCopiable {
-    /// ID of the shipment
+    /// ID of the order item
     public let id: Int64
 
     /// Items of the shipment
@@ -18,3 +49,10 @@ public struct WooShippingShipmentItem: Codable, Equatable, GeneratedFakeable, Ge
 }
 
 public typealias WooShippingShipments = [String: [WooShippingShipmentItem]]
+
+public extension WooShippingShipmentItem {
+    var quantity: Decimal {
+        guard let subItems else { return 0 }
+        return subItems.count > 0 ? Decimal(subItems.count) : 1
+    }
+}

Modules/Sources/Networking/Model/ShippingLabel/ShippingLabelAccountSettings.swift

@@ -43,6 +43,10 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
     /// Uses the `id` for predefined packages or `name` for custom packages.
     public let lastSelectedPackageID: String
 
+    /// Whether to mark order as completed after last label purchase
+    /// This is available only in the new Woo Shipping plugin.
+    public let lastOrderCompleted: Bool
+
     /// URL to open the web view for adding new payment methods
     public let addPaymentMethodURL: URL?
 
@@ -58,6 +62,7 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
                 isEmailReceiptsEnabled: Bool,
                 paperSize: ShippingLabelPaperSize,
                 lastSelectedPackageID: String,
+                lastOrderCompleted: Bool,
                 addPaymentMethodURL: URL?) {
         self.siteID = siteID
         self.canManagePayments = canManagePayments
@@ -71,6 +76,7 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
         self.isEmailReceiptsEnabled = isEmailReceiptsEnabled
         self.paperSize = paperSize
         self.lastSelectedPackageID = lastSelectedPackageID
+        self.lastOrderCompleted = lastOrderCompleted
         self.addPaymentMethodURL = addPaymentMethodURL
     }
 }
@@ -105,6 +111,7 @@ extension ShippingLabelAccountSettings: Decodable {
 
         let userMetaContainer = try container.nestedContainer(keyedBy: UserMetaKeys.self, forKey: .userMeta)
         let lastSelectedPackageID = try userMetaContainer.decode(String.self, forKey: .lastSelectedPackageID)
+        let lastOrderCompleted = (try? userMetaContainer.decodeIfPresent(Bool.self, forKey: .lastOrderCompleted)) ?? false
 
         self.init(siteID: siteID,
                   canManagePayments: canManagePayments,
@@ -118,6 +125,7 @@ extension ShippingLabelAccountSettings: Decodable {
                   isEmailReceiptsEnabled: isEmailReceiptsEnabled,
                   paperSize: paperSize,
                   lastSelectedPackageID: lastSelectedPackageID,
+                  lastOrderCompleted: lastOrderCompleted,
                   addPaymentMethodURL: addPaymentMethodURL)
     }
 }
@@ -150,6 +158,7 @@ private extension ShippingLabelAccountSettings {
 
     private enum UserMetaKeys: String, CodingKey {
         case lastSelectedPackageID = "last_box_id"
+        case lastOrderCompleted = "last_order_completed"
     }
 }
 

Modules/Sources/Networking/Remote/ProductsRemote.swift

@@ -259,7 +259,7 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
                                                    productsPerPage: String = POSConstants.productsPerPage,
                                                    productTypes: [ProductType],
                                                    orderBy: OrderKey = .name,
-                                                   order: Order = .ascending) -> [String: String] {
+                                                   order: Order = .ascending) -> [String: any Hashable] {
         [
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: productsPerPage,
@@ -276,7 +276,7 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
 
     private func makePagedPointOfSaleProductsRequest(for siteID: Int64,
                                                      pageNumber: Int,
-                                                     parameters: [String: String]) async throws -> PagedItems<POSProduct> {
+                                                     parameters: [String: any Hashable]) async throws -> PagedItems<POSProduct> {
         let request = JetpackRequest(wooApiVersion: .mark3,
                                      method: .get,
                                      siteID: siteID,
@@ -318,8 +318,13 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
             productTypes: productTypes)
 
         parameters.updateValue(query, forKey: ParameterKey.search)
+
+        // Takes precedence over `search` from WC 9.9 to 10.1
         parameters.updateValue(query, forKey: ParameterKey.searchNameOrSKU)
 
+        // Takes precedence over `search_name_or_sku` from WC 10.1+ and is combined with `search` value
+        parameters.updateValue([SearchField.name, SearchField.sku, SearchField.globalUniqueID], forKey: ParameterKey.searchFields)
+
         return try await makePagedPointOfSaleProductsRequest(
             for: siteID,
             pageNumber: pageNumber,
@@ -749,6 +754,7 @@ public extension ProductsRemote {
         static let include: String    = "include"
         static let search: String     = "search"
         static let searchNameOrSKU: String = "search_name_or_sku"
+        static let searchFields: String = "search_fields"
         static let orderBy: String    = "orderby"
         static let order: String      = "order"
         static let sku: String        = "sku"
@@ -776,6 +782,12 @@ public extension ProductsRemote {
         static let productSegment = "product"
         static let itemsSold = "items_sold"
     }
+
+    private enum SearchField {
+        static let name = "name"
+        static let sku = "sku"
+        static let globalUniqueID = "global_unique_id"
+    }
 }
 
 private extension ProductsRemote {