Merge pull request #6996 from woocommerce/issue/6861-date-time-order-details

[Order Details] Display date and time in the order details screen

Author: rachelmcr

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 9.4
 -----
-
+- [*] Orders: Order details now displays both the date and time for all orders. [https://github.com/woocommerce/woocommerce-ios/pull/6996]
 
 9.3
 -----

WooCommerce/Classes/Extensions/DateFormatter+Helpers.swift

@@ -154,4 +154,15 @@ extension DateFormatter {
         formatter.setLocalizedDateFormatFromTemplate("hh:mm a")
         return formatter
     }()
+
+    /// Date formatter used for creating a **localized** date and time string.
+    ///
+    /// Example output in English: "Jan 28, 2018, 11:23 AM"
+    ///
+    public static let dateAndTimeFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.setLocalizedDateFormatFromTemplate("MMM d yyyy hh:mm a")
+
+        return formatter
+    }()
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Order Summary Section/SummaryTableViewCell.swift

@@ -46,19 +46,10 @@ struct SummaryTableViewCellViewModel {
         }
     }
 
-    /// The date and the order number concatenated together. Example, “Jan 22, 2018 • #1587”.
-    ///
-    /// If the date is today, the time will be returned instead.
+    /// The date, time, and the order number concatenated together. Example, “Jan 22, 2018, 11:23 AM • #1587”.
     ///
     var subtitle: String {
-        let formatter: DateFormatter = {
-            if dateCreated.isSameDay(as: Date(), using: calendar) {
-                return DateFormatter.timeFormatter
-            } else {
-                return DateFormatter.mediumLengthLocalizedDateFormatter
-            }
-        }()
-
+        let formatter = DateFormatter.dateAndTimeFormatter
         return "\(formatter.string(from: dateCreated)) • #\(orderNumber)"
     }
 }

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Details/Order Summary Section/SummaryTableViewCell/SummaryTableViewCellViewModelTests.swift

@@ -32,28 +32,9 @@ final class SummaryTableViewCellViewModelTests: XCTestCase {
         XCTAssertEqual(personName, "Skylar Ferry")
     }
 
-    func test_subtitle_returns_the_date_and_order_number() throws {
+    func test_subtitle_returns_the_date_and_time_and_order_number() throws {
         // Given
-        let expectedFormatter = DateFormatter.mediumLengthLocalizedDateFormatter
-        let calendar = Calendar(identifier: .gregorian, timeZone: expectedFormatter.timeZone)
-
-        let order = makeOrder(dateCreated: try XCTUnwrap(Date().adding(days: -2, using: calendar)))
-
-        let viewModel = SummaryTableViewCellViewModel(order: order,
-                                                      status: nil,
-                                                      calendar: calendar)
-
-        // When
-        let subtitle = viewModel.subtitle
-
-        // Then
-        let expectedSubtitle = expectedFormatter.string(from: order.dateCreated) + " • #\(order.number)"
-        XCTAssertEqual(subtitle, expectedSubtitle)
-    }
-
-    func test_given_an_order_created_today_then_subtitle_returns_the_time_and_order_number() {
-        // Given
-        let expectedFormatter = DateFormatter.timeFormatter
+        let expectedFormatter = DateFormatter.dateAndTimeFormatter
         let calendar = Calendar(identifier: .gregorian, timeZone: expectedFormatter.timeZone)
 
         let order = makeOrder(dateCreated: Date())