Merge branch 'trunk' into feat/8558-domain-list

* trunk: (79 commits)
  Updated copyright year
  Bump version number
  Update metadata translations
  Update app translations – `Localizable.strings`
  Correct title in the Payments Menu
  Fix bug where variation count was duplicated
  Update EditAttributesViewModel.swift
  8627 Add manual link fixes to the 11.9 release
  8627 Update card reader manual URLs
  8622 8621 Add metadata to payment intent for TTPoI
  Update documentation for Today and `to date` ranges
  Adjust formatting operations for date ranges
  Remove commented code
  Adds changelog
  Removes genereateAllVariation feature flag
  Fix contentEdgeInsets deprecation warnings
  Show action sheet/popover with bulk edit options
  Improve string descriptions
  Add disabled state for link button style
  Enabled bulk edit button conditionally
  ...

Author: jaclync

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -60,8 +60,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .applicationPasswordAuthenticationForSiteCredentialLogin:
             // Enable this to test application password authentication (WIP)
             return false
-        case .generateAllVariations:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .productsBulkEditing:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .domainSettings:

Experiments/Experiments/FeatureFlag.swift

@@ -142,10 +142,6 @@ public enum FeatureFlag: Int {
     ///
     case applicationPasswordAuthenticationForSiteCredentialLogin
 
-    /// Allows merchants to create all variations from a single button
-    ///
-    case generateAllVariations
-
     /// Bulk editing of status and price in products list
     ///
     case productsBulkEditing

Hardware/Hardware/CardReader/CardReaderService.swift

@@ -18,6 +18,12 @@ public protocol CardReaderService {
 
     // MARK: - Commands
 
+    /// Checks for support of a given reader type and discovery method combination. Does not start discovery.
+    ///
+    func checkSupport(for cardReaderType: CardReaderType,
+                      configProvider: CardReaderConfigProvider,
+                      discoveryMethod: CardReaderDiscoveryMethod) -> Bool
+
     /// Starts the service.
     /// That could imply, for example, that the reader discovery process starts
     func start(_ configProvider: CardReaderConfigProvider, discoveryMethod: CardReaderDiscoveryMethod) throws

Hardware/Hardware/CardReader/CardReaderType.swift

@@ -29,7 +29,7 @@ extension CardReaderType {
         case .wisepad3:
             return "WISEPAD_3"
         case .appleBuiltIn:
-            return "BUILT_IN"
+            return "COTS_DEVICE"
         default:
             return "UNKNOWN"
         }

Hardware/Hardware/CardReader/StripeCardReader/CardReaderType+Stripe.swift

@@ -19,5 +19,20 @@ extension CardReaderType {
             return .other
         }
     }
+
+    func toStripe() -> DeviceType? {
+        switch self {
+        case .chipper:
+            return .chipper2X
+        case .stripeM2:
+            return .stripeM2
+        case .wisepad3:
+            return .wisePad3
+        case .appleBuiltIn:
+            return .appleBuiltIn
+        case .other:
+            return nil
+        }
+    }
 }
 #endif

Hardware/Hardware/CardReader/StripeCardReader/NoOpCardReaderService.swift

@@ -1,5 +1,5 @@
 import Combine
