Rename Quick Order to Simple Payments

Author: Ecarrion

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -21,7 +21,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pushNotificationsForAllStores:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .quickOrderPrototype:
+        case .simplePaymentsPrototype:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .orderListFilters:
             return buildConfig == .localDeveloper || buildConfig == .alpha

Experiments/Experiments/FeatureFlag.swift

@@ -42,9 +42,9 @@ public enum FeatureFlag: Int {
     ///
     case pushNotificationsForAllStores
 
-    /// Allows to create quick order orders
+    /// Allows to create simple payments orders
     ///
-    case quickOrderPrototype
+    case simplePaymentsPrototype
 
     /// Display the bar for displaying the filters in the Order List
     ///

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

@@ -9,22 +9,22 @@ extension GeneralAppSettings {
         installationDate: NullableCopiableProp<Date> = .copy,
         feedbacks: CopiableProp<[FeedbackType: FeedbackSettings]> = .copy,
         isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
-        isQuickOrderSwitchEnabled: CopiableProp<Bool> = .copy,
+        isSimplePaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         knownCardReaders: CopiableProp<[String]> = .copy,
         lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy
     ) -> GeneralAppSettings {
         let installationDate = installationDate ?? self.installationDate
         let feedbacks = feedbacks ?? self.feedbacks
         let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
-        let isQuickOrderSwitchEnabled = isQuickOrderSwitchEnabled ?? self.isQuickOrderSwitchEnabled
+        let isSimplePaymentsSwitchEnabled = isSimplePaymentsSwitchEnabled ?? self.isSimplePaymentsSwitchEnabled
         let knownCardReaders = knownCardReaders ?? self.knownCardReaders
         let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
 
         return GeneralAppSettings(
             installationDate: installationDate,
             feedbacks: feedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
-            isQuickOrderSwitchEnabled: isQuickOrderSwitchEnabled,
+            isSimplePaymentsSwitchEnabled: isSimplePaymentsSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )

Storage/Storage/Model/GeneralAppSettings.swift

@@ -24,9 +24,9 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public let isViewAddOnsSwitchEnabled: Bool
 
-    /// The state(`true` or `false`) for the Quick Order feature switch.
+    /// The state(`true` or `false`) for the Simple Payments feature switch.
     ///
-    public let isQuickOrderSwitchEnabled: Bool
+    public let isSimplePaymentsSwitchEnabled: Bool
 
     /// A list (possibly empty) of known card reader IDs - i.e. IDs of card readers that should be reconnected to automatically
     /// e.g. ["CHB204909005931"]
@@ -40,13 +40,13 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     public init(installationDate: Date?,
                 feedbacks: [FeedbackType: FeedbackSettings],
                 isViewAddOnsSwitchEnabled: Bool,
-                isQuickOrderSwitchEnabled: Bool,
+                isSimplePaymentsSwitchEnabled: Bool,
                 knownCardReaders: [String],
                 lastEligibilityErrorInfo: EligibilityErrorInfo? = nil) {
         self.installationDate = installationDate
         self.feedbacks = feedbacks
         self.isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled
-        self.isQuickOrderSwitchEnabled = isQuickOrderSwitchEnabled
+        self.isSimplePaymentsSwitchEnabled = isSimplePaymentsSwitchEnabled
         self.knownCardReaders = knownCardReaders
         self.lastEligibilityErrorInfo = lastEligibilityErrorInfo
     }
@@ -72,7 +72,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             installationDate: installationDate,
             feedbacks: updatedFeedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
-            isQuickOrderSwitchEnabled: isQuickOrderSwitchEnabled,
+            isSimplePaymentsSwitchEnabled: isSimplePaymentsSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo
         )
@@ -89,7 +89,7 @@ extension GeneralAppSettings {
         self.installationDate = try container.decodeIfPresent(Date.self, forKey: .installationDate)
         self.feedbacks = try container.decodeIfPresent([FeedbackType: FeedbackSettings].self, forKey: .feedbacks) ?? [:]
         self.isViewAddOnsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isViewAddOnsSwitchEnabled) ?? false
-        self.isQuickOrderSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isQuickOrderSwitchEnabled) ?? false
+        self.isSimplePaymentsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isSimplePaymentsSwitchEnabled) ?? false
         self.knownCardReaders = try container.decodeIfPresent([String].self, forKey: .knownCardReaders) ?? []
         self.lastEligibilityErrorInfo = try container.decodeIfPresent(EligibilityErrorInfo.self, forKey: .lastEligibilityErrorInfo)
 

Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift

