[Woo POS] Allow item list switch between Products and Coupons

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -72,7 +72,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSale:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .enableCouponsInPointOfSale:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return false
         case .googleAdsCampaignCreationOnWebView:
             return true
         case .backgroundTasks:

WooCommerce/Classes/POS/Controllers/PointOfSaleItemsController.swift

@@ -6,6 +6,11 @@ import enum Yosemite.PointOfSaleItemServiceError
 import struct Yosemite.POSVariableParentProduct
 import class Yosemite.Store
 
+enum POSItemType {
+    case products
+    case coupons
+}
+
 @available(iOS 17.0, *)
 protocol PointOfSaleItemsControllerProtocol {
     var itemsViewState: ItemsViewState { get }
@@ -15,6 +20,8 @@ protocol PointOfSaleItemsControllerProtocol {
     func refreshItems(base: ItemListBaseItem) async
     /// Loads the next page of items for a given base item.
     func loadNextItems(base: ItemListBaseItem) async
+    /// Toggles between item types
+    func toggleItemType() async
 }
 
 @available(iOS 17.0, *)
@@ -25,6 +32,7 @@ protocol PointOfSaleItemsControllerProtocol {
     private let paginationTracker: AsyncPaginationTracker
     private var childPaginationTrackers: [POSItem: AsyncPaginationTracker] = [:]
     private let itemProvider: PointOfSaleItemServiceProtocol
+    private var itemType: POSItemType = .products
 
     init(itemProvider: PointOfSaleItemServiceProtocol) {
         self.itemProvider = itemProvider
@@ -42,6 +50,11 @@ protocol PointOfSaleItemsControllerProtocol {
         await loadFirstPage(base: base)
     }
 
+    func toggleItemType() async {
+        itemType = (itemType == .products) ? .coupons : .products
+        await loadFirstPage(base: .root)
+    }
+
     @MainActor
     private func loadFirstPage(base: ItemListBaseItem) async {
         switch base {
@@ -158,14 +171,6 @@ protocol PointOfSaleItemsControllerProtocol {
     }
 }
 
-@available(iOS 17.0, *)
-private extension PointOfSaleItemsController {
-    func loadPointOfSaleCoupons() {
-        let posCoupons = itemProvider.providePointOfSaleCoupons()
-        debugPrint(posCoupons)
-    }
-}
-
 @available(iOS 17.0, *)
 private extension PointOfSaleItemsController {
     func setLoadingState(base: ItemListBaseItem) {
@@ -201,7 +206,10 @@ private extension PointOfSaleItemsController {
     @MainActor
     func fetchItems(pageNumber: Int, appendToExistingItems: Bool = true) async throws -> Bool {
         do {
-            let pagedItems = try await itemProvider.providePointOfSaleItems(pageNumber: pageNumber)
+            let pagedItems = itemType == .products
+                ? try await itemProvider.providePointOfSaleItems(pageNumber: pageNumber)
+                : try itemProvider.providePointOfSaleCoupons()
+
             let newItems = pagedItems.items
             var allItems = appendToExistingItems ? itemsViewState.itemsStack.root.items : []
             let uniqueNewItems = newItems.filter { newItem in

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

@@ -92,6 +92,11 @@ protocol PointOfSaleAggregateModelProtocol {
 // MARK: - ItemList
 @available(iOS 17.0, *)
 extension PointOfSaleAggregateModel {
+    @MainActor
+    func toggleItemType() async {
+        await itemsController.toggleItemType()
+    }
+
     @MainActor
     func loadItems(base: ItemListBaseItem) async {
         await itemsController.loadItems(base: base)
@@ -120,6 +125,7 @@ private extension POSItem {
         case .variableParentProduct:
             return nil
         case .coupon:
+            debugPrint("Not implemented. TODO: Make POSCoupon POSOrderable")
             return nil
         }
     }

WooCommerce/Classes/POS/Presentation/Item Selector/CouponCardView.swift

@@ -0,0 +1,17 @@
+import SwiftUI
+import struct Yosemite.POSCoupon
+
+struct CouponCardView: View {
+    private let coupon: POSCoupon
+
+    init(coupon: POSCoupon) {
+        self.coupon = coupon
+    }
+
+    var body: some View {
+        HStack {
+            Text(coupon.id.uuidString)
+            Text(coupon.couponID.description)
+        }
+    }
+}

WooCommerce/Classes/POS/Presentation/Item Selector/ItemList.swift

@@ -116,8 +116,12 @@ private struct ItemListRow: View {
             }, label: {
                 VariationCardView(variation: variation)
             })
-        case .coupon:
-            EmptyView()
+        case let .coupon(coupon):
+            Button(action: {
+                posModel.addToCart(item)
+            }, label: {
+                CouponCardView(coupon: coupon)
+            })
         }
     }
 }

WooCommerce/Classes/POS/Presentation/ItemListView.swift

@@ -1,6 +1,7 @@
 import SwiftUI
 import enum Yosemite.POSItem
 import protocol Yosemite.POSOrderableItem
+import struct Yosemite.POSCoupon
 
 @available(iOS 17.0, *)
 struct ItemListView: View {
@@ -16,6 +17,10 @@ struct ItemListView: View {
     @AppStorage(BannerState.isSimpleProductsOnlyBannerDismissedKey)
     private var isHeaderBannerDismissed: Bool = false
 
+    private var shouldShowCoupons: Bool {
+        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.enableCouponsInPointOfSale)
+    }
+
     var body: some View {
         if #available(iOS 18.0, *) {
             NavigationStack {
@@ -33,6 +38,21 @@ struct ItemListView: View {
     var content: some View {
         VStack {
             headerView
+
+            HStack {
+                Button(action: {
+                    toggleItemType()
+                }, label: {
+                    Text("Products")
+                })
+                Button(action: {
+                    toggleItemType()
+                }, label: {
+                    Text("Coupons")
+                })
+            }
+            .renderedIf(shouldShowCoupons)
+
             switch itemListState {
             case .loading(let items),
                     .loaded(let items, _),
@@ -139,6 +159,12 @@ private extension ItemListView {
     var shouldShowHeaderBanner: Bool {
         itemListState.eligibleToShowSimpleProductsBanner && !isHeaderBannerDismissed
     }
+
+    func toggleItemType() {
+        Task {
+            await posModel.toggleItemType()
+        }
+    }
 }
 
 private extension ItemListState {

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -57,8 +57,8 @@ final class PointOfSalePreviewItemService: PointOfSaleItemServiceProtocol {
                           formattedPrice: "$1.00")
     }
 
-    func providePointOfSaleCoupons() -> [POSItem] {
-        []
+    func providePointOfSaleCoupons() throws -> PagedItems<POSItem> {
+        .init(items: [], hasMorePages: true)
     }
 }
 
@@ -91,6 +91,10 @@ final class PointOfSalePreviewItemsController: PointOfSaleItemsControllerProtoco
     private func loadInitialChildItems(for parent: POSItem) async {
         // Set `itemsViewState` instead.
     }
+
+    func toggleItemType() async {
+        //
+    }
 }
 
 private var mockItems: [POSItem] {

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -1590,6 +1590,7 @@
 		68600A912C65BC9C00252EDD /* PointOfSaleItemListEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68600A902C65BC9C00252EDD /* PointOfSaleItemListEmptyView.swift */; };
 		68625DE62D4134D70042B231 /* DynamicVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68625DE52D4134D50042B231 /* DynamicVStack.swift */; };
 		68674D312B6C895D00E93FBD /* ReceiptEligibilityUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68674D302B6C895D00E93FBD /* ReceiptEligibilityUseCaseTests.swift */; };
+		6868153B2D83F2A4006778A3 /* CouponCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6868153A2D83F2A2006778A3 /* CouponCardView.swift */; };
 		68709D3D2A2ED94900A7FA6C /* UpgradesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68709D3C2A2ED94900A7FA6C /* UpgradesView.swift */; };
 		68709D402A2EE2DC00A7FA6C /* UpgradesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68709D3F2A2EE2DC00A7FA6C /* UpgradesViewModel.swift */; };
 		6879B8DB287AFFA100A0F9A8 /* CardReaderManualsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6879B8DA287AFFA100A0F9A8 /* CardReaderManualsViewModelTests.swift */; };
@@ -4752,6 +4753,7 @@
 		68600A902C65BC9C00252EDD /* PointOfSaleItemListEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleItemListEmptyView.swift; sourceTree = "<group>"; };
 		68625DE52D4134D50042B231 /* DynamicVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicVStack.swift; sourceTree = "<group>"; };
 		68674D302B6C895D00E93FBD /* ReceiptEligibilityUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptEligibilityUseCaseTests.swift; sourceTree = "<group>"; };
+		6868153A2D83F2A2006778A3 /* CouponCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponCardView.swift; sourceTree = "<group>"; };
 		68709D3C2A2ED94900A7FA6C /* UpgradesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradesView.swift; sourceTree = "<group>"; };
 		68709D3F2A2EE2DC00A7FA6C /* UpgradesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradesViewModel.swift; sourceTree = "<group>"; };
 		6879B8DA287AFFA100A0F9A8 /* CardReaderManualsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardReaderManualsViewModelTests.swift; sourceTree = "<group>"; };
@@ -7513,6 +7515,7 @@
 		029149792D2682DF00F7B3B3 /* Item Selector */ = {
 			isa = PBXGroup;
 			children = (
+				6868153A2D83F2A2006778A3 /* CouponCardView.swift */,
 				0291497A2D2682FF00F7B3B3 /* ItemList.swift */,
 				20EFAEA52D35337F00D35F9C /* ItemListErrorCardView.swift */,
 				026826A42BF59DF60036F959 /* SimpleProductCardView.swift */,
@@ -16206,6 +16209,7 @@
 				DED039292BC7A04B005D0571 /* StorePerformanceView.swift in Sources */,
 				03E471C4293A1F8D001A58AD /* BuiltInReaderConnectionAlertsProvider.swift in Sources */,
 				20CC1EDD2AFA99DF006BD429 /* InPersonPaymentsMenuViewModel.swift in Sources */,
+				6868153B2D83F2A4006778A3 /* CouponCardView.swift in Sources */,
 				011DF3462C53A919000AFDD9 /* PointOfSaleCardPresentPaymentActivityIndicatingMessageView.swift in Sources */,
 				D8736B7522F1FE1600A14A29 /* BadgeLabel.swift in Sources */,
 				EE4C45652C352D60001A3D94 /* AIToneVoice.swift in Sources */,

WooCommerce/WooCommerceTests/POS/Mocks/MockPOSItemProvider.swift

@@ -46,8 +46,8 @@ final class MockPointOfSaleItemService: PointOfSaleItemServiceProtocol {
         return .init(items: MockPointOfSaleItemService.makeInitialVariationItems(), hasMorePages: shouldSimulateTwoPagesOfVariations)
     }
 
-    func providePointOfSaleCoupons() -> [Yosemite.POSItem] {
-        []
+    func providePointOfSaleCoupons() throws -> PagedItems<POSItem> {
+        .init(items: [], hasMorePages: true)
     }
 }
 

WooCommerce/WooCommerceTests/POS/Mocks/MockPointOfSaleItemsService.swift

@@ -14,4 +14,6 @@ final class MockPointOfSaleItemsController: PointOfSaleItemsControllerProtocol {
     func refreshItems(base: WooCommerce.ItemListBaseItem) async { }
 
     func loadNextItems(base: ItemListBaseItem) async { }
+
+    func toggleItemType() async { }
 }

Yosemite/Yosemite/PointOfSale/PointOfSaleItemService.swift

@@ -12,6 +12,7 @@ import Storage
 public enum PointOfSaleItemServiceError: Error, Equatable {
     case requestFailed
     case requestCancelled
+    case storageFailure
     case unknown
 }
 
@@ -99,11 +100,9 @@ public final class PointOfSaleItemService: PointOfSaleItemServiceProtocol {
         }
     }
 
-    // TODO:
-    // gh-15326 - Return PagedItems<POSItem> instead.
-    public func providePointOfSaleCoupons() -> [POSItem] {
+    public func providePointOfSaleCoupons() throws -> PagedItems<POSItem> {
         guard let storage = storage else {
-            return []
+            throw PointOfSaleItemServiceError.storageFailure
         }
         let predicate = NSPredicate(format: "siteID == %lld", siteID)
         let descriptor = NSSortDescriptor(keyPath: \StorageCoupon.dateCreated,
@@ -113,14 +112,10 @@ public final class PointOfSaleItemService: PointOfSaleItemServiceProtocol {
                                                                 matching: predicate,
                                                                 sortedBy: [descriptor])
 
-        do {
-            try resultsController.performFetch()
-            let storeCoupons = resultsController.fetchedObjects
-            return mapCouponsToPOSItems(coupons: storeCoupons)
-        } catch {
-            debugPrint(error)
-            return []
-        }
+        try resultsController.performFetch()
+        let storeCoupons = resultsController.fetchedObjects
+        let posCoupons = mapCouponsToPOSItems(coupons: storeCoupons)
+        return .init(items: posCoupons, hasMorePages: false)
     }
 
     private func mapCouponsToPOSItems(coupons: [Coupon]) -> [POSItem] {

Yosemite/Yosemite/PointOfSale/PointOfSaleItemServiceProtocol.swift

@@ -58,7 +58,7 @@ public extension Sequence where Element == POSOrderableItem {
 public protocol PointOfSaleItemServiceProtocol {
     func providePointOfSaleItems(pageNumber: Int) async throws -> PagedItems<POSItem>
     func providePointOfSaleVariationItems(for parentProduct: POSVariableParentProduct, pageNumber: Int) async throws -> PagedItems<POSItem>
-    func providePointOfSaleCoupons() -> [POSItem]
+    func providePointOfSaleCoupons() throws -> PagedItems<POSItem>
 }
 
 // Default implementation for convenience, so we do not need to pass the first page explicitly