Skip to content

Commit 8786773

Browse files
author
Sharma Elanthiriayan
committed
Order
- Rename array property holding `OrderTaxLine` into `taxes` to denote that it is an array of taxes.
1 parent bed0dd1 commit 8786773

File tree

20 files changed

+34
-34
lines changed

20 files changed

+34
-34
lines changed

‎Fakes/Fakes/Networking.generated.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ extension Order {
301301
coupons: .fake(),
302302
refunds: .fake(),
303303
fees: .fake(),
304-
tax: .fake()
304+
taxes: .fake()
305305
)
306306
}
307307
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ extension Order {
180180
coupons: CopiableProp<[OrderCouponLine]> = .copy,
181181
refunds: CopiableProp<[OrderRefundCondensed]> = .copy,
182182
fees: CopiableProp<[OrderFeeLine]> = .copy,
183-
tax: CopiableProp<[OrderTaxLine]> = .copy
183+
taxes: CopiableProp<[OrderTaxLine]> = .copy
184184
) -> Order {
185185
let siteID = siteID ?? self.siteID
186186
let orderID = orderID ?? self.orderID
@@ -209,7 +209,7 @@ extension Order {
209209
let coupons = coupons ?? self.coupons
210210
let refunds = refunds ?? self.refunds
211211
let fees = fees ?? self.fees
212-
let tax = tax ?? self.tax
212+
let taxes = taxes ?? self.taxes
213213

214214
return Order(
215215
siteID: siteID,
@@ -239,7 +239,7 @@ extension Order {
239239
coupons: coupons,
240240
refunds: refunds,
241241
fees: fees,
242-
tax: tax
242+
taxes: taxes
243243
)
244244
}
245245
}

‎Networking/Networking/Model/Order.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
3939
public let coupons: [OrderCouponLine]
4040
public let refunds: [OrderRefundCondensed]
4141
public let fees: [OrderFeeLine]
42-
public let tax: [OrderTaxLine]
42+
public let taxes: [OrderTaxLine]
4343

4444
/// Order struct initializer.
4545
///
@@ -70,7 +70,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
7070
coupons: [OrderCouponLine],
7171
refunds: [OrderRefundCondensed],
7272
fees: [OrderFeeLine],
73-
tax: [OrderTaxLine]) {
73+
taxes: [OrderTaxLine]) {
7474

7575
self.siteID = siteID
7676
self.orderID = orderID
@@ -103,7 +103,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
103103
self.coupons = coupons
104104
self.refunds = refunds
105105
self.fees = fees
106-
self.tax = tax
106+
self.taxes = taxes
107107
}
108108

109109

@@ -192,7 +192,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
192192
coupons: coupons,
193193
refunds: refunds,
194194
fees: fees,
195-
tax: tax)
195+
taxes: tax)
196196
}
197197

198198
public static var empty: Order {
@@ -223,7 +223,7 @@ public struct Order: Decodable, GeneratedCopiable, GeneratedFakeable {
223223
coupons: [],
224224
refunds: [],
225225
fees: [],
226-
tax: [])
226+
taxes: [])
227227
}
228228
}
229229

‎Networking/NetworkingTests/Mapper/OrderMapperTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@ final class OrderMapperTests: XCTestCase {
306306
func test_order_tax_lines_are_parsed_successfully() throws {
307307
let order = try XCTUnwrap(mapLoadOrderResponse())
308308

309-
XCTAssertNotNil(order.tax)
310-
XCTAssertEqual(order.tax.count, 1)
309+
XCTAssertNotNil(order.taxes)
310+
XCTAssertEqual(order.taxes.count, 1)
311311

312-
let tax = try XCTUnwrap(order.tax.first)
312+
let tax = try XCTUnwrap(order.taxes.first)
313313
XCTAssertEqual(tax.taxID, 1330)
314314
XCTAssertEqual(tax.rateCode, "US-NY-STATE-2")
315315
XCTAssertEqual(tax.rateID, 6)

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditOrderAddressForm.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ struct EditAddressForm_Previews: PreviewProvider {
372372
coupons: [],
373373
refunds: [],
374374
fees: [],
375-
tax: [])
375+
taxes: [])
376376

377377
static let sampleAddress = Address(firstName: "Johnny",
378378
lastName: "Appleseed",

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesFormViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ extension ShippingLabelPackagesFormViewModel {
468468
coupons: sampleCoupons(),
469469
refunds: [],
470470
fees: [],
471-
tax: [])
471+
taxes: [])
472472
}
473473

474474
static func sampleAddress() -> Address {

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetailsViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ extension ShippingLabelPackageDetailsViewModel {
384384
coupons: sampleCoupons(),
385385
refunds: [],
386386
fees: [],
387-
tax: [])
387+
taxes: [])
388388
}
389389

390390
static func sampleAddress() -> Address {

‎WooCommerce/WooCommerceTests/Tools/MockOrders.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class MockOrders {
3434
coupons: [],
3535
refunds: [],
3636
fees: [],
37-
tax: []
37+
taxes: []
3838
)
3939
}
4040

@@ -70,7 +70,7 @@ final class MockOrders {
7070
coupons: [],
7171
refunds: refunds,
7272
fees: fees,
73-
tax: [] // TODO: 5809 - Add sampleOrderTaxLines method
73+
taxes: [] // TODO: 5809 - Add sampleOrderTaxLines method
7474
)
7575
}
7676

@@ -118,7 +118,7 @@ final class MockOrders {
118118
coupons: [],
119119
refunds: [],
120120
fees: [],
121-
tax: [] // TODO: 5809 - Add sampleOrderTaxLines method
121+
taxes: [] // TODO: 5809 - Add sampleOrderTaxLines method
122122
)
123123
}
124124

@@ -192,7 +192,7 @@ final class MockOrders {
192192
coupons: [],
193193
refunds: [],
194194
fees: [],
195-
tax: [])
195+
taxes: [])
196196
}
197197

198198
/// An order with broken elements that hasn't been paid, inspired by `broken-order.json`
@@ -225,7 +225,7 @@ final class MockOrders {
225225
coupons: [],
226226
refunds: [],
227227
fees: [],
228-
tax: [])
228+
taxes: [])
229229
}
230230

231231
/// An address that may or may not be broken, that came from `broken-order.json`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private extension SummaryTableViewCellTests {
9494
coupons: [],
9595
refunds: [],
9696
fees: [],
97-
tax: [])
97+
taxes: [])
9898
}
9999
}
100100

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ private extension SummaryTableViewCellViewModelTests {
100100
coupons: [],
101101
refunds: [],
102102
fees: [],
103-
tax: [])
103+
taxes: [])
104104
}
105105
}

0 commit comments

Comments
 (0)