Merge pull request #7750 from woocommerce/issue/bring-old-editing-back

Bring back legacy customer note & addresses editing

Author: Ecarrion

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 10.5
 -----
 - [**] Products: Now you can duplicate products from the More menu of the product detail screen. [https://github.com/woocommerce/woocommerce-ios/pull/7727]
+- [*] Orders: We are bringing back the ability to add/edit customer notes and addresses from the main order screen [https://github.com/woocommerce/woocommerce-ios/pull/7750]
 - [*] Help center: Added help center web page with FAQs for "Wrong WordPress.com account error" screen. [https://github.com/woocommerce/woocommerce-ios/pull/7747]
 
 10.4

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -458,12 +458,16 @@ private extension OrderDetailsDataSource {
         cell.selectionStyle = .none
         if customerNote.isNotEmpty {
             cell.body = customerNote.quoted
+            cell.onEditTapped = { [weak self] in
+                self?.onCellAction?(.editCustomerNote, nil)
+            }
         } else {
             cell.body = nil
+            cell.onAddTapped = { [weak self] in
+                self?.onCellAction?(.editCustomerNote, nil)
+            }
         }
 
-        cell.onEditTapped = nil
-        cell.onAddTapped = nil
         cell.addButtonTitle = NSLocalizedString("Add Customer Note", comment: "Title for the button to add the Customer Provided Note in Order Details")
         cell.editButtonAccessibilityLabel = NSLocalizedString(
             "Update Note",
@@ -890,12 +894,16 @@ private extension OrderDetailsDataSource {
 
         if let formattedPostalAddress = shippingAddress?.formattedPostalAddress {
             cell.address = formattedPostalAddress
+            cell.onEditTapped = { [weak self] in
+                self?.onCellAction?(.editShippingAddress, nil)
+            }
         } else {
             cell.address = nil
+            cell.onAddTapped = { [weak self] in
+                self?.onCellAction?(.editShippingAddress, nil)
+            }
         }
 
-        cell.onEditTapped = nil
-        cell.onAddTapped = nil
         cell.addButtonTitle = NSLocalizedString("Add Shipping Address", comment: "Title for the button to add the Shipping Address in Order Details")
         cell.editButtonAccessibilityLabel = NSLocalizedString(
             "Update Address",
@@ -1095,12 +1103,17 @@ extension OrderDetailsDataSource {
             var rows: [Row] = []
 
             /// Customer Note
-            if order.customerNote?.isNotEmpty == true {
-                rows.append(.customerNote)
-            }
+            /// Always visible to allow adding & editing.
+            rows.append(.customerNote)
 
             /// Shipping Address
-            if order.shippingAddress?.isEmpty == false {
+            /// Almost always visible to allow editing.
+            let orderContainsOnlyVirtualProducts = self.products.filter { (product) -> Bool in
+                return items.first(where: { $0.productID == product.productID}) != nil
+            }.allSatisfy { $0.virtual == true }
+
+
+            if order.shippingAddress != nil && orderContainsOnlyVirtualProducts == false {
                 rows.append(.shippingAddress)
             }
 
@@ -1110,9 +1123,8 @@ extension OrderDetailsDataSource {
             }
 
             /// Billing Address
-            if order.billingAddress?.isEmpty == false {
-                rows.append(.billingDetail)
-            }
+            /// Always visible to allow editing.
+            rows.append(.billingDetail)
 
             /// Return `nil` if there is no rows to display.
             guard rows.isNotEmpty else {
@@ -1599,6 +1611,8 @@ extension OrderDetailsDataSource {
         case createShippingLabel
         case shippingLabelTrackingMenu(shippingLabel: ShippingLabel, sourceView: UIView)
         case viewAddOns(addOns: [OrderItemAttribute])
+        case editCustomerNote
+        case editShippingAddress
     }
 
     enum Constants {

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -395,7 +395,7 @@ extension OrderDetailsViewModel {
             viewController.show(productListVC, sender: nil)
         case .billingDetail:
             ServiceLocator.analytics.track(.orderDetailShowBillingTapped)
-            let billingInformationViewController = BillingInformationViewController(order: order, editingEnabled: false)
+            let billingInformationViewController = BillingInformationViewController(order: order, editingEnabled: true)
             viewController.navigationController?.pushViewController(billingInformationViewController, animated: true)
         case .customFields:
             ServiceLocator.analytics.track(.orderViewCustomFieldsTapped)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerNoteTableViewCell.swift

@@ -29,6 +29,7 @@ final class CustomerNoteTableViewCell: UITableViewCell {
         }
         set {
             bodyTextView.text = newValue
+            bodyTextView.isHidden = newValue == nil || newValue?.isEmpty == true
         }
     }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

@@ -386,6 +386,10 @@ private extension OrderDetailsViewController {
             shippingLabelTrackingMoreMenuTapped(shippingLabel: shippingLabel, sourceView: sourceView)
         case let .viewAddOns(addOns):
             itemAddOnsButtonTapped(addOns: addOns)
+        case .editCustomerNote:
+            editCustomerNoteTapped()
+        case .editShippingAddress:
+            editShippingAddressTapped()
         }
     }
 
@@ -542,6 +546,20 @@ private extension OrderDetailsViewController {
         present(actionSheet, animated: true)
     }
 
+    func editCustomerNoteTapped() {
+        let editNoteViewController = EditCustomerNoteHostingController(viewModel: viewModel.editNoteViewModel)
+        present(editNoteViewController, animated: true)
+
+        ServiceLocator.analytics.track(event: WooAnalyticsEvent.OrderDetailsEdit.orderDetailEditFlowStarted(subject: .customerNote))
+    }
+
+    func editShippingAddressTapped() {
+        let viewModel = EditOrderAddressFormViewModel(order: viewModel.order, type: .shipping)
+        let editAddressViewController = EditOrderAddressHostingController(viewModel: viewModel)
+        let navigationController = WooNavigationController(rootViewController: editAddressViewController)
+        present(navigationController, animated: true, completion: nil)
+    }
+
     @objc private func collectPaymentTapped() {
         collectPayment()