@@ -9,7 +9,7 @@ class GeneralAppSettingsTests: XCTestCase {
         let settings = GeneralAppSettings(installationDate: nil,
                                           feedbacks: [.general: feedback],
                                           isViewAddOnsSwitchEnabled: false,
-                                          isQuickOrderSwitchEnabled: false,
+                                          isSimplePaymentsSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -24,7 +24,7 @@ class GeneralAppSettingsTests: XCTestCase {
         let settings = GeneralAppSettings(installationDate: nil,
                                           feedbacks: [:],
                                           isViewAddOnsSwitchEnabled: false,
-                                          isQuickOrderSwitchEnabled: false,
+                                          isSimplePaymentsSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -41,7 +41,7 @@ class GeneralAppSettingsTests: XCTestCase {
             installationDate: nil,
             feedbacks: [.general: existingFeedback],
             isViewAddOnsSwitchEnabled: false,
-            isQuickOrderSwitchEnabled: false,
+            isSimplePaymentsSwitchEnabled: false,
             knownCardReaders: []
         )
 
@@ -58,7 +58,7 @@ class GeneralAppSettingsTests: XCTestCase {
         let settings = GeneralAppSettings(installationDate: nil,
                                           feedbacks: [:],
                                           isViewAddOnsSwitchEnabled: false,
-                                          isQuickOrderSwitchEnabled: false,
+                                          isSimplePaymentsSwitchEnabled: false,
                                           knownCardReaders: [])
 
         // When
@@ -78,7 +78,7 @@ class GeneralAppSettingsTests: XCTestCase {
         let previousSettings = GeneralAppSettings(installationDate: currentDate,
                                                   feedbacks: feedbackSettings,
                                                   isViewAddOnsSwitchEnabled: true,
-                                                  isQuickOrderSwitchEnabled: true,
+                                                  isSimplePaymentsSwitchEnabled: true,
                                                   knownCardReaders: readers,
                                                   lastEligibilityErrorInfo: eligibilityInfo)
 
@@ -96,6 +96,6 @@ class GeneralAppSettingsTests: XCTestCase {
         assertEqual(newSettings.knownCardReaders, readers)
         assertEqual(newSettings.lastEligibilityErrorInfo, eligibilityInfo)
         assertEqual(newSettings.isViewAddOnsSwitchEnabled, false)
-        assertEqual(newSettings.isQuickOrderSwitchEnabled, true)
+        assertEqual(newSettings.isSimplePaymentsSwitchEnabled, true)
     }
 }

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -64,8 +64,8 @@ extension WooAnalyticsEvent {
         case shippingLabelsRelease3 = "shipping_labels_m3"
         /// Shown in beta feature banner for order add-ons.
         case addOnsI1 = "add-ons_i1"
-        /// Shown in beta feature banner for quick order prototype.
-        case quickOrderPrototype = "quick_order_prototype"
+        /// Shown in beta feature banner for simple payments prototype.
+        case simplePaymentsPrototype = "simple_payments_prototype"
     }
 
     /// The action performed on the survey screen.
@@ -371,36 +371,36 @@ extension WooAnalyticsEvent {
     }
 }
 
-// MARK: - Quick Order
+// MARK: - Simple Payments
 //
 extension WooAnalyticsEvent {
     // Namespace
-    enum QuickOrder {
+    enum SimplePayments {
         /// Common event keys
         ///
         private enum Keys {
             static let state = "state"
             static let amount = "amount"
         }
 
-        static func quickOrderFlowStarted() -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .quickOrderFlowStarted, properties: [:])
+        static func simplePaymentsFlowStarted() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .simplePaymentsFlowStarted, properties: [:])
         }
 
-        static func quickOrderFlowCompleted(amount: String) -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .quickOrderFlowCompleted, properties: [Keys.amount: amount])
+        static func simplePaymentsFlowCompleted(amount: String) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .simplePaymentsFlowCompleted, properties: [Keys.amount: amount])
         }
 
-        static func quickOrderFlowCanceled() -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .quickOrderFlowCanceled, properties: [:])
+        static func simplePaymentsFlowCanceled() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .simplePaymentsFlowCanceled, properties: [:])
         }
 
