Merge branch 'trunk' into merge/8.3-final-into-trunk

Author: jkmassel

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -24,11 +24,11 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .orderListFilters:
             return true
         case .jetpackConnectionPackageSupport:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .orderCreation:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .hubMenu:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .systemStatusReport:
             return true
         case .stripeExtensionInPersonPayments:
@@ -39,6 +39,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .productSKUInputScanner:
             return true
+        case .taxLinesInSimplePayments:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -77,4 +77,8 @@ public enum FeatureFlag: Int {
     /// Barcode scanner for product SKU input
     ///
     case productSKUInputScanner
+
+    /// Displays the tax lines breakup in simple payments summary screen
+    ///
+    case taxLinesInSimplePayments
 }

Fakes/Fakes/Networking.generated.swift

@@ -159,6 +159,17 @@ extension Coupon.DiscountType {
         .percent
     }
 }
+extension CouponReport {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> CouponReport {
+        .init(
+            couponID: .fake(),
+            amount: .fake(),
+            ordersCount: .fake()
+        )
+    }
+}
 extension CreateProductVariation {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -300,7 +311,8 @@ extension Order {
             shippingLines: .fake(),
             coupons: .fake(),
             refunds: .fake(),
-            fees: .fake()
+            fees: .fake(),
+            taxes: .fake()
         )
     }
 }
@@ -500,6 +512,23 @@ extension OrderStatusEnum {
         .pending
     }
 }
+extension OrderTaxLine {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> OrderTaxLine {
+        .init(
+            taxID: .fake(),
+            rateCode: .fake(),
+            rateID: .fake(),
+            label: .fake(),
+            isCompoundTaxRate: .fake(),
+            totalTax: .fake(),
+            totalShippingTax: .fake(),
+            ratePercent: .fake(),
+            attributes: .fake()
+        )
+    }
+}
 extension PaymentGateway {
     /// Returns a "ready to use" type filled with fake values.
     ///

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -306,7 +306,6 @@ extension StripeCardReaderService: CardReaderService {
                     promise(.failure(CardReaderServiceError.connection()))
                     return
                 }
-
                 // Clear cached readers, as per Stripe's documentation.
                 self.discoveredStripeReadersCache.clear()
 

Networking/Networking.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@ struct CouponListMapper: Mapper {
         let coupons = try Coupon.decoder.decode(CouponListEnvelope.self, from: response).coupons
         return coupons
             .map { $0.copy(siteID: siteID) }
-            .filter { $0.mappedDiscountType != nil }
+            .filter { $0.discountType != .other }
     }
 }
 

Networking/Networking/Mapper/CouponListMapper.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+/// Mapper: `CouponReport`
+///
+struct CouponReportListMapper: Mapper {
+
+    /// (Attempts) to convert a dictionary into `[CouponReport]`.
+    ///
+    func map(response: Data) throws -> [CouponReport] {
+        let decoder = JSONDecoder()
+        let reports = try decoder.decode(CouponReportsEnvelope.self, from: response).reports
+        return reports
+    }
+}
+
+
+/// CouponReportsEnvelope Disposable Entity:
+/// Load Coupon endpoint returns the coupon in the `data` key.
+/// This entity allows us to parse all the things with JSONDecoder.
+///
+private struct CouponReportsEnvelope: Decodable {
+    let reports: [CouponReport]
+
+    private enum CodingKeys: String, CodingKey {
+        case reports = "data"
+    }
+}

Networking/Networking/Mapper/CouponReportListMapper.swift

@@ -2,14 +2,14 @@ import Foundation
 
 /// Mapper: WCPay Customer
 ///
-struct WCPayCustomerMapper: Mapper {
+struct CustomerMapper: Mapper {
 
     /// (Attempts) to convert a dictionary into a customer.
     ///
-    func map(response: Data) throws -> WCPayCustomer {
+    func map(response: Data) throws -> Customer {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(WCPayCustomerEnvelope.self, from: response).customer
+        return try decoder.decode(CustomerEnvelope.self, from: response).customer
     }
 }
 
@@ -18,8 +18,8 @@ struct WCPayCustomerMapper: Mapper {
 /// Endpoint returns the customer in the `data` key. This entity
 /// allows us to parse it with JSONDecoder.
 ///
-private struct WCPayCustomerEnvelope: Decodable {
-    let customer: WCPayCustomer
+private struct CustomerEnvelope: Decodable {
+    let customer: Customer
 
     private enum CodingKeys: String, CodingKey {
         case customer = "data"

Networking/Networking/Mapper/WCPayCustomerMapper.swift renamed to Networking/Networking/Mapper/CustomerMapper.swift

@@ -2,11 +2,11 @@ import Foundation
 
 /// Mapper: WCPay Payment Intent
 ///
-struct WCPayPaymentIntentMapper: Mapper {
+struct RemotePaymentIntentMapper: Mapper {
 
     /// (Attempts) to convert a dictionary into an payment intent.
     ///
-    func map(response: Data) throws -> WCPayPaymentIntent {
+    func map(response: Data) throws -> RemotePaymentIntent {
         let decoder = JSONDecoder()
 
         return try decoder.decode(WCPayPaymentIntentEnvelope.self, from: response).paymentIntent
@@ -19,7 +19,7 @@ struct WCPayPaymentIntentMapper: Mapper {
 /// allows us to parse it with JSONDecoder.
 ///
 private struct WCPayPaymentIntentEnvelope: Decodable {
-    let paymentIntent: WCPayPaymentIntent
+    let paymentIntent: RemotePaymentIntent
 
     private enum CodingKeys: String, CodingKey {
         case paymentIntent = "data"

Networking/Networking/Mapper/WCPayPaymentIntentMapper.swift renamed to Networking/Networking/Mapper/RemotePaymentIntentMapper.swift

@@ -2,14 +2,14 @@ import Foundation
 
 /// Mapper: WCPay Reader Location
 ///
-struct WCPayReaderLocationMapper: Mapper {
+struct RemoteReaderLocationMapper: Mapper {
 
     /// (Attempts) to convert a dictionary into a location.
     ///
-    func map(response: Data) throws -> WCPayReaderLocation {
+    func map(response: Data) throws -> RemoteReaderLocation {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(WCPayReaderLocationEnvelope.self, from: response).location
+        return try decoder.decode(RemoteReaderLocationEnvelope.self, from: response).location
     }
 }
 
@@ -18,8 +18,8 @@ struct WCPayReaderLocationMapper: Mapper {
 /// Endpoint returns the location in the `data` key. This entity
 /// allows us to parse it with JSONDecoder.
 ///
-private struct WCPayReaderLocationEnvelope: Decodable {
-    let location: WCPayReaderLocation
+private struct RemoteReaderLocationEnvelope: Decodable {
+    let location: RemoteReaderLocation
 
     private enum CodingKeys: String, CodingKey {
         case location = "data"