@@ -32,7 +32,7 @@ public class OrdersRemote: Remote {
3232 ParameterKeys . page: String ( pageNumber) ,
3333 ParameterKeys . perPage: String ( pageSize) ,
3434 ParameterKeys . statusKey: statusesString ?? Defaults . statusAny,
35- ParameterKeys . fields: ParameterValues . listFieldValues ,
35+ ParameterKeys . fields: ParameterValues . fieldValues ,
3636 ]
3737
3838 if let after = after {
@@ -61,7 +61,7 @@ public class OrdersRemote: Remote {
6161 ///
6262 public func loadOrder( for siteID: Int64 , orderID: Int64 , completion: @escaping ( Order ? , Error ? ) -> Void ) {
6363 let parameters = [
64- ParameterKeys . fields: ParameterValues . singleOrderFieldValues
64+ ParameterKeys . fields: ParameterValues . fieldValues
6565 ]
6666
6767 let path = " \( Constants . ordersPath) / \( orderID) "
@@ -105,7 +105,7 @@ public class OrdersRemote: Remote {
105105 ParameterKeys . page: String ( pageNumber) ,
106106 ParameterKeys . perPage: String ( pageSize) ,
107107 ParameterKeys . statusKey: Defaults . statusAny,
108- ParameterKeys . fields: ParameterValues . listFieldValues
108+ ParameterKeys . fields: ParameterValues . fieldValues
109109 ]
110110
111111 let path = Constants . ordersPath
@@ -288,21 +288,13 @@ public extension OrdersRemote {
288288 }
289289
290290 enum ParameterValues {
291- // Same as singleOrderFieldValues except we exclude the shipping field
292- static let listFieldValues : String = commonOrderFieldValues. joined ( separator: " , " )
293- static let singleOrderFieldValues : String = ( commonOrderFieldValues + singleOrderExtraFieldValues) . joined ( separator: " , " )
291+ static let fieldValues : String = commonOrderFieldValues. joined ( separator: " , " )
294292 private static let commonOrderFieldValues = [
295293 " id " , " parent_id " , " number " , " status " , " currency " , " customer_id " , " customer_note " , " date_created_gmt " , " date_modified_gmt " , " date_paid_gmt " ,
296294 " discount_total " , " discount_tax " , " shipping_total " , " shipping_tax " , " total " , " total_tax " , " payment_method " , " payment_method_title " ,
297- " payment_url " , " line_items " , " billing " , " coupon_lines " , " shipping_lines " , " refunds " , " fee_lines " , " order_key " , " tax_lines " , " meta_data " ,
295+ " payment_url " , " line_items " , " shipping " , " billing " , " coupon_lines " , " shipping_lines " , " refunds " , " fee_lines " , " order_key " , " tax_lines " , " meta_data " ,
298296 " is_editable " , " needs_payment " , " needs_processing "
299297 ]
300- // Use with caution. Any fields in here will be overwritten with empty values by
301- // `Order+ReadOnlyConvertible.swift: Order.update(with:)` when the list of orders is fetched.
302- // See p91TBi-7yL-p2 for discussion.
303- private static let singleOrderExtraFieldValues = [
304- " shipping "
305- ]
306298 }
307299
308300 /// Order fields supported for update
0 commit comments