Merge pull request #241 from woocommerce/fix/88-custom-payment

Order List: Improve custom payment labels

Author: mindgraffiti

Networking/Networking/Model/OrderStatus.swift

@@ -64,6 +64,7 @@ extension OrderStatus: RawRepresentable {
 extension OrderStatus: CustomStringConvertible {
 
     /// Returns a string describing the current OrderStatus Instance
+    /// Custom doesn't return a localized string because the payload arrives at runtime, not buildtime.
     ///
     public var description: String {
         switch self {
@@ -74,7 +75,10 @@ extension OrderStatus: CustomStringConvertible {
         case .cancelled:            return NSLocalizedString("Canceled", comment: "Cancelled Order Status")
         case .completed:            return NSLocalizedString("Completed", comment: "Completed Order Status")
         case .refunded:             return NSLocalizedString("Refunded", comment: "Refunded Order Status")
-        case .custom(let payload):  return NSLocalizedString("\(payload)", comment: "Custom Order Status")
+        case .custom(let payload):
+            return payload
+                .replacingOccurrences(of: "-", with: " ")
+                .capitalized
         }
     }
 }

WooCommerce/Classes/Model/Order+Woo.swift

@@ -15,12 +15,6 @@ extension Order {
         return NSLocale(localeIdentifier: identifier).currencySymbol
     }
 
-    /// Determines if a shipping address exists.
-    ///
-    var hasSeparateShippingDetail: Bool {
-        return shippingAddress != nil
-    }
-
     /// FIXME: Creates an empty-string value Billing details, until i6 fix
     ///
     func generateEmptyBillingAddress() -> Address {