Merge pull request #6164 from woocommerce/5976-improve-consistency-of-fetching-charge

[Mobile Payments] Display last4 and card brand on refund screen consistently

Author: joshheald

Networking/Networking/Remote/OrdersRemote.swift

@@ -269,10 +269,13 @@ public extension OrdersRemote {
         private static let commonOrderFieldValues = [
             "id", "parent_id", "number", "status", "currency", "customer_id", "customer_note", "date_created_gmt", "date_modified_gmt", "date_paid_gmt",
             "discount_total", "discount_tax", "shipping_total", "shipping_tax", "total", "total_tax", "payment_method", "payment_method_title",
-            "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines"
+            "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data"
         ]
+        // Use with caution. Any fields in here will be overwritten with empty values by
+        // `Order+ReadOnlyConvertible.swift: Order.update(with:)` when the list of orders is fetched.
+        // See p91TBi-7yL-p2 for discussion.
         private static let singleOrderExtraFieldValues = [
-            "line_items", "shipping", "meta_data"
+            "line_items", "shipping"
         ]
     }
 

Yosemite/Yosemite/Model/Storage/Order+ReadOnlyConvertible.swift

@@ -32,6 +32,7 @@ extension Storage.Order: ReadOnlyConvertible {
         totalTax = order.totalTax
         paymentMethodID = order.paymentMethodID
         paymentMethodTitle = order.paymentMethodTitle
+        chargeID = order.chargeID
 
         if let billingAddress = order.billingAddress {
             billingFirstName = billingAddress.firstName