Merge branch 'trunk' into issue/5766-coupon-usage-details

Author: itsmeichigo

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -27,6 +27,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .orderCreation:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .orderCreationRemoteSynchronizer:
+            return false
         case .hubMenu:
             return true
         case .systemStatusReport:

Experiments/Experiments/FeatureFlag.swift

@@ -54,6 +54,10 @@ public enum FeatureFlag: Int {
     ///
     case orderCreation
 
+    /// Allows new orders to be created and synced as drafts
+    ///
+    case orderCreationRemoteSynchronizer
+
     /// Display the new tab "Menu" in the tab bar.
     ///
     case hubMenu

Networking/Networking/Model/ShippingLine.swift

@@ -3,10 +3,16 @@ import Codegen
 
 /// Represents a Shipping Line Entity.
 ///
-public struct ShippingLine: Decodable, Equatable, GeneratedFakeable {
+public struct ShippingLine: Codable, Equatable, GeneratedFakeable {
     public let shippingID: Int64
     public let methodTitle: String
-    public let methodID: String
+
+    /// Shipping Method ID
+    ///
+    /// Sending a null value to the REST API removes the Shipping Line.
+    ///
+    public let methodID: String?
+
     public let total: String
     public let totalTax: String
     public let taxes: [ShippingLineTax]
@@ -15,7 +21,7 @@ public struct ShippingLine: Decodable, Equatable, GeneratedFakeable {
     ///
     public init(shippingID: Int64,
                 methodTitle: String,
-                methodID: String,
+                methodID: String?,
                 total: String,
                 totalTax: String,
                 taxes: [ShippingLineTax]) {
@@ -29,6 +35,21 @@ public struct ShippingLine: Decodable, Equatable, GeneratedFakeable {
     }
 }
 
+// MARK: Codable
+extension ShippingLine {
+
+    /// Encodes ShippingLine writable fields.
+    ///
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+
+        try container.encode(shippingID, forKey: .shippingID)
+        try container.encode(methodTitle, forKey: .methodTitle)
+        try container.encode(methodID, forKey: .methodID)
+        try container.encode(total, forKey: .total)
+    }
+}
+
 
 /// Defines all of the Shipping Line CodingKeys
 ///

Networking/Networking/Remote/OrdersRemote.swift

@@ -147,6 +147,8 @@ public class OrdersRemote: Remote {
                         if let shippingAddress = order.shippingAddress {
                             params[Order.CodingKeys.shippingAddress.rawValue] = try shippingAddress.toDictionary()
                         }
+                    case .shippingLines:
+                        params[Order.CodingKeys.shippingLines.rawValue] = try order.shippingLines.compactMap { try $0.toDictionary() }
                     }
                 }
             }()
@@ -201,6 +203,9 @@ public class OrdersRemote: Remote {
                     case .fees:
                         let feesEncoded = try order.fees.map { try $0.toDictionary() }
                         params[Order.CodingKeys.feeLines.rawValue] = feesEncoded
+                    case .shippingLines:
+                        let shippingEncoded = try order.shippingLines.map { try $0.toDictionary() }
+                        params[Order.CodingKeys.shippingLines.rawValue] = shippingEncoded
                     }
                 }
             }()
@@ -269,10 +274,13 @@ public extension OrdersRemote {
         private static let commonOrderFieldValues = [
             "id", "parent_id", "number", "status", "currency", "customer_id", "customer_note", "date_created_gmt", "date_modified_gmt", "date_paid_gmt",
             "discount_total", "discount_tax", "shipping_total", "shipping_tax", "total", "total_tax", "payment_method", "payment_method_title",
-            "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines"
+            "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data"
         ]
+        // Use with caution. Any fields in here will be overwritten with empty values by
+        // `Order+ReadOnlyConvertible.swift: Order.update(with:)` when the list of orders is fetched.
+        // See p91TBi-7yL-p2 for discussion.
         private static let singleOrderExtraFieldValues = [
-            "line_items", "shipping", "meta_data"
+            "line_items", "shipping"
         ]
     }
 
@@ -283,6 +291,7 @@ public extension OrdersRemote {
         case shippingAddress
         case billingAddress
         case fees
+        case shippingLines
     }
 
     /// Order fields supported for create
@@ -293,5 +302,6 @@ public extension OrdersRemote {
         case items
         case billingAddress
         case shippingAddress
+        case shippingLines
     }
 }

