Merge branch 'trunk' into issue/6204-remove-stripe-ipp-from-experimental

Author: allendav

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:
@@ -35,8 +37,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .myStoreTabUpdates:
             return true
-        case .couponManagement:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .couponView:
+            return true
         case .productSKUInputScanner:
             return true
         case .canadaInPersonPayments:

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
@@ -70,9 +74,9 @@ public enum FeatureFlag: Int {
     ///
     case myStoreTabUpdates
 
-    /// Displays the option to manage coupons
+    /// Displays the option to view coupons
     ///
-    case couponManagement
+    case couponView
 
     /// Barcode scanner for product SKU input
     ///

Fakes/Fakes/Networking.generated.swift

@@ -542,7 +542,7 @@ extension OrderStatusEnum {
     /// Returns a "ready to use" type filled with fake values.
     ///
     public static func fake() -> OrderStatusEnum {
-        .pending
+        .autoDraft
     }
 }
 extension OrderTaxLine {

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

@@ -334,7 +334,7 @@ extension Order {
 extension OrderFeeLine {
     public func copy(
         feeID: CopiableProp<Int64> = .copy,
-        name: CopiableProp<String> = .copy,
+        name: NullableCopiableProp<String> = .copy,
         taxClass: CopiableProp<String> = .copy,
         taxStatus: CopiableProp<OrderFeeTaxStatus> = .copy,
         total: CopiableProp<String> = .copy,
@@ -1468,6 +1468,33 @@ extension ShippingLabelPurchase {
     }
 }
 
+extension ShippingLine {
+    public func copy(
+        shippingID: CopiableProp<Int64> = .copy,
+        methodTitle: CopiableProp<String> = .copy,
+        methodID: NullableCopiableProp<String> = .copy,
+        total: CopiableProp<String> = .copy,
+        totalTax: CopiableProp<String> = .copy,
+        taxes: CopiableProp<[ShippingLineTax]> = .copy
+    ) -> ShippingLine {
+        let shippingID = shippingID ?? self.shippingID
+        let methodTitle = methodTitle ?? self.methodTitle
+        let methodID = methodID ?? self.methodID
+        let total = total ?? self.total
+        let totalTax = totalTax ?? self.totalTax
+        let taxes = taxes ?? self.taxes
+
+        return ShippingLine(
+            shippingID: shippingID,
+            methodTitle: methodTitle,
+            methodID: methodID,
+            total: total,
+            totalTax: totalTax,
+            taxes: taxes
+        )
+    }
+}
+
 extension Site {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Networking/Networking/Model/OrderFeeLine.swift

@@ -5,7 +5,13 @@ import Codegen
 ///
 public struct OrderFeeLine: Equatable, Codable, GeneratedFakeable, GeneratedCopiable {
     public let feeID: Int64
-    public let name: String
+
+    /// Fee Name
+    ///
+    /// Sending a null value to the REST API removes the Fee Line from the Order.
+    ///
+    public let name: String?
+
     public let taxClass: String
     public let taxStatus: OrderFeeTaxStatus
     public let total: String
@@ -16,7 +22,7 @@ public struct OrderFeeLine: Equatable, Codable, GeneratedFakeable, GeneratedCopi
     /// OrderFeeLine struct initializer.
     ///
     public init(feeID: Int64,
-                name: String,
+                name: String?,
                 taxClass: String,
                 taxStatus: OrderFeeTaxStatus,
                 total: String,

Networking/Networking/Model/OrderStatusEnum.swift

@@ -7,6 +7,7 @@ import Codegen
 /// and it is used to determine the user facing display order
 ///
 public enum OrderStatusEnum: Codable, Hashable, Comparable, GeneratedFakeable {
+    case autoDraft
     case pending
     case processing
     case onHold
@@ -25,6 +26,8 @@ extension OrderStatusEnum: RawRepresentable {
     ///
     public init(rawValue: String) {
         switch rawValue {
+        case Keys.autoDraft:
+            self = .autoDraft
         case Keys.pending:
             self = .pending
         case Keys.processing:
@@ -48,6 +51,7 @@ extension OrderStatusEnum: RawRepresentable {
     ///
     public var rawValue: String {
         switch self {
+        case .autoDraft:            return Keys.autoDraft
         case .pending:              return Keys.pending
         case .processing:           return Keys.processing
         case .onHold:               return Keys.onHold
@@ -64,6 +68,7 @@ extension OrderStatusEnum: RawRepresentable {
 /// Enum containing the 'Known' OrderStatus Keys
 ///
 private enum Keys {
+    static let autoDraft    = "auto-draft"
     static let pending      = "pending"
     static let processing   = "processing"
     static let onHold       = "on-hold"

Networking/Networking/Model/ShippingLine.swift

@@ -3,7 +3,7 @@ import Codegen
 
 /// Represents a Shipping Line Entity.
 ///
-public struct ShippingLine: Codable, Equatable, GeneratedFakeable {
+public struct ShippingLine: Codable, Equatable, GeneratedFakeable, GeneratedCopiable {
     public let shippingID: Int64
     public let methodTitle: String
 

Networking/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -232,6 +232,28 @@ final class OrdersRemoteTests: XCTestCase {
         assertEqual(received, expected)
     }
 
+    func test_update_order_properly_encodes_fee_lines_for_removal_from_order() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let fee = OrderFeeLine(feeID: 333, name: nil, taxClass: "", taxStatus: .none, total: "12.34", totalTax: "", taxes: [], attributes: [])
+        let order = Order.fake().copy(fees: [fee])
+
+        // When
+        remote.updateOrder(from: 123, order: order, fields: [.fees]) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["fee_lines"] as? [[String: AnyHashable]]).first
+        let expected: [String: AnyHashable] = [
+            "id": fee.feeID,
+            "name": NSNull(),
+            "tax_status": fee.taxStatus.rawValue,
+            "tax_class": fee.taxClass,
+            "total": fee.total
+        ]
+        assertEqual(expected, received)
+    }
+
 
     // MARK: - Load Order Notes Tests
 
@@ -301,7 +323,7 @@ final class OrdersRemoteTests: XCTestCase {
         let received = try XCTUnwrap(request.parameters["fee_lines"] as? [[String: AnyHashable]]).first
         let expected: [String: AnyHashable] = [
             "id": fee.feeID,
-            "name": fee.name,
+            "name": fee.name ?? "",
             "tax_status": fee.taxStatus.rawValue,
             "tax_class": fee.taxClass,
             "total": fee.total

RELEASE-NOTES.txt

@@ -2,10 +2,12 @@
 
 8.6
 -----
+- [***] Merchants can now view coupons in their stores by enabling Coupon Management in Experimental Features. [https://github.com/woocommerce/woocommerce-ios/pull/6209]
 - [*] 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]
 - [*] In-Person Payments: Remove Stripe from Experimental Features as it is always enabled now. [https://github.com/woocommerce/woocommerce-ios/pull/6205]
+- [*] Disabled unneccesary selection of the "Refund via" row on the Refund Confirmation screen [https://github.com/woocommerce/woocommerce-ios/pull/6198]
 
 8.5
 -----