[Woo POS] Allow item list switch between Products and Coupons (#15366)

Author: iamgabrielma

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/PointOfSaleCouponsController.swift

@@ -0,0 +1,34 @@
+import Observation
+import enum Yosemite.POSItem
+import protocol Yosemite.PointOfSaleItemServiceProtocol
+
+@available(iOS 17.0, *)
+@Observable final class PointOfSaleCouponsController: PointOfSaleItemsControllerProtocol {
+    var itemsViewState: ItemsViewState = ItemsViewState(containerState: .loading,
+                                                        itemsStack: ItemsStackState(root: .loading([]),
+                                                                                    itemStates: [:]))
+    private let paginationTracker: AsyncPaginationTracker
+    private var childPaginationTrackers: [POSItem: AsyncPaginationTracker] = [:]
+    private let itemProvider: PointOfSaleItemServiceProtocol
+
+    init(itemProvider: PointOfSaleItemServiceProtocol) {
+        self.itemProvider = itemProvider
+        self.paginationTracker = .init()
+    }
+
+    @MainActor
+    func loadItems(base: ItemListBaseItem) async {
+        debugPrint("🍍 CouponsController::loadItems called")
+        itemsViewState = ItemsViewState(containerState: .content, itemsStack: .init(root: .loaded([], hasMoreItems: false), itemStates: [:]))
+    }
+
+    func refreshItems(base: ItemListBaseItem) async {
+        debugPrint("🍍 CouponsController::refreshItems called")
+        itemsViewState = ItemsViewState(containerState: .content, itemsStack: .init(root: .loaded([], hasMoreItems: false), itemStates: [:]))
+    }
+
+    func loadNextItems(base: ItemListBaseItem) async {
+        debugPrint("🍍 CouponsController::loadNextItems called")
+        itemsViewState = ItemsViewState(containerState: .content, itemsStack: .init(root: .loaded([], hasMoreItems: false), itemStates: [:]))
+    }
+}

WooCommerce/Classes/POS/Controllers/PointOfSaleItemsController.swift

@@ -6,8 +6,14 @@ import enum Yosemite.PointOfSaleItemServiceError
 import struct Yosemite.POSVariableParentProduct
 import class Yosemite.Store
 
+enum ItemType {
+    case products
+    case coupons
+}
+
 @available(iOS 17.0, *)
 protocol PointOfSaleItemsControllerProtocol {
+    ///
     var itemsViewState: ItemsViewState { get }
     /// Loads the first page of items for a given base item.
     func loadItems(base: ItemListBaseItem) async
@@ -17,6 +23,8 @@ protocol PointOfSaleItemsControllerProtocol {
     func loadNextItems(base: ItemListBaseItem) async
 }
 
+
+
 @available(iOS 17.0, *)
 @Observable final class PointOfSaleItemsController: PointOfSaleItemsControllerProtocol {
     var itemsViewState: ItemsViewState = ItemsViewState(containerState: .loading,
@@ -158,14 +166,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) {
@@ -202,6 +202,7 @@ private extension PointOfSaleItemsController {
     func fetchItems(pageNumber: Int, appendToExistingItems: Bool = true) async throws -> Bool {
         do {
             let pagedItems = try await itemProvider.providePointOfSaleItems(pageNumber: pageNumber)
+
             let newItems = pagedItems.items
             var allItems = appendToExistingItems ? itemsViewState.itemsStack.root.items : []
             let uniqueNewItems = newItems.filter { newItem in

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

@@ -53,14 +53,16 @@ protocol PointOfSaleAggregateModelProtocol {
     var cardPresentPaymentOnboardingViewModel: CardPresentPaymentsOnboardingViewModel?
     private var onOnboardingCancellation: (() -> Void)?
 
-    var itemsViewState: ItemsViewState { itemsController.itemsViewState }
+    var itemsViewState: ItemsViewState { currentController.itemsViewState }
 
     private(set) var cart: Cart = .init()
 
     var orderState: PointOfSaleOrderState { orderController.orderState.externalState }
     private var internalOrderState: PointOfSaleInternalOrderState { orderController.orderState }
 
+    private var currentController: PointOfSaleItemsControllerProtocol
     private let itemsController: PointOfSaleItemsControllerProtocol
+    private let couponsController: PointOfSaleItemsControllerProtocol
 
     private let cardPresentPaymentService: CardPresentPaymentFacade
     private let orderController: PointOfSaleOrderControllerProtocol
@@ -73,12 +75,15 @@ protocol PointOfSaleAggregateModelProtocol {
     private var cancellables: Set<AnyCancellable> = []
 
     init(itemsController: PointOfSaleItemsControllerProtocol,
+         couponsController: PointOfSaleItemsControllerProtocol,
          cardPresentPaymentService: CardPresentPaymentFacade,
          orderController: PointOfSaleOrderControllerProtocol,
          analytics: Analytics = ServiceLocator.analytics,
          collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalyticsTracking,
          paymentState: PointOfSalePaymentState = .card(.idle)) {
+        self.currentController = itemsController // Default current controller set to products
         self.itemsController = itemsController
+        self.couponsController = couponsController
         self.cardPresentPaymentService = cardPresentPaymentService
         self.orderController = orderController
         self.analytics = analytics
@@ -95,17 +100,23 @@ protocol PointOfSaleAggregateModelProtocol {
 extension PointOfSaleAggregateModel {
     @MainActor
     func loadItems(base: ItemListBaseItem) async {
-        await itemsController.loadItems(base: base)
+        await currentController.loadItems(base: base)
     }
 
     @MainActor
     func refreshItems(base: ItemListBaseItem) async {
-        await itemsController.refreshItems(base: base)
+        await currentController.refreshItems(base: base)
     }
 
     @MainActor
     func loadNextItems(base: ItemListBaseItem) async {
-        await itemsController.loadNextItems(base: base)
+        await currentController.loadNextItems(base: base)
+    }
+
+    func switchToItemType(_ type: ItemType) async {
+        let newController = type == .products ? itemsController : couponsController
+        currentController = newController
+        await refreshItems(base: .root)
     }
 }
 

WooCommerce/Classes/POS/Presentation/CardReaderConnection/CardReaderConnectionStatusView.swift

@@ -171,6 +171,7 @@ private extension CardReaderConnectionStatusView {
 #Preview {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics()

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSalePaymentSuccessView.swift

@@ -125,6 +125,7 @@ private extension PointOfSalePaymentSuccessView {
 #Preview {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())

WooCommerce/Classes/POS/Presentation/CartView.swift

@@ -302,6 +302,7 @@ private extension CartView {
 #Preview {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())
@@ -313,6 +314,7 @@ private extension CartView {
 #Preview("Cart with one item") {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())

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

@@ -147,6 +147,7 @@ private extension ChildItemList {
                                                     ], hasMoreItems: false)]))
     let posModel = PointOfSaleAggregateModel(
         itemsController: itemsController,
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())
@@ -172,6 +173,7 @@ private extension ChildItemList {
                                             ]))
     let posModel = PointOfSaleAggregateModel(
         itemsController: itemsController,
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())

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

@@ -167,6 +167,7 @@ private extension ItemListRow {
 #Preview("Loading") {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())

WooCommerce/Classes/POS/Presentation/ItemListView.swift

@@ -1,5 +1,7 @@
 import SwiftUI
 import enum Yosemite.POSItem
+import protocol Yosemite.POSOrderableItem
+import struct Yosemite.POSCoupon
 
 @available(iOS 17.0, *)
 struct ItemListView: View {
@@ -15,6 +17,12 @@ struct ItemListView: View {
     @AppStorage(BannerState.isSimpleProductsOnlyBannerDismissedKey)
     private var isHeaderBannerDismissed: Bool = false
 
+    private var shouldShowCoupons: Bool {
+        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.enableCouponsInPointOfSale)
+    }
+
+    @State private var selectedItemType: ItemType = .products
+
     var body: some View {
         if #available(iOS 18.0, *) {
             NavigationStack {
@@ -32,6 +40,21 @@ struct ItemListView: View {
     var content: some View {
         VStack {
             headerView
+
+            HStack {
+                Button(action: {
+                    displayItemType(.products)
+                }, label: {
+                    Text("Products")
+                })
+                Button(action: {
+                    displayItemType(.coupons)
+                }, label: {
+                    Text("Coupons")
+                })
+            }
+            .renderedIf(shouldShowCoupons)
+
             switch itemListState {
             case .loading(let items),
                     .loaded(let items, _),
@@ -138,6 +161,13 @@ private extension ItemListView {
     var shouldShowHeaderBanner: Bool {
         itemListState.eligibleToShowSimpleProductsBanner && !isHeaderBannerDismissed
     }
+
+    func displayItemType(_ itemType: ItemType) {
+        selectedItemType = itemType
+        Task { @MainActor in
+            await posModel.switchToItemType(itemType)
+        }
+    }
 }
 
 private extension ItemListState {
@@ -222,6 +252,7 @@ private extension ItemListView {
     }
     let posModel = PointOfSaleAggregateModel(
         itemsController: itemsController,
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())
@@ -233,6 +264,7 @@ private extension ItemListView {
 #Preview("Loading") {
     let posModel = PointOfSaleAggregateModel(
         itemsController: PointOfSalePreviewItemsController(),
+        couponsController: PointOfSalePreviewItemsController(),
         cardPresentPaymentService: CardPresentPaymentPreviewService(),
         orderController: PointOfSalePreviewOrderController(),
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics())