Skip to content

Commit 9d0135d

Browse files
staskusstaskus
committed
Remove variationID as an unused parameter from POSOrderItem
1 parent ca5d775 commit 9d0135d

File tree

5 files changed

+0
-25
lines changed

5 files changed

+0
-25
lines changed

‎Modules/Sources/Yosemite/Model/Copiable/Models+Copiable.generated.swift‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ extension Yosemite.POSOrderItem {
114114
itemID: CopiableProp<Int64> = .copy,
115115
name: CopiableProp<String> = .copy,
116116
productID: CopiableProp<Int64> = .copy,
117-
variationID: CopiableProp<Int64> = .copy,
118117
quantity: CopiableProp<Decimal> = .copy,
119118
price: CopiableProp<NSDecimalNumber> = .copy,
120119
subtotal: CopiableProp<String> = .copy,
@@ -125,7 +124,6 @@ extension Yosemite.POSOrderItem {
125124
let itemID = itemID ?? self.itemID
126125
let name = name ?? self.name
127126
let productID = productID ?? self.productID
128-
let variationID = variationID ?? self.variationID
129127
let quantity = quantity ?? self.quantity
130128
let price = price ?? self.price
131129
let subtotal = subtotal ?? self.subtotal
@@ -137,7 +135,6 @@ extension Yosemite.POSOrderItem {
137135
itemID: itemID,
138136
name: name,
139137
productID: productID,
140-
variationID: variationID,
141138
quantity: quantity,
142139
price: price,
143140
subtotal: subtotal,

‎Modules/Sources/Yosemite/PointOfSale/OrderList/POSOrderItem.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public struct POSOrderItem: Equatable, Hashable, GeneratedCopiable {
77
public let itemID: Int64
88
public let name: String
99
public let productID: Int64
10-
public let variationID: Int64
1110
public let quantity: Decimal
1211
public let price: NSDecimalNumber
1312
public let subtotal: String
@@ -18,7 +17,6 @@ public struct POSOrderItem: Equatable, Hashable, GeneratedCopiable {
1817
public init(itemID: Int64,
1918
name: String,
2019
productID: Int64,
21-
variationID: Int64,
2220
quantity: Decimal,
2321
price: NSDecimalNumber,
2422
subtotal: String,
@@ -28,7 +26,6 @@ public struct POSOrderItem: Equatable, Hashable, GeneratedCopiable {
2826
self.itemID = itemID
2927
self.name = name
3028
self.productID = productID
31-
self.variationID = variationID
3229
self.quantity = quantity
3330
self.price = price
3431
self.subtotal = subtotal
@@ -45,7 +42,6 @@ public extension POSOrderItem {
4542
itemID: orderItem.itemID,
4643
name: orderItem.name,
4744
productID: orderItem.productID,
48-
variationID: orderItem.variationID,
4945
quantity: orderItem.quantity,
5046
price: orderItem.price,
5147
subtotal: orderItem.subtotal,

‎WooCommerce/Classes/POS/Utils/PreviewHelpers.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,12 @@ struct POSPreviewHelpers {
256256
POSOrderItem(itemID: 1,
257257
name: "Premium Coffee Beans",
258258
productID: 101,
259-
variationID: 0,
260259
quantity: 2.0,
261260
price: NSDecimalNumber(string: "12.50"), subtotal: "25.00", total: "25.00", attributes: []),
262261
POSOrderItem(
263262
itemID: 2,
264263
name: "Organic Tea - Earl Grey",
265264
productID: 102,
266-
variationID: 203,
267265
quantity: 1.0,
268266
price: NSDecimalNumber(string: "15.99"),
269267
subtotal: "15.99",
@@ -301,14 +299,12 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
301299
POSOrderItem(itemID: 1,
302300
name: "Premium Coffee Beans",
303301
productID: 101,
304-
variationID: 0,
305302
quantity: 2.0,
306303
price: NSDecimalNumber(string: "12.50"), subtotal: "25.00", total: "25.00", attributes: []),
307304
POSOrderItem(
308305
itemID: 2,
309306
name: "Organic Tea - Earl Grey",
310307
productID: 102,
311-
variationID: 203,
312308
quantity: 1.0,
313309
price: NSDecimalNumber(string: "15.99"),
314310
subtotal: "15.99",
@@ -341,7 +337,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
341337
itemID: 3,
342338
name: "Artisan Chocolate Box",
343339
productID: 103,
344-
variationID: 0,
345340
quantity: 3.0,
346341
price: NSDecimalNumber(string: "19.99"),
347342
subtotal: "59.97",
@@ -352,7 +347,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
352347
itemID: 4,
353348
name: "Gourmet Cookie Set - Mixed",
354349
productID: 104,
355-
variationID: 401,
356350
quantity: 1.0,
357351
price: NSDecimalNumber(string: "29.99"),
358352
subtotal: "29.99",
@@ -391,7 +385,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
391385
itemID: 5,
392386
name: "Simple Product",
393387
productID: 105,
394-
variationID: 0,
395388
quantity: 1.0,
396389
price: NSDecimalNumber(string: "12.50"),
397390
subtotal: "12.50",
@@ -421,7 +414,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
421414
itemID: 6,
422415
name: "Variable Product - Red Large",
423416
productID: 106,
424-
variationID: 601,
425417
quantity: 1.0,
426418
price: NSDecimalNumber(string: "32.00"),
427419
subtotal: "32.00",
@@ -454,7 +446,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
454446
itemID: 7,
455447
name: "Bulk Product Pack",
456448
productID: 107,
457-
variationID: 0,
458449
quantity: 5.0,
459450
price: NSDecimalNumber(string: "19.99"),
460451
subtotal: "99.95",
@@ -465,7 +456,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
465456
itemID: 8,
466457
name: "Accessory Kit - Premium",
467458
productID: 108,
468-
variationID: 801,
469459
quantity: 2.0,
470460
price: NSDecimalNumber(string: "24.99"),
471461
subtotal: "49.98",
@@ -510,7 +500,6 @@ final class PointOfSalePreviewOrderListController: PointOfSaleOrderListControlle
510500
itemID: 9,
511501
name: "Tax-free Item",
512502
productID: 109,
513-
variationID: 0,
514503
quantity: 2.0,
515504
price: NSDecimalNumber(string: "11.00"),
516505
subtotal: "22.00",

‎WooCommerce/WooCommerceTests/POS/Mocks/MockPointOfSaleOrderListService.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ extension MockPointOfSaleOrderListService {
8181
itemID: 1,
8282
name: "Coffee",
8383
productID: 101,
84-
variationID: 0,
8584
quantity: 2,
8685
price: NSDecimalNumber(string: "10.00"),
8786
subtotal: "20.00",
@@ -92,7 +91,6 @@ extension MockPointOfSaleOrderListService {
9291
itemID: 2,
9392
name: "Muffin",
9493
productID: 102,
95-
variationID: 0,
9694
quantity: 1,
9795
price: NSDecimalNumber(string: "5.99"),
9896
subtotal: "5.99",
@@ -121,7 +119,6 @@ extension MockPointOfSaleOrderListService {
121119
itemID: 3,
122120
name: "Tea",
123121
productID: 103,
124-
variationID: 0,
125122
quantity: 1,
126123
price: NSDecimalNumber(string: "15.50"),
127124
subtotal: "15.50",
@@ -156,7 +153,6 @@ extension MockPointOfSaleOrderListService {
156153
itemID: 4,
157154
name: "Sandwich",
158155
productID: 104,
159-
variationID: 0,
160156
quantity: 1,
161157
price: NSDecimalNumber(string: "12.00"),
162158
subtotal: "12.00",
@@ -167,7 +163,6 @@ extension MockPointOfSaleOrderListService {
167163
itemID: 5,
168164
name: "Soup",
169165
productID: 105,
170-
variationID: 0,
171166
quantity: 2,
172167
price: NSDecimalNumber(string: "15.375"),
173168
subtotal: "30.75",
@@ -196,7 +191,6 @@ extension MockPointOfSaleOrderListService {
196191
itemID: 6,
197192
name: "Cookies",
198193
productID: 106,
199-
variationID: 0,
200194
quantity: 1,
201195
price: NSDecimalNumber(string: "12.00"),
202196
subtotal: "12.00",

‎WooCommerce/WooCommerceTests/POS/ViewHelpers/PointOfSaleOrderDetailsViewHelperTests.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ private func makePOSOrderItem(
449449
itemID: itemID,
450450
name: name,
451451
productID: productID,
452-
variationID: variationID,
453452
quantity: quantity,
454453
price: price,
455454
subtotal: subtotal,

0 commit comments

Comments
 (0)