Merge pull request #323 from woocommerce/issue/306-pending-orders-filter

New Orders: Filtering Processing

Author: jleandroperez

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/NewOrdersViewController.swift

@@ -98,7 +98,7 @@ private extension NewOrdersViewController {
 
     @IBAction func buttonTouchUpInside(_ sender: UIButton) {
         sender.fadeOutSelectedBackground {
-            MainTabBarController.switchToOrdersTab()
+            MainTabBarController.switchToOrdersTab(filter: .processing)
         }
     }
 

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -1,5 +1,7 @@
 import UIKit
 import Gridicons
+import Yosemite
+
 
 /// Enum representing the individual tabs
 ///
@@ -78,8 +80,14 @@ extension MainTabBarController {
 
     /// Switches to the Orders tab and pops to the root view controller
     ///
-    static func switchToOrdersTab() {
+    static func switchToOrdersTab(filter: OrderStatus? = nil) {
         navigateTo(.orders)
+
+        guard let ordersViewController: OrdersViewController = childViewController() else {
+            return
+        }
+
+        ordersViewController.statusFilter = filter
     }
 
     /// Switches to the Notifications tab and pops to the root view controller
@@ -88,6 +96,8 @@ extension MainTabBarController {
         navigateTo(.notifications)
     }
 
+    /// Switches the TabBarcController to the specified Tab
+    ///
     private static func navigateTo(_ tab: WooTab) {
         guard let tabBar = AppDelegate.shared.tabBarController else {
             return
@@ -98,4 +108,15 @@ extension MainTabBarController {
             navController.popToRootViewController(animated: false)
         }
     }
+
+    /// Returns the "Top Visible Child" of the specified type
+    ///
+    private static func childViewController<T: UIViewController>() -> T? {
+        let selectedViewController = AppDelegate.shared.tabBarController?.selectedViewController
+        guard let navController = selectedViewController as? UINavigationController else {
+            return selectedViewController as? T
+        }
+
+        return navController.topViewController as? T
+    }
 }

WooCommerce/Classes/ViewRelated/Orders/OrdersViewController.swift

@@ -40,8 +40,12 @@ class OrdersViewController: UIViewController {
 
     /// OrderStatus that must be matched by retrieved orders.
     ///
-    private var statusFilter: OrderStatus? {
+    var statusFilter: OrderStatus? {
         didSet {
+            guard isViewLoaded else {
+                return
+            }
+
             guard oldValue?.rawValue != statusFilter?.rawValue else {
                 return
             }
@@ -93,8 +97,11 @@ class OrdersViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        refreshTitle()
+        refreshResultsPredicate()
         configureSyncingCoordinator()
         configureNavigation()
+        configureTabBarItem()
         configureTableView()
         configureResultsController()
     }
@@ -111,8 +118,22 @@ class OrdersViewController: UIViewController {
 //
 private extension OrdersViewController {
 
+    func refreshTitle() {
+        guard let filter = statusFilter?.rawValue.capitalized else {
+            navigationItem.title = NSLocalizedString("Orders", comment: "Orders Title")
+            return
+        }
+
+        navigationItem.title = NSLocalizedString("Orders: \(filter)", comment: "Orders Title")
+    }
+
+    func refreshResultsPredicate() {
+        resultsController.predicate = statusFilter.map { NSPredicate(format: "status = %@", $0.rawValue) }
+        tableView.setContentOffset(.zero, animated: false)
+        tableView.reloadData()
+    }
+
     func configureNavigation() {
-        title = NSLocalizedString("Orders", comment: "Orders title")
         let rightBarButton = UIBarButtonItem(image: Gridicon.iconOfType(.menus),
                                              style: .plain,
                                              target: self,
@@ -127,6 +148,10 @@ private extension OrdersViewController {
         navigationItem.backBarButtonItem = UIBarButtonItem(title: String(), style: .plain, target: nil, action: nil)
     }
 
+    func configureTabBarItem() {
+        tabBarItem.title = NSLocalizedString("Orders", comment: "Orders title")
+    }
+
     func configureTableView() {
         view.backgroundColor = StyleManager.tableViewBackgroundColor
         tableView.backgroundColor = StyleManager.tableViewBackgroundColor
@@ -181,11 +206,12 @@ extension OrdersViewController {
 //
 private extension OrdersViewController {
 
-    private func didChangeFilter(newFilter: OrderStatus?) {
+    func didChangeFilter(newFilter: OrderStatus?) {
+        // Display the Filter in the Title
+        refreshTitle()
+
         // Filter right away the cached orders
-        resultsController.predicate = newFilter.map { NSPredicate(format: "status = %@", $0.rawValue) }
-        tableView.setContentOffset(.zero, animated: false)
-        tableView.reloadData()
+        refreshResultsPredicate()
 
         // Drop Cache (If Needed) + Re-Sync First Page
         ensureStoredOrdersAreReset { [weak self] in