Skip to content

Commit b59d75f

Browse files
committed
Adds paymentURL to Order networking entity
1 parent 896852c commit b59d75f

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

Fakes/Fakes/Networking.generated.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ extension Order {
337337
totalTax: .fake(),
338338
paymentMethodID: .fake(),
339339
paymentMethodTitle: .fake(),
340+
paymentURL: .fake(),
340341
chargeID: .fake(),
341342
items: .fake(),
342343
billingAddress: .fake(),

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ extension Order {
257257
totalTax: CopiableProp<String> = .copy,
258258
paymentMethodID: CopiableProp<String> = .copy,
259259
paymentMethodTitle: CopiableProp<String> = .copy,
260+
paymentURL: NullableCopiableProp<URL> = .copy,
260261
chargeID: NullableCopiableProp<String> = .copy,
261262
items: CopiableProp<[OrderItem]> = .copy,
262263
billingAddress: NullableCopiableProp<Address> = .copy,
@@ -287,6 +288,7 @@ extension Order {
287288
let totalTax = totalTax ?? self.totalTax
288289
let paymentMethodID = paymentMethodID ?? self.paymentMethodID
289290
let paymentMethodTitle = paymentMethodTitle ?? self.paymentMethodTitle
291+
let paymentURL = paymentURL ?? self.paymentURL
290292
let chargeID = chargeID ?? self.chargeID
291293
let items = items ?? self.items
292294
let billingAddress = billingAddress ?? self.billingAddress
@@ -318,6 +320,7 @@ extension Order {
318320
totalTax: totalTax,
319321
paymentMethodID: paymentMethodID,
320322
paymentMethodTitle: paymentMethodTitle,
323+
paymentURL: paymentURL,
321324
chargeID: chargeID,
322325
items: items,
323326
billingAddress: billingAddress,

Networking/Networking/Model/Order.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
3131
public let totalTax: String
3232
public let paymentMethodID: String
3333
public let paymentMethodTitle: String
34+
public let paymentURL: URL?
3435
public let chargeID: String?
3536

3637
public let items: [OrderItem]
@@ -64,6 +65,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
6465
totalTax: String,
6566
paymentMethodID: String,
6667
paymentMethodTitle: String,
68+
paymentURL: URL?,
6769
chargeID: String?,
6870
items: [OrderItem]?,
6971
billingAddress: Address?,
@@ -97,6 +99,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
9799
self.totalTax = totalTax
98100
self.paymentMethodID = paymentMethodID
99101
self.paymentMethodTitle = paymentMethodTitle
102+
self.paymentURL = paymentURL
100103
self.chargeID = chargeID
101104

102105
self.items = items ?? []
@@ -143,6 +146,9 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
143146
let paymentMethodID = try container.decode(String.self, forKey: .paymentMethodID)
144147
let paymentMethodTitle = try container.decode(String.self, forKey: .paymentMethodTitle)
145148

149+
// "payment_url" is only available on stores stores with version >= 8.4.
150+
let paymentURL = try container.decodeIfPresent(URL.self, forKey: .paymentURL)
151+
146152
let allOrderMetaData = try? container.decode([OrderMetaData].self, forKey: .metadata)
147153
var chargeID: String? = nil
148154
chargeID = allOrderMetaData?.first(where: { $0.key == "_charge_id" })?.value
@@ -192,6 +198,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
192198
totalTax: totalTax,
193199
paymentMethodID: paymentMethodID,
194200
paymentMethodTitle: paymentMethodTitle,
201+
paymentURL: paymentURL,
195202
chargeID: chargeID,
196203
items: items,
197204
billingAddress: billingAddress,
@@ -224,6 +231,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
224231
totalTax: "",
225232
paymentMethodID: "",
226233
paymentMethodTitle: "",
234+
paymentURL: nil,
227235
chargeID: nil,
228236
items: [],
229237
billingAddress: nil,
@@ -264,6 +272,7 @@ internal extension Order {
264272
case totalTax = "total_tax"
265273
case paymentMethodID = "payment_method"
266274
case paymentMethodTitle = "payment_method_title"
275+
case paymentURL = "payment_url"
267276

268277
case items = "line_items"
269278
case shippingAddress = "shipping"
@@ -301,6 +310,7 @@ extension Order: Equatable {
301310
lhs.totalTax == rhs.totalTax &&
302311
lhs.paymentMethodID == rhs.paymentMethodID &&
303312
lhs.paymentMethodTitle == rhs.paymentMethodTitle &&
313+
lhs.paymentURL == rhs.paymentURL &&
304314
lhs.billingAddress == rhs.billingAddress &&
305315
lhs.shippingAddress == rhs.shippingAddress &&
306316
lhs.shippingLines.count == rhs.shippingLines.count &&

Yosemite/Yosemite/Model/Mocks/MockObjectGraph.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ extension MockObjectGraph {
230230
totalTax: "0",
231231
paymentMethodID: "0",
232232
paymentMethodTitle: "MasterCard",
233+
paymentURL: nil,
233234
chargeID: nil,
234235
items: items,
235236
billingAddress: customer.billingAddress,

Yosemite/Yosemite/Stores/Order/OrderFactory.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public enum OrderFactory {
2828
totalTax: "",
2929
paymentMethodID: "",
3030
paymentMethodTitle: "",
31+
paymentURL: nil,
3132
chargeID: nil,
3233
items: [],
3334
billingAddress: nil,

0 commit comments

Comments
 (0)