From 8327c8e3f26d1ef33fa5b5c1e4d6cdb2480b8634 Mon Sep 17 00:00:00 2001 From: iamgabrielma Date: Thu, 10 Jul 2025 18:05:05 +0700 Subject: [PATCH 1/3] persist sales_channel_filter to order settings --- .../Yosemite/Actions/AppSettingsAction.swift | 1 + .../MockAppSettingsActionHandler.swift | 3 +- .../Model/Orders/SalesChannelFilter.swift | 8 +++ .../Model/Orders/StoredOrderSettings.swift | 9 ++- .../Yosemite/Stores/AppSettingsStore.swift | 6 +- ...ettingsStoreTests+OrderFilterHistory.swift | 4 +- .../OrderListSyncBackgroundTask.swift | 3 +- .../FilterOrderListViewModel.swift | 55 +++++++++---------- .../Orders/OrdersRootViewController.swift | 5 +- 9 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift diff --git a/Modules/Sources/Yosemite/Actions/AppSettingsAction.swift b/Modules/Sources/Yosemite/Actions/AppSettingsAction.swift index b1ecf635c85..69d99dfa6f4 100644 --- a/Modules/Sources/Yosemite/Actions/AppSettingsAction.swift +++ b/Modules/Sources/Yosemite/Actions/AppSettingsAction.swift @@ -45,6 +45,7 @@ public enum AppSettingsAction: Action { dateRangeFilter: OrderDateRangeFilter?, productFilter: FilterOrdersByProduct?, customerFilter: CustomerFilter?, + salesChannelFilter: SalesChannelFilter?, onCompletion: (Error?) -> Void) /// Clears all the orders settings diff --git a/Modules/Sources/Yosemite/Model/Mocks/ActionHandlers/MockAppSettingsActionHandler.swift b/Modules/Sources/Yosemite/Model/Mocks/ActionHandlers/MockAppSettingsActionHandler.swift index f16b6f6f973..0c9f42c11eb 100644 --- a/Modules/Sources/Yosemite/Model/Mocks/ActionHandlers/MockAppSettingsActionHandler.swift +++ b/Modules/Sources/Yosemite/Model/Mocks/ActionHandlers/MockAppSettingsActionHandler.swift @@ -52,7 +52,8 @@ struct MockAppSettingsActionHandler: MockActionHandler { orderStatusesFilter: nil, dateRangeFilter: nil, productFilter: nil, - customerFilter: nil))) + customerFilter: nil, + salesChannelFilter: nil))) case .upsertProductsSettings(_, _, _, _, _, _, _, let onCompletion): onCompletion(nil) case .resetEligibilityErrorInfo, diff --git a/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift b/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift new file mode 100644 index 00000000000..bf488d7eb08 --- /dev/null +++ b/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift @@ -0,0 +1,8 @@ +import Foundation + +/// Used to filter orders by sales channel +/// +public enum SalesChannelFilter: String, Codable, Hashable { + case pointOfSale = "pos-rest-api" + case any = "any" +} diff --git a/Modules/Sources/Yosemite/Model/Orders/StoredOrderSettings.swift b/Modules/Sources/Yosemite/Model/Orders/StoredOrderSettings.swift index 7c4f07b0869..93f4a00df13 100644 --- a/Modules/Sources/Yosemite/Model/Orders/StoredOrderSettings.swift +++ b/Modules/Sources/Yosemite/Model/Orders/StoredOrderSettings.swift @@ -12,17 +12,20 @@ public struct StoredOrderSettings: Codable, Equatable { public let dateRangeFilter: OrderDateRangeFilter? public let productFilter: FilterOrdersByProduct? public let customerFilter: CustomerFilter? + public let salesChannelFilter: SalesChannelFilter? public init(siteID: Int64, orderStatusesFilter: [OrderStatusEnum]?, dateRangeFilter: OrderDateRangeFilter?, productFilter: FilterOrdersByProduct?, - customerFilter: CustomerFilter?) { + customerFilter: CustomerFilter?, + salesChannelFilter: SalesChannelFilter?) { self.siteID = siteID self.orderStatusesFilter = orderStatusesFilter self.dateRangeFilter = dateRangeFilter self.productFilter = productFilter self.customerFilter = customerFilter + self.salesChannelFilter = salesChannelFilter } public func numberOfActiveFilters() -> Int { @@ -39,6 +42,9 @@ public struct StoredOrderSettings: Codable, Equatable { if customerFilter != nil { total += 1 } + if let salesChannelFilter = salesChannelFilter, case .pointOfSale = salesChannelFilter { + total += 1 + } return total } @@ -51,6 +57,7 @@ public struct StoredOrderSettings: Codable, Equatable { case dateRangeFilter = "date_range_filter" case productFilter = "product_filter" case customerFilter = "customer_filter" + case salesChannelFilter = "sales_channel_filter" } } diff --git a/Modules/Sources/Yosemite/Stores/AppSettingsStore.swift b/Modules/Sources/Yosemite/Stores/AppSettingsStore.swift index 3b3bcaf1e92..7b9ba97f944 100644 --- a/Modules/Sources/Yosemite/Stores/AppSettingsStore.swift +++ b/Modules/Sources/Yosemite/Stores/AppSettingsStore.swift @@ -132,12 +132,14 @@ public class AppSettingsStore: Store { let dateRangeFilter, let productFilter, let customerFilter, + let salesChannelFilter, let onCompletion): upsertOrdersSettings(siteID: siteID, orderStatusesFilter: orderStatusesFilter, dateRangeFilter: dateRangeFilter, productFilter: productFilter, customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter, onCompletion: onCompletion) case .resetOrdersSettings: resetOrdersSettings() @@ -716,6 +718,7 @@ private extension AppSettingsStore { dateRangeFilter: OrderDateRangeFilter?, productFilter: FilterOrdersByProduct?, customerFilter: CustomerFilter?, + salesChannelFilter: SalesChannelFilter?, onCompletion: (Error?) -> Void) { var existingSettings: [Int64: StoredOrderSettings.Setting] = [:] if let storedSettings: StoredOrderSettings = try? fileStorage.data(for: ordersSettingsURL) { @@ -726,7 +729,8 @@ private extension AppSettingsStore { orderStatusesFilter: orderStatusesFilter, dateRangeFilter: dateRangeFilter, productFilter: productFilter, - customerFilter: customerFilter) + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) existingSettings[siteID] = newSettings let newStoredOrderSettings = StoredOrderSettings(settings: existingSettings) diff --git a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift index 05e91db4d0e..fbcc59d1b78 100644 --- a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift +++ b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift @@ -155,11 +155,13 @@ private extension AppSettingsStoreTests_OrderFilterHistory { let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate) let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product") let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1)) + let salesChannelFilter = SalesChannelFilter(filter: .pointOfSale) return StoredOrderSettings.Setting(siteID: siteID, orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter) + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) } func insertMockFilter(filter: StoredOrderSettings.Setting, using store: AppSettingsStore) async throws { diff --git a/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift b/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift index aac7cf3be61..886cd74aed0 100644 --- a/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift +++ b/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift @@ -73,11 +73,12 @@ private struct CurrentOrderListSyncUseCase { let action = AppSettingsAction.loadOrdersSettings(siteID: siteID) { (result) in switch result { case .success(let settings): + // Cannot convert value of type 'SalesChannelFilter?' to expected argument type 'FilterOrderListViewModel.SalesChannelFilter?' let filters = FilterOrderListViewModel.Filters(orderStatus: settings.orderStatusesFilter, dateRange: settings.dateRangeFilter, product: settings.productFilter, customer: settings.customerFilter, - salesChannel: nil, // TODO: Filter persistence WOOMOB-712 + salesChannel: settings.salesChannelFilter, numberOfActiveFilters: settings.numberOfActiveFilters()) continuation.resume(returning: filters) case .failure: diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilterOrderListViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilterOrderListViewModel.swift index 0e63f8c88c1..99aeb550ce0 100644 --- a/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilterOrderListViewModel.swift +++ b/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilterOrderListViewModel.swift @@ -142,7 +142,7 @@ final class FilterOrderListViewModel: FilterListViewModel { dateRange: item.dateRangeFilter, product: item.productFilter, customer: item.customerFilter, - salesChannel: nil, // TODO: Filter persistence WOOMOB-712 + salesChannel: item.salesChannelFilter, numberOfActiveFilters: item.numberOfActiveFilters()) } continuation.resume(returning: filters) @@ -168,7 +168,8 @@ final class FilterOrderListViewModel: FilterListViewModel { orderStatusesFilter: filter.orderStatus, dateRangeFilter: filter.dateRange, productFilter: filter.product, - customerFilter: filter.customer) + customerFilter: filter.customer, + salesChannelFilter: filter.salesChannel) stores.dispatch(AppSettingsAction.upsertOrderFilterHistory(filter: settings, onCompletion: { error in if let error { DDLogError("⛔️ Error saving filter history: \(error)") @@ -182,7 +183,8 @@ final class FilterOrderListViewModel: FilterListViewModel { orderStatusesFilter: filter.orderStatus, dateRangeFilter: filter.dateRange, productFilter: filter.product, - customerFilter: filter.customer) + customerFilter: filter.customer, + salesChannelFilter: filter.salesChannel) stores.dispatch(AppSettingsAction.removeFromOrderFilterHistory(filter: settings, onCompletion: { error in if let error { DDLogError("⛔️ Error removing from filter history: \(error)") @@ -266,7 +268,7 @@ extension FilterOrderListViewModel.OrderListFilter { listSelectorConfig: .customer(siteID: siteID), selectedValue: filters.customer) case .salesChannel: - let salesChannelOptions: [FilterOrderListViewModel.SalesChannelFilter] = [.any, .pointOfSale] + let salesChannelOptions: [SalesChannelFilter] = [.any, .pointOfSale] return FilterTypeViewModel(title: title, listSelectorConfig: .staticOptions(options: salesChannelOptions), selectedValue: filters.salesChannel) @@ -377,33 +379,28 @@ extension CustomerFilter: FilterType { var isActive: Bool { true } } -extension FilterOrderListViewModel { - enum SalesChannelFilter: FilterType { - case pointOfSale - case any - - var description: String { - switch self { - case .pointOfSale: - return NSLocalizedString( - "salesChannelFilter.row.pos.description", - value: "Point of Sale", - comment: "Description for the Sales channel filter option, when selecting 'Point of Sale' orders") - case .any: - return NSLocalizedString( - "salesChannelFilter.row.any.description", - value: "Any", - comment: "Description for the Sales channel filter option, when selecting 'Any' order") - } +extension SalesChannelFilter: FilterType { + var description: String { + switch self { + case .pointOfSale: + return NSLocalizedString( + "salesChannelFilter.row.pos.description", + value: "Point of Sale", + comment: "Description for the Sales channel filter option, when selecting 'Point of Sale' orders") + case .any: + return NSLocalizedString( + "salesChannelFilter.row.any.description", + value: "Any", + comment: "Description for the Sales channel filter option, when selecting 'Any' order") } + } - var isActive: Bool { - switch self { - case .pointOfSale: - return true - case .any: - return false - } + var isActive: Bool { + switch self { + case .pointOfSale: + return true + case .any: + return false } } } diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift index f8fbe34f511..066971cdc8c 100644 --- a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift +++ b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift @@ -447,7 +447,7 @@ private extension OrdersRootViewController { dateRange: settings.dateRangeFilter, product: settings.productFilter, customer: settings.customerFilter, - salesChannel: nil, // TODO: Filter persistence WOOMOB-712 + salesChannel: settings.salesChannelFilter, numberOfActiveFilters: settings.numberOfActiveFilters()) case .failure(let error): print("It was not possible to sync local orders settings: \(String(describing: error))") @@ -464,7 +464,8 @@ private extension OrdersRootViewController { orderStatusesFilter: filters.orderStatus, dateRangeFilter: filters.dateRange, productFilter: filters.product, - customerFilter: filters.customer) { error in + customerFilter: filters.customer, + salesChannelFilter: filters.salesChannel) { error in if error != nil { assertionFailure("It was not possible to store order settings due to an error: \(String(describing: error))") } From 2211134d9b951e3f23ec18d3431e9b91052740ce Mon Sep 17 00:00:00 2001 From: iamgabrielma Date: Mon, 14 Jul 2025 14:38:27 +0700 Subject: [PATCH 2/3] update tests --- ...ettingsStoreTests+OrderFilterHistory.swift | 2 +- ...AppSettingsStoreTests+OrdersSettings.swift | 29 ++++++++++++------- .../OrderListSyncBackgroundTask.swift | 1 - ...ificationBackgroundSynchronizerTests.swift | 7 ++++- .../FilterOrderListViewModelTests.swift | 12 ++++---- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift index fbcc59d1b78..6daf505116a 100644 --- a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift +++ b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift @@ -155,7 +155,7 @@ private extension AppSettingsStoreTests_OrderFilterHistory { let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate) let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product") let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1)) - let salesChannelFilter = SalesChannelFilter(filter: .pointOfSale) + let salesChannelFilter = SalesChannelFilter.pointOfSale return StoredOrderSettings.Setting(siteID: siteID, orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, diff --git a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift index 14c6f1de3bc..ca71a294e31 100644 --- a/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift +++ b/Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift @@ -51,11 +51,13 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase { let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate) let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product") let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1)) + let salesChannelFilter = SalesChannelFilter.pointOfSale let orderSettings = StoredOrderSettings.Setting(siteID: siteID, orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter ) // When @@ -73,7 +75,8 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase { orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter) { error in + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) { error in XCTAssertNil(error) } subject.onAction(writeAction) @@ -102,6 +105,7 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase { let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate) let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product 1") let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1)) + let salesChannelFilter = SalesChannelFilter.any let orderStatuses2: [OrderStatusEnum] = [.pending, .cancelled] let startDate2 = Date().yearStart @@ -109,24 +113,28 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase { let dateRange2 = OrderDateRangeFilter(filter: .custom, startDate: startDate2, endDate: endDate2) let productFilter2 = FilterOrdersByProduct(id: 2, name: "Sample product 2") let customerFilter2 = CustomerFilter(customer: Customer.fake().copy(customerID: 2)) + let salesChannelFilter2 = SalesChannelFilter.pointOfSale let orderSettings1 = StoredOrderSettings.Setting(siteID: siteID1, - orderStatusesFilter: orderStatuses, - dateRangeFilter: dateRange, + orderStatusesFilter: orderStatuses, + dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter) + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) let orderSettings2 = StoredOrderSettings.Setting(siteID: siteID2, - orderStatusesFilter: orderStatuses2, - dateRangeFilter: dateRange2, + orderStatusesFilter: orderStatuses2, + dateRangeFilter: dateRange2, productFilter: productFilter2, - customerFilter: customerFilter2) + customerFilter: customerFilter2, + salesChannelFilter: salesChannelFilter2) // When let writeAction1 = AppSettingsAction.upsertOrdersSettings(siteID: siteID1, orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter) { error in + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) { error in XCTAssertNil(error) } subject.onAction(writeAction1) @@ -135,7 +143,8 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase { orderStatusesFilter: orderStatuses2, dateRangeFilter: dateRange2, productFilter: productFilter2, - customerFilter: customerFilter2) { error in + customerFilter: customerFilter2, + salesChannelFilter: salesChannelFilter2) { error in XCTAssertNil(error) } subject.onAction(writeAction2) diff --git a/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift b/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift index 886cd74aed0..01ca80c83fc 100644 --- a/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift +++ b/WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift @@ -73,7 +73,6 @@ private struct CurrentOrderListSyncUseCase { let action = AppSettingsAction.loadOrdersSettings(siteID: siteID) { (result) in switch result { case .success(let settings): - // Cannot convert value of type 'SalesChannelFilter?' to expected argument type 'FilterOrderListViewModel.SalesChannelFilter?' let filters = FilterOrderListViewModel.Filters(orderStatus: settings.orderStatusesFilter, dateRange: settings.dateRangeFilter, product: settings.productFilter, diff --git a/WooCommerce/WooCommerceTests/Notifications/PushNotificationBackgroundSynchronizerTests.swift b/WooCommerce/WooCommerceTests/Notifications/PushNotificationBackgroundSynchronizerTests.swift index b35a316c8fb..a1055162e2f 100644 --- a/WooCommerce/WooCommerceTests/Notifications/PushNotificationBackgroundSynchronizerTests.swift +++ b/WooCommerce/WooCommerceTests/Notifications/PushNotificationBackgroundSynchronizerTests.swift @@ -86,7 +86,12 @@ private extension PushNotificationBackgroundSynchronizerTests { stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in switch action { case let .loadOrdersSettings(_, onCompletion): - onCompletion(.success(.init(siteID: order.siteID, orderStatusesFilter: nil, dateRangeFilter: nil, productFilter: nil, customerFilter: nil))) + onCompletion(.success(.init(siteID: order.siteID, + orderStatusesFilter: nil, + dateRangeFilter: nil, + productFilter: nil, + customerFilter: nil, + salesChannelFilter: nil))) default: break } diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Filters/FilterOrderListViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Filters/FilterOrderListViewModelTests.swift index 612aa059e2c..d2b0a10523c 100644 --- a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Filters/FilterOrderListViewModelTests.swift +++ b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Filters/FilterOrderListViewModelTests.swift @@ -105,8 +105,8 @@ final class FilterOrderListViewModelTests: XCTestCase { dateRange: OrderDateRangeFilter(filter: .today), product: FilterOrdersByProduct(id: 1, name: "Sample product"), customer: CustomerFilter(customer: Customer.fake().copy(customerID: 1)), - salesChannel: nil, - numberOfActiveFilters: 4) + salesChannel: SalesChannelFilter.pointOfSale, + numberOfActiveFilters: 5) let viewModel = FilterOrderListViewModel(filters: filters, allowedStatuses: [], siteID: siteID, @@ -122,13 +122,13 @@ final class FilterOrderListViewModelTests: XCTestCase { dateRange: result1.dateRangeFilter, product: result1.productFilter, customer: result1.customerFilter, - salesChannel: nil, + salesChannel: result1.salesChannelFilter, numberOfActiveFilters: result1.numberOfActiveFilters()), FilterOrderListViewModel.Filters(orderStatus: result2.orderStatusesFilter, dateRange: result2.dateRangeFilter, product: result2.productFilter, customer: result2.customerFilter, - salesChannel: nil, + salesChannel: result2.salesChannelFilter, numberOfActiveFilters: result2.numberOfActiveFilters()) ]) } @@ -215,10 +215,12 @@ private extension FilterOrderListViewModelTests { let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate) let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product") let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1)) + let salesChannelFilter = SalesChannelFilter.pointOfSale return StoredOrderSettings.Setting(siteID: siteID, orderStatusesFilter: orderStatuses, dateRangeFilter: dateRange, productFilter: productFilter, - customerFilter: customerFilter) + customerFilter: customerFilter, + salesChannelFilter: salesChannelFilter) } } From 7cdb10bcddfd45d457dbc1d764c58eb0a24ff8a7 Mon Sep 17 00:00:00 2001 From: iamgabrielma Date: Tue, 15 Jul 2025 10:19:15 +0700 Subject: [PATCH 3/3] remove raw values from SalesChannelFilter --- .../Sources/Yosemite/Model/Orders/SalesChannelFilter.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift b/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift index bf488d7eb08..71232a8bfac 100644 --- a/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift +++ b/Modules/Sources/Yosemite/Model/Orders/SalesChannelFilter.swift @@ -3,6 +3,6 @@ import Foundation /// Used to filter orders by sales channel /// public enum SalesChannelFilter: String, Codable, Hashable { - case pointOfSale = "pos-rest-api" - case any = "any" + case pointOfSale + case any }