Networking/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -211,6 +211,27 @@ final class OrdersRemoteTests: XCTestCase {
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
 
+    func test_update_order_properly_encodes_shipping_lines_for_removal_from_order() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let shipping = ShippingLine(shippingID: 333, methodTitle: "Shipping", methodID: nil, total: "1.23", totalTax: "", taxes: [])
+        let order = Order.fake().copy(shippingLines: [shipping])
+
+        // When
+        remote.updateOrder(from: 123, order: order, fields: [.shippingLines]) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["shipping_lines"] as? [[String: AnyHashable]]).first
+        let expected: [String: AnyHashable] = [
+            "id": shipping.shippingID,
+            "method_title": shipping.methodTitle,
+            "method_id": NSNull(),
+            "total": shipping.total
+        ]
+        assertEqual(received, expected)
+    }
+
 
     // MARK: - Load Order Notes Tests
 
@@ -264,6 +285,8 @@ final class OrdersRemoteTests: XCTestCase {
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
 
+    // MARK: - Create Order Tests
+
     func test_create_order_properly_encodes_fee_lines() throws {
         // Given
         let remote = OrdersRemote(network: network)
@@ -376,6 +399,27 @@ final class OrdersRemoteTests: XCTestCase {
         ]
         assertEqual(received2, expected2)
     }
+
+    func test_create_order_properly_encodes_shipping_lines() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let shipping = ShippingLine(shippingID: 333, methodTitle: "Shipping", methodID: "other", total: "1.23", totalTax: "", taxes: [])
+        let order = Order.fake().copy(shippingLines: [shipping])
+
+        // When
+        remote.createOrder(siteID: 123, order: order, fields: [.shippingLines]) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["shipping_lines"] as? [[String: AnyHashable]]).first
+        let expected: [String: AnyHashable] = [
+            "id": shipping.shippingID,
+            "method_title": shipping.methodTitle,
+            "method_id": shipping.methodID ?? "",
+            "total": shipping.total
+        ]
+        assertEqual(received, expected)
+    }
 }
 
 private extension OrdersRemoteTests {

Podfile

@@ -40,7 +40,7 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 1.42.0'
+  pod 'WordPressAuthenticator', '~> 1.43.1-beta'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -1,5 +1,4 @@
 PODS:
-  - 1PasswordExtension (1.8.6)
   - Alamofire (4.8.0)
   - AppAuth (1.4.0):
     - AppAuth/Core (= 1.4.0)
@@ -31,7 +30,7 @@ PODS:
   - GTMAppAuth (1.2.2):
     - AppAuth/Core (~> 1.4)
     - GTMSessionFetcher/Core (~> 1.5)
-  - GTMSessionFetcher/Core (1.6.1)
+  - GTMSessionFetcher/Core (1.7.0)
   - KeychainAccess (3.2.1)
   - Kingfisher (6.0.1)
   - lottie-ios (3.1.9)
@@ -49,8 +48,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (1.42.0):
-    - 1PasswordExtension (~> 1.8.6)
+  - WordPressAuthenticator (1.43.1-beta.1):
     - Alamofire (~> 4.8)
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
@@ -102,7 +100,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.5)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 1.42.0)
+  - WordPressAuthenticator (~> 1.43.1-beta)
   - WordPressKit (~> 4.40.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.4)
@@ -115,7 +113,6 @@ SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
   trunk:
-    - 1PasswordExtension
     - Alamofire
     - AppAuth
     - Automattic-Tracks-iOS
@@ -156,7 +153,6 @@ SPEC REPOS:
     - ZendeskSupportSDK
 
 SPEC CHECKSUMS:
-  1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   Automattic-Tracks-iOS: f5a6188ad8d00680748111466beabb0aea11f856
@@ -166,7 +162,7 @@ SPEC CHECKSUMS:
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
   Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
-  GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
+  GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
   KeychainAccess: d5470352939ced6d6f7fb51cb2e67aae51fc294f
   Kingfisher: adde87a4f74f6a3845395769354efff593581740
   lottie-ios: 3a3758ef5a008e762faec9c9d50a39842f26d124
@@ -181,7 +177,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: d0fee204f467dacf8808b7ac14ce43affeb271a5
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 06278534519c741ecea346f504ad8d08082bfb0d
+  WordPressAuthenticator: adba93ef31576dcc0f72b8c0a8dfbd1c4467de99
   WordPressKit: 062e4f57ce871e2217b632a1f3cb0bbd54b5df6d
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: 9e470758bc3a4a25e94478c2babe106f4ae7315a
@@ -197,6 +193,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 1f574942620ff65ec3156586545d528d7b4b26b9
+PODFILE CHECKSUM: 0872fc8f8ec57fd5d53d7ae0937cbc20a279bb8a
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 -----
 - [*] Orders: In the experimental Order Creation feature, product variations added to a new order now show a list of their attributes. [https://github.com/woocommerce/woocommerce-ios/pull/6131]
 - [*] Enlarged the tap area for the action button on the notice view. [https://github.com/woocommerce/woocommerce-ios/pull/6146]
+- [*] Reviews: Fixed crash on iPad when tapping the More button. [https://github.com/woocommerce/woocommerce-ios/pull/6187]
 
 8.5
 -----