Merge pull request #5626 from woocommerce/issue/5407-create-order-navigation

Order Creation: Navigate to order details after creation

Author: ealeksandrov

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

@@ -86,6 +86,8 @@ private extension AddOrderCoordinator {
     ///
     func presentNewOrderController() {
         let viewModel = NewOrderViewModel(siteID: siteID)
+        viewModel.onOrderCreated = onOrderCreated
+
         let viewController = NewOrderHostingController(viewModel: viewModel)
         viewController.hidesBottomBarWhenPushed = true
         navigationController.pushViewController(viewController, animated: true)

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

@@ -41,6 +41,10 @@ final class NewOrderViewModel: ObservableObject {
     ///
     @Published var shouldShowOrderStatusList: Bool = false
 
+    /// Assign this closure to be notified when a new order is created
+    ///
+    var onOrderCreated: (Order) -> Void = { _ in }
+
     /// Status Results Controller.
     ///
     private lazy var statusResultsController: ResultsController<StorageOrderStatus> = {
@@ -83,9 +87,10 @@ final class NewOrderViewModel: ObservableObject {
             self.performingNetworkRequest = false
 
             switch result {
-            case .success:
+            case .success(let newOrder):
                 // TODO: Handle newly created order / remove success logging
                 DDLogInfo("New order created successfully!")
+                self.onOrderCreated(newOrder)
             case .failure(let error):
                 self.presentNotice = .error
                 DDLogError("⛔️ Error creating new order: \(error)")

WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift

@@ -366,7 +366,14 @@ private extension OrdersRootViewController {
     private func navigateToOrderDetail(_ order: Order) {
         guard let orderViewController = OrderDetailsViewController.instantiatedViewControllerFromStoryboard() else { return }
         orderViewController.viewModel = OrderDetailsViewModel(order: order)
-        show(orderViewController, sender: self)
+
+        // Cleanup navigation (remove new order flow views) before navigating to order details
+        if let navigationController = navigationController, let indexOfSelf = navigationController.viewControllers.firstIndex(of: self) {
+            let viewControllersIncludingSelf = navigationController.viewControllers[0...indexOfSelf]
+            navigationController.setViewControllers(viewControllersIncludingSelf + [orderViewController], animated: true)
+        } else {
+            show(orderViewController, sender: self)
+        }
 
         ServiceLocator.analytics.track(.orderOpen, withProperties: ["id": order.orderID, "status": order.status.rawValue])
     }