Merge branch 'trunk' into issue/7468-no-stores-site-discovery

Author: itsmeichigo

CHANGELOG.md

@@ -0,0 +1,6 @@
+<!--
+Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
+-->
+
+## 9.9
+This release has a few improvements to your login experience, including the option to use your `wp-admin` site credentials and magic link option to login. Please continue to send us feedback – we are listening!

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -49,14 +49,14 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .loginErrorNotifications:
             return true
-        case .paymentsHubMenuSection:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .loginPrologueOnboardingSurvey:
             return true
         case .loginMagicLinkEmphasis:
             return true
         case .loginMagicLinkEmphasisM2:
             return true
+        case .promptToEnableCodInIppOnboarding:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -102,10 +102,6 @@ public enum FeatureFlag: Int {
     ///
     case loginErrorNotifications
 
-    /// Payments Section in the Hub Menu
-    ///
-    case paymentsHubMenuSection
-
     /// Whether to show a survey at the end of the login onboarding screen after feature carousel
     ///
     case loginPrologueOnboardingSurvey
@@ -117,4 +113,8 @@ public enum FeatureFlag: Int {
     /// Whether to show the magic link as a secondary button instead of a table view cell on the password screen
     ///
     case loginMagicLinkEmphasisM2
+
+    /// Whether to include the Cash on Delivery enable step in In-Person Payment onboarding
+    ///
+    case promptToEnableCodInIppOnboarding
 }

Hardware/Hardware/CardReader/CardReaderType.swift

@@ -1,6 +1,6 @@
 /// Card reader type. Indicates if a reader is meant to be used
 /// handheld or as a countertop device
-public enum CardReaderType {
+public enum CardReaderType: CaseIterable {
     /// Chipper
     case chipper
     /// Stripe M2

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

@@ -658,6 +658,33 @@ extension OrderTaxLine {
     }
 }
 
+extension PaymentGateway {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        gatewayID: CopiableProp<String> = .copy,
+        title: CopiableProp<String> = .copy,
+        description: CopiableProp<String> = .copy,
+        enabled: CopiableProp<Bool> = .copy,
+        features: CopiableProp<[PaymentGateway.Feature]> = .copy
+    ) -> PaymentGateway {
+        let siteID = siteID ?? self.siteID
+        let gatewayID = gatewayID ?? self.gatewayID
+        let title = title ?? self.title
+        let description = description ?? self.description
+        let enabled = enabled ?? self.enabled
+        let features = features ?? self.features
+
+        return PaymentGateway(
+            siteID: siteID,
+            gatewayID: gatewayID,
+            title: title,
+            description: description,
+            enabled: enabled,
+            features: features
+        )
+    }
+}
+
 extension PaymentGatewayAccount {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Networking/Networking/Model/Order.swift

@@ -75,7 +75,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
                 paymentMethodTitle: String,
                 paymentURL: URL?,
                 chargeID: String?,
-                items: [OrderItem]?,
+                items: [OrderItem],
                 billingAddress: Address?,
                 shippingAddress: Address?,
                 shippingLines: [ShippingLine],
@@ -114,7 +114,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
         self.paymentURL = paymentURL
         self.chargeID = chargeID
 
-        self.items = items ?? []
+        self.items = items
         self.billingAddress = billingAddress
         self.shippingAddress = shippingAddress
         self.shippingLines = shippingLines
@@ -166,7 +166,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
         var chargeID: String? = nil
         chargeID = allOrderMetaData?.first(where: { $0.key == "_charge_id" })?.value
 
-        let items = try? container.decodeIfPresent([OrderItem].self, forKey: .items) ?? []
+        let items = try container.decode([OrderItem].self, forKey: .items)
 
         var shippingAddress = try? container.decode(Address.self, forKey: .shippingAddress)
         // In WooCommerce <5.6.0, the shipping phone number can be stored in the order metadata

Networking/Networking/Model/PaymentGateway.swift

@@ -3,7 +3,7 @@ import Codegen
 
 /// Represents a Payment Gateway.
 ///
-public struct PaymentGateway: Equatable, GeneratedFakeable {
+public struct PaymentGateway: Equatable, GeneratedFakeable, GeneratedCopiable {
 
     /// Features for payment gateway.
     ///

Networking/Networking/Remote/OrdersRemote.swift

@@ -288,20 +288,20 @@ public extension OrdersRemote {
     }
 
     enum ParameterValues {
-        // Same as singleOrderFieldValues except we exclude the line_items and shipping fields
+        // Same as singleOrderFieldValues except we exclude the shipping field
         static let listFieldValues: String = commonOrderFieldValues.joined(separator: ",")
         static let singleOrderFieldValues: String = (commonOrderFieldValues + singleOrderExtraFieldValues).joined(separator: ",")
         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",
-            "payment_url", "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data", "is_editable",
-            "needs_payment", "needs_processing"
+            "payment_url", "line_items", "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data",
+            "is_editable", "needs_payment", "needs_processing"
         ]
         // 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"
+            "shipping"
         ]
     }
 

RELEASE-NOTES.txt

@@ -2,9 +2,11 @@
 
 10.0
 -----
-- [*] Login: New button added to the empty site picker screen to enter a site address for troubleshooting. [https://github.com/woocommerce/woocommerce-ios/pull/7484]
+- [**] In-Person Payments and Simple Payments have been moved to a new Payments section [https://github.com/woocommerce/woocommerce-ios/pull/7473]
 - [*] Login: on the WP.com password screen, the magic link login option is moved from below "Reset your password" to below the primary Continue button for higher visibility. [https://github.com/woocommerce/woocommerce-ios/pull/7469]
 - [*] Login: some minor enhancements are made to the error screen after entering an invalid WP.com email - a new "What is WordPress.com?" link, hiding the "Log in with store address" button when it's from the store address login flow, and some copy changes. [https://github.com/woocommerce/woocommerce-ios/pull/7485]
+- [**] In-Person Payments: Accounts with pending requirements are no longer blocked from taking payments - we have added a skip button to the relevant screen. [https://github.com/woocommerce/woocommerce-ios/pull/7504]
+- [*] Login: New button added to the empty site picker screen to enter a site address for troubleshooting. [https://github.com/woocommerce/woocommerce-ios/pull/7484]
 
 9.9
 -----

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

@@ -60,18 +60,21 @@ extension GeneralStoreSettings {
         isTelemetryAvailable: CopiableProp<Bool> = .copy,
         telemetryLastReportedTime: NullableCopiableProp<Date> = .copy,
         areSimplePaymentTaxesEnabled: CopiableProp<Bool> = .copy,
-        preferredInPersonPaymentGateway: NullableCopiableProp<String> = .copy
+        preferredInPersonPaymentGateway: NullableCopiableProp<String> = .copy,
+        skippedCodOnboardingStep: CopiableProp<Bool> = .copy
     ) -> GeneralStoreSettings {
         let isTelemetryAvailable = isTelemetryAvailable ?? self.isTelemetryAvailable
         let telemetryLastReportedTime = telemetryLastReportedTime ?? self.telemetryLastReportedTime
         let areSimplePaymentTaxesEnabled = areSimplePaymentTaxesEnabled ?? self.areSimplePaymentTaxesEnabled
         let preferredInPersonPaymentGateway = preferredInPersonPaymentGateway ?? self.preferredInPersonPaymentGateway
+        let skippedCodOnboardingStep = skippedCodOnboardingStep ?? self.skippedCodOnboardingStep
 
         return GeneralStoreSettings(
             isTelemetryAvailable: isTelemetryAvailable,
             telemetryLastReportedTime: telemetryLastReportedTime,
             areSimplePaymentTaxesEnabled: areSimplePaymentTaxesEnabled,
-            preferredInPersonPaymentGateway: preferredInPersonPaymentGateway
+            preferredInPersonPaymentGateway: preferredInPersonPaymentGateway,
+            skippedCodOnboardingStep: skippedCodOnboardingStep
         )
     }
 }