Merge pull request #6537 from woocommerce/issue/6536-remove-order-creation-experimental-toggle

Order Creation: Release order creation (removes experimental toggle)

Author: rachelmcr

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [*] In-Person Payments: Removed collecting L2/L3 data. [https://github.com/woocommerce/woocommerce-ios/pull/6519]
 - [*] Hub Menu: Multiple menu items can no longer be tapped simultaneously. [https://github.com/woocommerce/woocommerce-ios/pull/6484]
 - [*] Jetpack CP: Fixed crash when attempting to access WP-Admin with an invalid URL that has an unsupported scheme. [https://github.com/woocommerce/woocommerce-ios/pull/6502]
+- [***] Orders: Order Creation is now available to everyone! You can go to the Orders tab and tap the + button to create a new order. [https://github.com/woocommerce/woocommerce-ios/pull/6537]
 - [internal] Loading screens are refactored to avoid duplicated code and a potential crash. Please quickly smoke test them to make sure that everything still works as before. [https://github.com/woocommerce/woocommerce-ios/pull/6535] [https://github.com/woocommerce/woocommerce-ios/pull/6544]
 
 8.8

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

@@ -9,7 +9,6 @@ extension GeneralAppSettings {
         installationDate: NullableCopiableProp<Date> = .copy,
         feedbacks: CopiableProp<[FeedbackType: FeedbackSettings]> = .copy,
         isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
-        isOrderCreationSwitchEnabled: CopiableProp<Bool> = .copy,
         isCanadaInPersonPaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         isProductSKUInputScannerSwitchEnabled: CopiableProp<Bool> = .copy,
         isCouponManagementSwitchEnabled: CopiableProp<Bool> = .copy,
@@ -20,7 +19,6 @@ extension GeneralAppSettings {
         let installationDate = installationDate ?? self.installationDate
         let feedbacks = feedbacks ?? self.feedbacks
         let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
-        let isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled ?? self.isOrderCreationSwitchEnabled
         let isCanadaInPersonPaymentsSwitchEnabled = isCanadaInPersonPaymentsSwitchEnabled ?? self.isCanadaInPersonPaymentsSwitchEnabled
         let isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled ?? self.isProductSKUInputScannerSwitchEnabled
         let isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled ?? self.isCouponManagementSwitchEnabled
@@ -32,7 +30,6 @@ extension GeneralAppSettings {
             installationDate: installationDate,
             feedbacks: feedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
-            isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
             isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,

Storage/Storage/Model/GeneralAppSettings.swift

@@ -24,10 +24,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public let isViewAddOnsSwitchEnabled: Bool
 
-    /// The state(`true` or `false`) for the Order Creation feature switch.
-    ///
-    public let isOrderCreationSwitchEnabled: Bool
-
     /// The state for the In-Person Payments in Canada feature switch
     ///
     public let isCanadaInPersonPaymentsSwitchEnabled: Bool
@@ -55,7 +51,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     public init(installationDate: Date?,
                 feedbacks: [FeedbackType: FeedbackSettings],
                 isViewAddOnsSwitchEnabled: Bool,
-                isOrderCreationSwitchEnabled: Bool,
                 isCanadaInPersonPaymentsSwitchEnabled: Bool,
                 isProductSKUInputScannerSwitchEnabled: Bool,
                 isCouponManagementSwitchEnabled: Bool,
@@ -65,7 +60,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
         self.installationDate = installationDate
         self.feedbacks = feedbacks
         self.isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled
-        self.isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled
         self.isCanadaInPersonPaymentsSwitchEnabled = isCanadaInPersonPaymentsSwitchEnabled
         self.isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled
         self.isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled
@@ -95,7 +89,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             installationDate: installationDate,
             feedbacks: updatedFeedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
-            isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
             isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
@@ -115,7 +108,6 @@ 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.isOrderCreationSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isOrderCreationSwitchEnabled) ?? false
         self.isCanadaInPersonPaymentsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isCanadaInPersonPaymentsSwitchEnabled) ?? false
         self.isProductSKUInputScannerSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isProductSKUInputScannerSwitchEnabled) ?? false
         self.isCouponManagementSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isCouponManagementSwitchEnabled) ?? false

Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift

@@ -61,7 +61,6 @@ final class GeneralAppSettingsTests: XCTestCase {
         let previousSettings = GeneralAppSettings(installationDate: installationDate,
                                                   feedbacks: feedbackSettings,
                                                   isViewAddOnsSwitchEnabled: true,
-                                                  isOrderCreationSwitchEnabled: true,
                                                   isCanadaInPersonPaymentsSwitchEnabled: true,
                                                   isProductSKUInputScannerSwitchEnabled: true,
                                                   isCouponManagementSwitchEnabled: true,
@@ -83,7 +82,6 @@ final class GeneralAppSettingsTests: XCTestCase {
         assertEqual(newSettings.knownCardReaders, readers)
         assertEqual(newSettings.lastEligibilityErrorInfo, eligibilityInfo)
         assertEqual(newSettings.isViewAddOnsSwitchEnabled, false)
-        assertEqual(newSettings.isOrderCreationSwitchEnabled, true)
         assertEqual(newSettings.isCanadaInPersonPaymentsSwitchEnabled, true)
         assertEqual(newSettings.isProductSKUInputScannerSwitchEnabled, true)
         assertEqual(newSettings.isCouponManagementSwitchEnabled, true)
@@ -95,7 +93,6 @@ private extension GeneralAppSettingsTests {
     func createGeneralAppSettings(installationDate: Date? = nil,
                                   feedbacks: [FeedbackType: FeedbackSettings] = [:],
                                   isViewAddOnsSwitchEnabled: Bool = false,
-                                  isOrderCreationSwitchEnabled: Bool = false,
                                   isCanadaInPersonPaymentsSwitchEnabled: Bool = false,
                                   isProductSKUInputScannerSwitchEnabled: Bool = false,
                                   isCouponManagementSwitchEnabled: Bool = false,
@@ -105,7 +102,6 @@ private extension GeneralAppSettingsTests {
         GeneralAppSettings(installationDate: installationDate,
                            feedbacks: feedbacks,
                            isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
-                           isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
                            isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
                            isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
                            isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,

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

@@ -74,7 +74,6 @@ private extension BetaFeaturesViewController {
     func configureSections() {
         self.sections = [
             productsSection(),
-            orderCreationSection(),
             inPersonPaymentsSection(),
             productSKUInputScannerSection(),
             couponManagementSection()
@@ -86,11 +85,6 @@ private extension BetaFeaturesViewController {
                               .orderAddOnsDescription])
     }
 
-    func orderCreationSection() -> Section? {
-        return Section(rows: [.orderCreation,
-                              .orderCreationDescription])
-    }
-
     func inPersonPaymentsSection() -> Section? {
         var rows: [Row] = []
 
@@ -144,11 +138,6 @@ private extension BetaFeaturesViewController {
             configureOrderAddOnsSwitch(cell: cell)
         case let cell as BasicTableViewCell where row == .orderAddOnsDescription:
             configureOrderAddOnsDescription(cell: cell)
-        // Orders
-        case let cell as SwitchTableViewCell where row == .orderCreation:
-            configureOrderCreationSwitch(cell: cell)
-        case let cell as BasicTableViewCell where row == .orderCreationDescription:
-            configureOrderCreationDescription(cell: cell)
         // In-Person Payments in Canada
         case let cell as SwitchTableViewCell where row == .canadaInPersonPayments:
             configureCanadaInPersonPaymentsSwitch(cell: cell)
@@ -203,37 +192,6 @@ private extension BetaFeaturesViewController {
         cell.textLabel?.text = Localization.orderAddOnsDescription
     }
 
-    func configureOrderCreationSwitch(cell: SwitchTableViewCell) {
-        configureCommonStylesForSwitchCell(cell)
-        cell.title = Localization.orderCreationTitle
-
-        // Fetch switch's state stored value.
-        let action = AppSettingsAction.loadOrderCreationSwitchState() { result in
-            guard let isEnabled = try? result.get() else {
-                return cell.isOn = false
-            }
-            cell.isOn = isEnabled
-        }
-        ServiceLocator.stores.dispatch(action)
-
-        // Change switch's state stored value
-        cell.onChange = { isSwitchOn in
-            let action = AppSettingsAction.setOrderCreationFeatureSwitchState(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-order-creation-cell"
-    }
-
-    func configureOrderCreationDescription(cell: BasicTableViewCell) {
-        configureCommonStylesForDescriptionCell(cell)
-        cell.textLabel?.text = Localization.orderCreationDescription
-    }
-
     func configureCanadaInPersonPaymentsSwitch(cell: SwitchTableViewCell) {
         configureCommonStylesForSwitchCell(cell)
         cell.title = Localization.canadaExtensionInPersonPaymentsTitle
@@ -390,10 +348,6 @@ private enum Row: CaseIterable {
     case orderAddOns
     case orderAddOnsDescription
 
-    // Orders.
-    case orderCreation
-    case orderCreationDescription
-
     // In-Person Payments in Canada
     case canadaInPersonPayments
     case canadaInPersonPaymentsDescription
@@ -408,9 +362,9 @@ private enum Row: CaseIterable {
 
     var type: UITableViewCell.Type {
         switch self {
-        case .orderAddOns, .orderCreation, .canadaInPersonPayments, .productSKUInputScanner, .couponManagement:
+        case .orderAddOns, .canadaInPersonPayments, .productSKUInputScanner, .couponManagement:
             return SwitchTableViewCell.self
-        case .orderAddOnsDescription, .orderCreationDescription, .canadaInPersonPaymentsDescription,
+        case .orderAddOnsDescription, .canadaInPersonPaymentsDescription,
                 .productSKUInputScannerDescription, .couponManagementDescription:
             return BasicTableViewCell.self
         }
@@ -430,13 +384,6 @@ private extension BetaFeaturesViewController {
             "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 orderCreationTitle = NSLocalizedString(
-            "Order Creation",
-            comment: "Cell title on the beta features screen to enable creating new orders")
-        static let orderCreationDescription = NSLocalizedString(
-            "Test out creating new manual orders as we get ready to launch",
-            comment: "Cell description on the beta features screen to enable creating new orders")
-
         static let canadaExtensionInPersonPaymentsTitle = NSLocalizedString(
             "In-Person Payments in Canada",
             comment: "Cell title on beta features screen to enable accepting in-person payments for stores in Canada ")

WooCommerce/Classes/ViewRelated/Orders/Order Creation/FlowCoordinator/AddOrderCoordinator.swift

@@ -6,7 +6,6 @@ final class AddOrderCoordinator: Coordinator {
     var navigationController: UINavigationController
 
     private let siteID: Int64
-    private let isOrderCreationEnabled: Bool
     private let sourceBarButtonItem: UIBarButtonItem?
     private let sourceView: UIView?
 
@@ -15,22 +14,18 @@ final class AddOrderCoordinator: Coordinator {
     var onOrderCreated: (Order) -> Void = { _ in }
 
     init(siteID: Int64,
-         isOrderCreationEnabled: Bool,
          sourceBarButtonItem: UIBarButtonItem,
          sourceNavigationController: UINavigationController) {
         self.siteID = siteID
-        self.isOrderCreationEnabled = isOrderCreationEnabled
         self.sourceBarButtonItem = sourceBarButtonItem
         self.sourceView = nil
         self.navigationController = sourceNavigationController
     }
 
     init(siteID: Int64,
-         isOrderCreationEnabled: Bool,
          sourceView: UIView,
          sourceNavigationController: UINavigationController) {
         self.siteID = siteID
-        self.isOrderCreationEnabled = isOrderCreationEnabled
         self.sourceBarButtonItem = nil
         self.sourceView = sourceView
         self.navigationController = sourceNavigationController
@@ -41,11 +36,7 @@ final class AddOrderCoordinator: Coordinator {
     }
 
     func start() {
-        if isOrderCreationEnabled {
-            presentOrderTypeBottomSheet()
-        } else {
-            presentOrderCreationFlow(bottomSheetOrderType: .simple)
-        }
+        presentOrderTypeBottomSheet()
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift

@@ -54,10 +54,6 @@ final class OrdersRootViewController: UIViewController {
         }
     }
 
-    /// Stores status for order creation availability.
-    ///
-    private var isOrderCreationEnabled: Bool = false
-
     private let storageManager: StorageManagerType
 
     /// Used for looking up the `OrderStatus` to show in the `Order Filters`.
@@ -97,6 +93,7 @@ final class OrdersRootViewController: UIViewController {
         super.viewDidLoad()
         configureTitle()
         configureView()
+        configureNavigationButtons()
         configureFiltersBar()
         configureChildViewController()
 
@@ -112,9 +109,6 @@ final class OrdersRootViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        // Needed in ViewWillAppear because this View Controller is never recreated.
-        fetchExperimentalTogglesAndConfigureNavigationButtons()
-
         ServiceLocator.pushNotesManager.resetBadgeCount(type: .storeOrder)
     }
 
@@ -207,9 +201,9 @@ private extension OrdersRootViewController {
     /// Search: Is always present.
     /// Add: Always present.
     ///
-    func configureNavigationButtons(isOrderCreationExperimentalToggleEnabled: Bool) {
+    func configureNavigationButtons() {
         let buttons: [UIBarButtonItem] = [
-            createAddOrderItem(isOrderCreationEnabled: isOrderCreationExperimentalToggleEnabled),
+            createAddOrderItem(),
             createSearchBarButtonItem()
         ]
         navigationItem.rightBarButtonItems = buttons
@@ -244,24 +238,6 @@ private extension OrdersRootViewController {
         ordersViewController.didMove(toParent: self)
     }
 
-    /// Fetches the latest values of order-related experimental feature toggles and re configures navigation buttons.
-    ///
-    func fetchExperimentalTogglesAndConfigureNavigationButtons() {
-        let group = DispatchGroup()
-        var isOrderCreationEnabled = false
-
-        group.enter()
-        let orderCreationAction = AppSettingsAction.loadOrderCreationSwitchState { result in
-            isOrderCreationEnabled = (try? result.get()) ?? false
-            group.leave()
-        }
-        ServiceLocator.stores.dispatch(orderCreationAction)
-
-        group.notify(queue: .main) { [weak self] in
-            self?.configureNavigationButtons(isOrderCreationExperimentalToggleEnabled: isOrderCreationEnabled)
-        }
-    }
-
     /// Connect hooks on `ResultsController` and query cached data.
     /// This is useful for stay up to date with the remote statuses, resetting the filters if one of the local status filters was deleted remotely.
     ///
@@ -354,22 +330,14 @@ private extension OrdersRootViewController {
 
     /// Create a `UIBarButtonItem` to be used as a way to create a new order.
     ///
-    func createAddOrderItem(isOrderCreationEnabled: Bool) -> UIBarButtonItem {
-        self.isOrderCreationEnabled = isOrderCreationEnabled
-
+    func createAddOrderItem() -> UIBarButtonItem {
         let button = UIBarButtonItem(image: .plusBarButtonItemImage,
                                      style: .plain,
                                      target: self,
                                      action: #selector(presentOrderCreationFlow(sender:)))
         button.accessibilityTraits = .button
-
-        if isOrderCreationEnabled {
-            button.accessibilityLabel = NSLocalizedString("Choose new order type", comment: "Opens action sheet to choose a type of a new order")
-            button.accessibilityIdentifier = "new-order-type-sheet-button"
-        } else {
-            button.accessibilityLabel = NSLocalizedString("Add simple payments order", comment: "Navigates to a screen to create a simple payments order")
-            button.accessibilityIdentifier = "simple-payments-add-button"
-        }
+        button.accessibilityLabel = NSLocalizedString("Choose new order type", comment: "Opens action sheet to choose a type of a new order")
+        button.accessibilityIdentifier = "new-order-type-sheet-button"
         return button
     }
 
@@ -381,7 +349,6 @@ private extension OrdersRootViewController {
         }
 
         let coordinatingController = AddOrderCoordinator(siteID: siteID,
-                                                         isOrderCreationEnabled: isOrderCreationEnabled,
                                                          sourceBarButtonItem: sender,
                                                          sourceNavigationController: navigationController)
         coordinatingController.onOrderCreated = { [weak self] order in