-/// The adapter wrapping the Stripe Terminal SDK
+/// A no-op replacement for the adapter wrapping the Stripe Terminal SDK
 public struct NoOpCardReaderService: CardReaderService {
     // MARK: - Queries
     /// The publisher that emits the list of discovered readers whenever the service discovers a new reader.
@@ -18,6 +18,12 @@ public struct NoOpCardReaderService: CardReaderService {
     public init() {}
     // MARK: - Commands
 
+    public func checkSupport(for cardReaderType: CardReaderType,
+                             configProvider: CardReaderConfigProvider,
+                             discoveryMethod: CardReaderDiscoveryMethod) -> Bool {
+        return false
+    }
+
     /// Starts the service.
     /// That could imply, for example, that the reader discovery process starts
     public func start(_ configProvider: CardReaderConfigProvider, discoveryMethod: CardReaderDiscoveryMethod) throws {

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -62,8 +62,27 @@ extension StripeCardReaderService: CardReaderService {
 
     // MARK: - CardReaderService conformance. Commands
 
-    public func start(_ configProvider: CardReaderConfigProvider,
-                      discoveryMethod: CardReaderDiscoveryMethod) throws {
+    public func checkSupport(for cardReaderType: CardReaderType,
+                             configProvider: CardReaderConfigProvider,
+                             discoveryMethod: CardReaderDiscoveryMethod) -> Bool {
+        guard let deviceType = cardReaderType.toStripe() else {
+            return false
+        }
+
+        prepare(using: configProvider)
+
+        let result = Terminal.shared.supportsReaders(of: deviceType,
+                                                     discoveryMethod: discoveryMethod.toStripe(),
+                                                     simulated: shouldUseSimulatedCardReader)
+        switch result {
+        case .success:
+            return true
+        case .failure:
+            return false
+        }
+    }
+
+    func prepare(using configProvider: CardReaderConfigProvider) {
         setConfigProvider(configProvider)
 
         Terminal.setLogListener {  message in
@@ -75,6 +94,11 @@ extension StripeCardReaderService: CardReaderService {
             DDLogDebug("💳 [StripeTerminal] \(message)")
         }
         Terminal.shared.logLevel = terminalLogLevel
+    }
+
+    public func start(_ configProvider: CardReaderConfigProvider,
+                      discoveryMethod: CardReaderDiscoveryMethod) throws {
+        prepare(using: configProvider)
 
         if shouldUseSimulatedCardReader {
             // You can test with different reader software update scenarios.
@@ -487,6 +511,7 @@ private extension StripeCardReaderService {
             ///
             parameters.metadata?[Constants.readerIDMetadataKey] = self?.readerIDForIntent()
             parameters.metadata?[Constants.readerModelMetadataKey] = self?.readerModelForIntent()
+            parameters.metadata?[Constants.platformMetadataKey] = Constants.platform
 
             Terminal.shared.createPaymentIntent(parameters) { (intent, error) in
                 if let error = error {
@@ -897,6 +922,8 @@ private extension StripeCardReaderService {
         ///
         static let readerIDMetadataKey = "reader_ID"
         static let readerModelMetadataKey = "reader_model"
+        static let platformMetadataKey = "platform"
+        static let platform = "ios"
     }
 }
 

Networking/Networking.xcodeproj/project.pbxproj

@@ -464,7 +464,9 @@
 		93D8BBFF226BC1DA00AD2EB3 /* me-settings.json in Resources */ = {isa = PBXBuildFile; fileRef = 93D8BBFE226BC1DA00AD2EB3 /* me-settings.json */; };
 		93D8BC01226BC20600AD2EB3 /* AccountSettingsRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D8BC00226BC20600AD2EB3 /* AccountSettingsRemoteTests.swift */; };
 		A69FE19D2588D70E0059A96B /* order-with-deleted-refunds.json in Resources */ = {isa = PBXBuildFile; fileRef = A69FE19C2588D70E0059A96B /* order-with-deleted-refunds.json */; };
+		AE1950F3296DB2C2004D37D2 /* ProductsBulkUpdateMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1950F2296DB2C2004D37D2 /* ProductsBulkUpdateMapper.swift */; };
 		AE2D6623272A8F6E004A2C3A /* TelemetryRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2D6622272A8F6E004A2C3A /* TelemetryRemoteTests.swift */; };
+		AEA056E4296DBA6E00948D52 /* products-batch-update.json in Resources */ = {isa = PBXBuildFile; fileRef = AEA056E3296DBA6E00948D52 /* products-batch-update.json */; };
 		AED8AEBA272A97B400663FCC /* null-data.json in Resources */ = {isa = PBXBuildFile; fileRef = AE2D6624272A941C004A2C3A /* null-data.json */; };
 		AED8AEBC272A997500663FCC /* IgnoringResponseMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED8AEBB272A997500663FCC /* IgnoringResponseMapperTests.swift */; };
 		AEF94585272974F2001DCCFB /* TelemetryRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEF94584272974F2001DCCFB /* TelemetryRemote.swift */; };
@@ -1278,8 +1280,10 @@
 		93D8BC00226BC20600AD2EB3 /* AccountSettingsRemoteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsRemoteTests.swift; sourceTree = "<group>"; };
 		9BD9C6C44CAC220B3C3B90B7 /* Pods-Networking.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Networking.release-alpha.xcconfig"; path = "../Pods/Target Support Files/Pods-Networking/Pods-Networking.release-alpha.xcconfig"; sourceTree = "<group>"; };
 		A69FE19C2588D70E0059A96B /* order-with-deleted-refunds.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "order-with-deleted-refunds.json"; sourceTree = "<group>"; };
+		AE1950F2296DB2C2004D37D2 /* ProductsBulkUpdateMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductsBulkUpdateMapper.swift; sourceTree = "<group>"; };
 		AE2D6622272A8F6E004A2C3A /* TelemetryRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TelemetryRemoteTests.swift; sourceTree = "<group>"; };
 		AE2D6624272A941C004A2C3A /* null-data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "null-data.json"; sourceTree = "<group>"; };
+		AEA056E3296DBA6E00948D52 /* products-batch-update.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "products-batch-update.json"; sourceTree = "<group>"; };
 		AED8AEBB272A997500663FCC /* IgnoringResponseMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IgnoringResponseMapperTests.swift; sourceTree = "<group>"; };
 		AEF94584272974F2001DCCFB /* TelemetryRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TelemetryRemote.swift; sourceTree = "<group>"; };
 		AEF9458A27297FF6001DCCFB /* IgnoringResponseMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IgnoringResponseMapper.swift; sourceTree = "<group>"; };
@@ -2283,6 +2287,7 @@
 				025CA2C7238F4FF400B05C81 /* product-shipping-classes-load-all.json */,
 				020220E123966CD900290165 /* product-shipping-classes-load-one.json */,
 				457FC68B2382B2FD00B41B02 /* product-update.json */,
+				AEA056E3296DBA6E00948D52 /* products-batch-update.json */,
 				45152818257A84A60076B03C /* product-attributes-all.json */,
 				4515281E257A89B90076B03C /* product-attribute-create.json */,
 				45152824257A8B740076B03C /* product-attribute-update.json */,
@@ -2463,6 +2468,7 @@
 				26731336255ACA850026F7EF /* PaymentGatewayListMapper.swift */,
 				0313651828AE559D00EEE571 /* PaymentGatewayMapper.swift */,
 				74749B96224134FF005C4CF2 /* ProductMapper.swift */,
+				AE1950F2296DB2C2004D37D2 /* ProductsBulkUpdateMapper.swift */,
 				45152810257A81730076B03C /* ProductAttributeMapper.swift */,
 				4515280C257A7EEC0076B03C /* ProductAttributeListMapper.swift */,
 				26B6453F259BCDFE00EF3FB3 /* ProductAttributeTermMapper.swift */,
@@ -2970,6 +2976,7 @@
 				02EF1672292F0D1900D90AD6 /* load-plan-success.json in Resources */,
 				DEA6B1C6296C13FB005AA5E9 /* payment-gateway-list-without-data.json in Resources */,
 				2685C0DE263B5A4200D9EE97 /* add-on-groups.json in Resources */,
+				AEA056E4296DBA6E00948D52 /* products-batch-update.json in Resources */,
 				DEC51A9B274E3206009F3DF4 /* plugin-inactive.json in Resources */,
 				CCF48B382628AEAE0034EA83 /* shipping-label-account-settings-no-payment-methods.json in Resources */,
 				31A451D327863A2E00FE81AA /* stripe-account-complete.json in Resources */,
@@ -3512,6 +3519,7 @@
 				021EAA5625493B3600AA8CCD /* OrderItemAttribute.swift in Sources */,
 				77CE40602514CB3E003FF69D /* ProductDownloadDragAndDrop.swift in Sources */,
 				2685C0FE263B5D8900D9EE97 /* AddOnGroupRemote.swift in Sources */,
+				AE1950F3296DB2C2004D37D2 /* ProductsBulkUpdateMapper.swift in Sources */,
 				450106912399B2C800E24722 /* TaxClassListMapper.swift in Sources */,
 				B963A5CC2853870000EFADA0 /* OrderItemRefundMetaData.swift in Sources */,
 				E18152BE28F85B5B0011A0EC /* InAppPurchasesRemote.swift in Sources */,

Networking/Networking/Extensions/DateFormatter+Woo.swift

@@ -107,7 +107,7 @@ public extension DateFormatter {
         /// Date formatter used for creating the properly-formatted date range info. Typically
         /// used when setting the end date on `AnalyticsHubTimeRangeGenerator`.
         ///
-        public static func createAnalyticsHubDayMonthYearFormatter(timezone: TimeZone) -> DateFormatter {
+        public static func createDayMonthYearFormatter(timezone: TimeZone) -> DateFormatter {
             let formatter = DateFormatter()
             formatter.timeZone = timezone
             formatter.dateFormat = "MMM d, yyyy"
@@ -117,7 +117,7 @@ public extension DateFormatter {
         /// Date formatter used for creating the properly-formatted date range info. Typically
         /// used when setting the end date of a same-month range on `AnalyticsHubTimeRangeGenerator`.
         ///
-        public static func createAnalyticsHubDayYearFormatter(timezone: TimeZone) -> DateFormatter {
+        public static func createDayYearFormatter(timezone: TimeZone) -> DateFormatter {
             let formatter = DateFormatter()
             formatter.timeZone = timezone
             formatter.dateFormat = "d, yyyy"
@@ -127,7 +127,7 @@ public extension DateFormatter {
         /// Date formatter used for creating the properly-formatted date range info. Typically
         /// used when setting the start date on `AnalyticsHubTimeRangeGenerator`.
         ///
-        public static func createAnalyticsHubDayMonthFormatter(timezone: TimeZone) -> DateFormatter {
+        public static func createDayMonthFormatter(timezone: TimeZone) -> DateFormatter {
             let formatter = DateFormatter()
             formatter.timeZone = timezone
             formatter.dateFormat = "MMM d"

Networking/Networking/Mapper/ProductsBulkUpdateMapper.swift

@@ -0,0 +1,43 @@
+import Foundation
+
+/// Mapper: ProductsBulkUpdateMapper
+///
+struct ProductsBulkUpdateMapper: Mapper {
+    /// Site Identifier associated to the products that will be parsed.
+    ///
+    /// We're injecting this field via `JSONDecoder.userInfo` because SiteID is not returned in any of the Product Endpoints.
+    ///
+    let siteID: Int64
+
+    /// (Attempts) to convert a dictionary into Products.
+    ///
+    func map(response: Data) throws -> [Product] {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+        return try decoder.decode(ProductsEnvelope.self, from: response).updatedProducts
+    }
+}
+
+/// ProductsEnvelope Disposable Entity
+///
+/// `products/batch` endpoint returns the requested updated products in a `update` key, nested in a `data` key.
+/// This entity allows us to do parse all the things with JSONDecoder.
+///
+private struct ProductsEnvelope: Decodable {
+    let updatedProducts: [Product]
+
+    private enum CodingKeys: String, CodingKey {
+        case update
+        case data
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+        updatedProducts = try nestedContainer.decode([Product].self, forKey: .update)
+    }
+}