-        static func quickOrderFlowFailed() -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .quickOrderFlowFailed, properties: [:])
+        static func simplePaymentsFlowFailed() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .simplePaymentsFlowFailed, properties: [:])
         }
 
-        static func settingsBetaFeaturesQuickOrderToggled(isOn: Bool) -> WooAnalyticsEvent {
-            WooAnalyticsEvent(statName: .settingsBetaFeaturesQuickOrderToggled, properties: [Keys.state: isOn ? "on" : "off"])
+        static func settingsBetaFeaturesSimplePaymentsToggled(isOn: Bool) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .settingsBetaFeaturesSimplePaymentsToggled, properties: [Keys.state: isOn ? "on" : "off"])
         }
     }
 }

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -130,7 +130,7 @@ public enum WooAnalyticsStat: String {
     case settingsBetaFeaturesButtonTapped = "settings_beta_features_button_tapped"
     case settingsBetaFeaturesProductsToggled = "settings_beta_features_products_toggled"
     case settingsBetaFeaturesOrderAddOnsToggled = "settings_beta_features_order_addons_toggled"
-    case settingsBetaFeaturesQuickOrderToggled = "settings_beta_features_quick_order_toggled"
+    case settingsBetaFeaturesSimplePaymentsToggled = "settings_beta_features_simple_payments_toggled"
 
     case settingsPrivacySettingsTapped = "settings_privacy_settings_button_tapped"
     case settingsCollectInfoToggled = "privacy_settings_collect_info_toggled"
@@ -512,12 +512,12 @@ public enum WooAnalyticsStat: String {
     //
     case featureAnnouncementShown = "feature_announcement_shown"
 
-    // MARK: Quick Order events
+    // MARK: Simple Payments events
     //
-    case quickOrderFlowStarted = "quick_order_flow_started"
-    case quickOrderFlowCompleted = "quick_order_flow_completed"
-    case quickOrderFlowCanceled = "quick_order_flow_canceled"
-    case quickOrderFlowFailed = "quick_order_flow_failed"
+    case simplePaymentsFlowStarted = "simple_payments_flow_started"
+    case simplePaymentsFlowCompleted = "simple_payments_flow_completed"
+    case simplePaymentsFlowCanceled = "simple_payments_flow_canceled"
+    case simplePaymentsFlowFailed = "simple_payments_flow_failed"
 }
 
 public extension WooAnalyticsStat {

WooCommerce/Classes/System/WooConstants.swift

@@ -124,9 +124,9 @@ extension WooConstants {
         case addPaymentMethodWCShip = "https://wordpress.com/me/purchases/add-payment-method"
 
 #if DEBUG
-        case quickOrderPrototypeFeedback = "https://automattic.survey.fm/woo-app-quick-order-testing"
+        case simplePaymentsPrototypeFeedback = "https://automattic.survey.fm/woo-app-simple-payments-testing"
 #else
-        case quickOrderPrototypeFeedback = "https://automattic.survey.fm/woo-app-quick-order-production"
+        case simplePaymentsPrototypeFeedback = "https://automattic.survey.fm/woo-app-simple-payments-production"
 #endif
 
         /// Returns the URL version of the receiver

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Beta features/BetaFeaturesViewController.swift

@@ -94,8 +94,8 @@ private extension BetaFeaturesViewController {
             return nil
         }
 
-        return Section(rows: [.quickOrder,
-                              .quickOrderDescription])
+        return Section(rows: [.simplePayments,
+                              .simplePaymentsDescription])
     }
 
     /// Register table cells.
@@ -121,10 +121,10 @@ private extension BetaFeaturesViewController {
         case let cell as BasicTableViewCell where row == .orderAddOnsDescription:
             configureOrderAddOnsDescription(cell: cell)
         // Orders
-        case let cell as SwitchTableViewCell where row == .quickOrder:
-            configureQuickOrderSwitch(cell: cell)
-        case let cell as BasicTableViewCell where row == .quickOrderDescription:
-            configureQuickOrderDescription(cell: cell)
+        case let cell as SwitchTableViewCell where row == .simplePayments:
+            configureSimplePaymentsSwitch(cell: cell)
+        case let cell as BasicTableViewCell where row == .simplePaymentsDescription:
+            configureSimplePaymentsDescription(cell: cell)
         default:
             fatalError()
         }
@@ -165,12 +165,12 @@ private extension BetaFeaturesViewController {
         cell.textLabel?.text = Localization.orderAddOnsDescription
     }
 
-    func configureQuickOrderSwitch(cell: SwitchTableViewCell) {
+    func configureSimplePaymentsSwitch(cell: SwitchTableViewCell) {
         configureCommonStylesForSwitchCell(cell)
-        cell.title = Localization.quickOrderTitle
+        cell.title = Localization.simplePaymentsTitle
 
         // Fetch switch's state stored value.
-        let action = AppSettingsAction.loadQuickOrderSwitchState() { result in
+        let action = AppSettingsAction.loadSimplePaymentsSwitchState() { result in
             guard let isEnabled = try? result.get() else {
                 return cell.isOn = false
             }
@@ -180,22 +180,22 @@ private extension BetaFeaturesViewController {
 
         // Change switch's state stored value
         cell.onChange = { isSwitchOn in
-            ServiceLocator.analytics.track(event: WooAnalyticsEvent.QuickOrder.settingsBetaFeaturesQuickOrderToggled(isOn: isSwitchOn))
+            ServiceLocator.analytics.track(event: WooAnalyticsEvent.SimplePayments.settingsBetaFeaturesSimplePaymentsToggled(isOn: isSwitchOn))
 
-            let action = AppSettingsAction.setQuickOrderFeatureSwitchState(isEnabled: isSwitchOn, onCompletion: { result in
+            let action = AppSettingsAction.setSimplePaymentsFeatureSwitchState(isEnabled: isSwitchOn, onCompletion: { result in
                 // Roll back toggle if an error occurred
                 if result.isFailure {
                     cell.isOn.toggle()
                 }
             })
             ServiceLocator.stores.dispatch(action)
         }
-        cell.accessibilityIdentifier = "beta-features-order-quick-order-cell"
+        cell.accessibilityIdentifier = "beta-features-order-simple-payments-cell"
     }
 
-    func configureQuickOrderDescription(cell: BasicTableViewCell) {
+    func configureSimplePaymentsDescription(cell: BasicTableViewCell) {
         configureCommonStylesForDescriptionCell(cell)
-        cell.textLabel?.text = Localization.quickOrderDescription
+        cell.textLabel?.text = Localization.simplePaymentsDescription
     }
 }
 
@@ -262,14 +262,14 @@ private enum Row: CaseIterable {
     case orderAddOnsDescription
 
     // Orders.
-    case quickOrder
-    case quickOrderDescription
+    case simplePayments
+    case simplePaymentsDescription
 
     var type: UITableViewCell.Type {
         switch self {
-        case .orderAddOns, .quickOrder:
+        case .orderAddOns, .simplePayments:
             return SwitchTableViewCell.self
-        case .orderAddOnsDescription, .quickOrderDescription:
+        case .orderAddOnsDescription, .simplePaymentsDescription:
             return BasicTableViewCell.self
         }
     }
@@ -285,8 +285,9 @@ private extension BetaFeaturesViewController {
         static let orderAddOnsDescription = NSLocalizedString("Test out viewing Order Add-Ons as we get ready to launch",
                                                               comment: "Cell description on the beta features screen to enable the order add-ons feature")
 
-        static let quickOrderTitle = NSLocalizedString("Quick Order", comment: "Cell title on the beta features screen to enable the Quick Order feature")
-        static let quickOrderDescription = NSLocalizedString("Test out creating orders with minimal information as we get ready to launch",
-                                                              comment: "Cell description on the beta features screen to enable the Quick Order feature")
+        static let simplePaymentsTitle = NSLocalizedString("Simple Payments",
+                                                           comment: "Cell title on the beta features screen to enable the Simple Payments feature")
+        static let simplePaymentsDescription = NSLocalizedString("Test out creating orders with minimal information as we get ready to launch",
+                                                              comment: "Cell description on the beta features screen to enable the Simple Payments feature")
     }
 }