Merge branch 'trunk' into issue/woomob-890-in-person-payments-identifying-card-reader-model-ios-part

Author: malinajirka

Modules/Package.resolved

@@ -72,6 +72,7 @@ let package = Package(
         .package(url: "https://github.com/Alamofire/Alamofire", from: "5.2.0"),
         .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.0.0"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
+        .package(url: "https://github.com/apple/swift-async-algorithms", exact: "1.0.4"),
         .package(url: "https://github.com/Automattic/AutomatticAbout-swift.git", from: "1.1.5"),
         .package(url: "https://github.com/Automattic/Automattic-Tracks-iOS.git", from: "3.5.2"),
         .package(url: "https://github.com/Automattic/Gridicons-iOS", revision: "c904cb73e26e86463a78e1335c6f4fd54a9e9223"),
@@ -381,6 +382,7 @@ enum XcodeSupport {
                     .product(name: "Inject", package: "Inject"),
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                     .product(name: "Kingfisher", package: "Kingfisher"),
+                    .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                     .product(name: "ScrollViewSectionKit", package: "ScrollViewSectionKit"),
                     .product(name: "Shimmer", package: "SwiftUI-Shimmer"),
                     .product(name: "StripeTerminal", package: "stripe-terminal-ios"),

Modules/Package.swift

@@ -103,6 +103,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleBarcodeScanningi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .orderAddressMapSearch:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -210,4 +210,8 @@ public enum FeatureFlag: Int {
     /// Enables the Point of Sale Barcode Scanner set up flows, as part of i2
     ///
     case pointOfSaleBarcodeScanningi2
+
+    /// Enables the CTA to search for an address in the map in order details > shipping address.
+    ///
+    case orderAddressMapSearch
 }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -228,6 +228,8 @@ public class OrdersRemote: Remote {
                     params[Order.CodingKeys.createdVia.rawValue] = createdViaValue
                 }
 
+                params[ParameterKeys.decimalPlaces] = OrdersRemote.Defaults.decimalPoints
+
                 return params
             }()
 
@@ -253,7 +255,10 @@ public class OrdersRemote: Remote {
     ///
     public func updateOrder(from siteID: Int64, orderID: Int64, statusKey: OrderStatusEnum, completion: @escaping (Order?, Error?) -> Void) {
         let path = "\(Constants.ordersPath)/" + String(orderID)
-        let parameters = [ParameterKeys.statusKey: statusKey.rawValue]
+        let parameters = [
+            ParameterKeys.statusKey: statusKey.rawValue,
+            ParameterKeys.decimalPlaces: OrdersRemote.Defaults.decimalPoints
+        ]
         let mapper = OrderMapper(siteID: siteID)
 
         let request = JetpackRequest(wooApiVersion: .mark3,
@@ -328,6 +333,9 @@ public class OrdersRemote: Remote {
                                                                                value: cashPaymentChangeDueAmount).toDictionary()]
                 }
 
+                // Add decimal places parameter for better precision
+                params[ParameterKeys.decimalPlaces] = OrdersRemote.Defaults.decimalPoints
+
                 return params
             }()
 
@@ -449,8 +457,9 @@ extension OrdersRemote: POSOrdersRemoteProtocol {
 //
 public extension OrdersRemote {
     enum Defaults {
-        public static let pageSize: Int     = 25
-        public static let pageNumber: Int   = 1
+        public static let pageSize: Int = 25
+        public static let pageNumber: Int = 1
+        public static let decimalPoints: String = "8"
         public static let statusAny: String = "any"
     }
 
@@ -477,6 +486,7 @@ public extension OrdersRemote {
         static let customer = "customer"
         static let product = "product"
         static let createdVia = "created_via"
+        static let decimalPlaces = "dp"
     }
 
     enum ParameterValues {

Modules/Sources/NetworkingCore/Remote/OrdersRemote.swift

@@ -13,12 +13,12 @@ public enum CardPresentPaymentsPlugin: Equatable, CaseIterable {
         }
     }
 
-    public var fileNameWithoutExtension: String {
+    public var plugin: Plugin {
         switch self {
         case .wcPay:
-            return "woocommerce-payments"
+            return .wooPayments
         case .stripe:
-            return "woocommerce-gateway-stripe"
+            return .stripe
         }
     }
 

Modules/Sources/Yosemite/Model/Enums/CardPresentPaymentsPlugin.swift

@@ -1,23 +1,64 @@
 import Foundation
 
 public enum Plugin: Equatable, CaseIterable {
+    case blaze
+    case jetpack
+    case googleListingsAndAds
     case stripe
     case wooCommerce
+    case wooCompositeProducts
+    case wooGiftCards
     case wooPayments
+    case wooPayPal
+    case wooProductBundles
     case wooSubscriptions
     case wooShipmentTracking
     case wooSquare
 
+    /// Creates a Plugin from a plugin file name in the plugin path.
+    /// Returns nil if the file name doesn't match any known Plugin case.
+    ///
+    /// - Parameter systemPlugin: The SystemPlugin to convert.
+    public init?(fileNameWithoutExtension: String) {
+        guard let plugin = Plugin.allCases.first(where: { $0.fileNameWithoutExtension == fileNameWithoutExtension }) else {
+            return nil
+        }
+        self = plugin
+    }
+
+    /// Creates a Plugin from a SystemPlugin by matching the plugin file name in the plugin path.
+    /// Returns nil if the SystemPlugin doesn't match any known Plugin case.
+    ///
+    /// - Parameter systemPlugin: The SystemPlugin to convert.
+    public init?(systemPlugin: SystemPlugin) {
+        let pluginFileNameWithoutExtension = systemPlugin.fileNameWithoutExtension
+        self.init(fileNameWithoutExtension: pluginFileNameWithoutExtension)
+    }
+
     /// File name without extension in the plugin path.
     /// Full plugin path is like `woocommerce/woocommerce.php`.
     var fileNameWithoutExtension: String {
         switch self {
+        case .blaze:
+            return "blaze-ads"
+        case .jetpack:
+            return "jetpack"
+        case .googleListingsAndAds:
+            return "google-listings-and-ads"
         case .stripe:
             return "woocommerce-gateway-stripe"
         case .wooCommerce:
             return "woocommerce"
+        case .wooCompositeProducts:
+            return "woocommerce-composite-products"
+        case .wooGiftCards:
+            return "woocommerce-gift-cards"
         case .wooPayments:
             return "woocommerce-payments"
+        case .wooPayPal:
+            return "woocommerce-paypal-payments"
+        case .wooProductBundles:
+            return "woocommerce-product-bundles"
         case .wooSubscriptions:
             return "woocommerce-subscriptions"
         case .wooShipmentTracking:
@@ -27,3 +68,9 @@ public enum Plugin: Equatable, CaseIterable {
         }
     }
 }
+
+private extension SystemPlugin {
+    var fileNameWithoutExtension: String {
+        ((plugin as NSString).lastPathComponent as NSString).deletingPathExtension
+    }
+}

Modules/Sources/Yosemite/Tools/Plugin.swift

@@ -309,6 +309,19 @@ final class OrdersRemoteTests: XCTestCase {
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
 
+    func test_updateOrder_status_includes_decimal_places_parameter() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+
+        // When
+        remote.updateOrder(from: sampleSiteID, orderID: sampleOrderID, statusKey: .pending) { (order, error) in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["dp"] as? String)
+        assertEqual(received, "8")
+    }
+
     func test_update_order_properly_encodes_shipping_lines_for_removal_from_order() throws {
         // Given
         let remote = OrdersRemote(network: network)
@@ -517,6 +530,20 @@ final class OrdersRemoteTests: XCTestCase {
         XCTAssertNil(request.parameters["meta_data"])
     }
 
+    func test_updateOrder_with_fields_includes_decimal_places_parameter() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let order = Order.fake()
+
+        // When
+        remote.updateOrder(from: sampleSiteID, order: order, giftCard: nil, fields: [.customerNote]) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["dp"] as? String)
+        assertEqual(received, "8")
+    }
+
     // MARK: - Load Order Notes Tests
 
     /// Verifies that loadOrderNotes properly parses the `order-notes` sample response.
@@ -806,6 +833,20 @@ final class OrdersRemoteTests: XCTestCase {
         XCTAssertNil(request.parameters["created_via"])
     }
 
+    func test_createOrder_includes_decimal_places_parameter() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let order = Order.fake()
+
+        // When
+        remote.createOrder(siteID: 123, order: order, giftCard: nil, fields: []) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["dp"] as? String)
+        assertEqual(received, "8")
+    }
+
     // MARK: - Delete order tests
 
     func test_delete_order_properly_returns_parsed_order() throws {

Modules/Tests/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -1269,6 +1269,7 @@ final class OrderStoreTests: XCTestCase {
             "currency",
             "customer_id",
             "customer_note",
+            "dp",
             "fee_lines",
             "line_items",
             "meta_data",
@@ -1297,6 +1298,7 @@ final class OrderStoreTests: XCTestCase {
             "currency",
             "customer_id",
             "customer_note",
+            "dp",
             "fee_lines",
             "gift_cards",
             "line_items",
@@ -1359,7 +1361,8 @@ final class OrderStoreTests: XCTestCase {
         let expectedKeys = [
             "gift_cards"
         ]
-        assertEqual(expectedKeys, receivedKeys)
+        // Updating an order will also contain `dp` (decimal point), but in this case we're only interested in `gift_cards`
+        XCTAssertTrue(receivedKeys.contains(expectedKeys))
     }
 
     func test_update_order_with_gift_card_returns_notApplied_error_when_error_response_does_not_include_gift_card() throws {