Merge branch 'trunk' into task/15307-moving-to-new-shipment

Author: itsmeichigo

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:
@@ -97,6 +97,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .notificationSettings:
             return true
+        case .allowMerchantAIAPIKey:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -208,4 +208,8 @@ public enum FeatureFlag: Int {
     /// Supports managing notification settings from the app settings
     ///
     case notificationSettings
+
+    /// Allows merchants to use their own API keys for AI-powered features
+    ///
+    case allowMerchantAIAPIKey
 }

WooCommerce/Classes/Extensions/UIImage+Woo.swift

@@ -569,6 +569,10 @@ extension UIImage {
         return UIImage.gridicon(.cog)
     }
 
+    static var wandAndRaysInverse: UIImage {
+        return UIImage(systemName: "wand.and.rays.inverse")!
+    }
+
     static func prologueBackgroundBubbles(tint: UIColor) -> UIImage {
         let image = UIImage(named: "login-prologue-background-bubbles")!
         return image.withTintColor(tint)

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/Controllers/PointOfSaleOrderController.swift

@@ -5,7 +5,9 @@ import protocol Yosemite.POSOrderServiceProtocol
 import protocol Yosemite.POSReceiptServiceProtocol
 import struct Yosemite.Order
 import struct Yosemite.PaymentGateway
+import struct Yosemite.POSCart
 import struct Yosemite.POSCartItem
+import struct Yosemite.POSCoupon
 import enum Yosemite.OrderAction
 import enum Yosemite.OrderUpdateField
 import class WooFoundation.CurrencyFormatter
@@ -27,7 +29,7 @@ protocol PointOfSaleOrderControllerProtocol {
     var orderState: PointOfSaleInternalOrderState { get }
 
     @discardableResult
-    func syncOrder(for cartProducts: [CartItem], retryHandler: @escaping () async -> Void) async -> Result<SyncOrderState, Error>
+    func syncOrder(for cart: Cart, retryHandler: @escaping () async -> Void) async -> Result<SyncOrderState, Error>
     func sendReceipt(recipientEmail: String) async throws
     func clearOrder()
     func collectCashPayment() async throws
@@ -63,21 +65,19 @@ protocol PointOfSaleOrderControllerProtocol {
     private var order: Order? = nil
 
     @MainActor @discardableResult
-    func syncOrder(for cartItems: [CartItem],
+    func syncOrder(for cart: Cart,
                    retryHandler: @escaping () async -> Void) async -> Result<SyncOrderState, Error> {
-        let posCartItems = cartItems.map {
-            POSCartItem(item: $0.item, quantity: Decimal($0.quantity))
-        }
+        let posCart = POSCart(cart: cart)
 
-        guard !orderState.isSyncing, !posCartItems.matches(order: order) else {
+        guard !orderState.isSyncing, !posCart.matches(order: order) else {
             return .success(.orderNotChanged)
         }
 
         orderState = .syncing
         let isNewOrder = order == nil
 
         do {
-            let syncedOrder = try await orderService.syncOrder(cart: posCartItems,
+            let syncedOrder = try await orderService.syncOrder(cart: posCart,
                                                                order: order,
                                                                currency: storeCurrency)
             self.order = syncedOrder
@@ -249,3 +249,13 @@ extension PointOfSaleOrderController {
         case noOrder
     }
 }
+
+// MARK: - Mapping
+
+private extension POSCart {
+    init(cart: Cart) {
+        let items = cart.items.map { POSCartItem(item: $0.item, quantity: Decimal($0.quantity)) }
+        let coupons = cart.coupons.map { POSCoupon(id: $0.id, code: $0.code) }
+        self.init(items: items, coupons: coupons)
+    }
+}

WooCommerce/Classes/POS/Models/Cart.swift

@@ -0,0 +1,62 @@
+import Foundation
+import protocol Yosemite.POSOrderableItem
+import enum Yosemite.POSItem
+
+struct Cart {
+    var items: [CartItem] = []
+    var coupons: [CartCouponItem] = []
+}
+
+struct CartItem {
+    let id: UUID
+    let item: POSOrderableItem
+    let title: String
+    let subtitle: String?
+    let quantity: Int
+}
+
+struct CartCouponItem {
+    let id: UUID
+    let code: String
+}
+
+// MARK: - Helper Methods
+
+extension Cart {
+    mutating func add(_ posItem: POSItem) {
+        switch posItem {
+        case .simpleProduct(let simpleProduct):
+            let productItem = CartItem(id: UUID(), item: simpleProduct, title: simpleProduct.name, subtitle: nil, quantity: 1)
+            items.insert(productItem, at: items.startIndex)
+        case .variation(let variation):
+            let productItem = CartItem(id: UUID(), item: variation, title: variation.parentProductName, subtitle: variation.name, quantity: 1)
+            items.insert(productItem, at: items.startIndex)
+        case .variableParentProduct:
+            return
+        case .coupon(let coupon):
+            let couponItem = CartCouponItem(id: UUID(), code: coupon.code)
+            coupons.insert(couponItem, at: coupons.startIndex)
+        }
+    }
+
+    mutating func remove(_ cartItem: CartItem) {
+        items.removeAll { $0.id == cartItem.id }
+    }
+
+    mutating func remove(_ cartCouponItem: CartCouponItem) {
+        coupons.removeAll { $0.id == cartCouponItem.id }
+    }
+
+    mutating func removeAll() {
+        items.removeAll()
+        coupons.removeAll()
+    }
+
+    var isEmpty: Bool {
+        items.isEmpty && coupons.isEmpty
+    }
+
+    var isNotEmpty: Bool {
+        return !isEmpty
+    }
+}

WooCommerce/Classes/POS/Models/CartItem.swift

@@ -6,7 +6,7 @@ import protocol Yosemite.POSOrderableItem
 import protocol WooFoundation.Analytics
 import struct Yosemite.Order
 import struct Yosemite.OrderItem
-import struct Yosemite.POSCartItem
+import struct Yosemite.POSCoupon
 import enum Yosemite.POSItem
 import enum Yosemite.SystemStatusAction
 
@@ -28,9 +28,10 @@ protocol PointOfSaleAggregateModelProtocol {
     func loadItems(base: ItemListBaseItem) async
     func loadNextItems(base: ItemListBaseItem) async
 
-    var cart: [CartItem] { get }
+    var cart: Cart { get }
     func addToCart(_ item: POSItem)
     func remove(cartItem: CartItem)
+    func remove(cartCouponItem: CartCouponItem)
     func removeAllItemsFromCart()
     func addMoreToCart()
     func startNewCart()
@@ -52,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: [CartItem] = []
+    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
@@ -72,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
@@ -94,47 +100,39 @@ 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)
     }
-}
-
-// MARK: - Cart
 
-private extension POSItem {
-    var cartItem: CartItem? {
-        switch self {
-        case .simpleProduct(let simpleProduct):
-            return CartItem(id: UUID(), item: simpleProduct, title: simpleProduct.name, subtitle: nil, quantity: 1)
-        case .variation(let variation):
-            return CartItem(id: UUID(), item: variation, title: variation.parentProductName, subtitle: variation.name, quantity: 1)
-        case .variableParentProduct:
-            return nil
-        case .coupon:
-            return nil
-        }
+    func switchToItemType(_ type: ItemType) async {
+        let newController = type == .products ? itemsController : couponsController
+        currentController = newController
+        await refreshItems(base: .root)
     }
 }
 
 @available(iOS 17.0, *)
 extension PointOfSaleAggregateModel {
     func addToCart(_ item: POSItem) {
         trackCustomerInteractionStarted()
-        guard let cartItem = item.cartItem else { return }
-        cart.insert(cartItem, at: cart.startIndex)
+        cart.add(item)
     }
 
     func remove(cartItem: CartItem) {
-        cart.removeAll(where: { $0.id == cartItem.id } )
+        cart.remove(cartItem)
+    }
+
+    func remove(cartCouponItem: CartCouponItem) {
+        cart.remove(cartCouponItem)
     }
 
     func removeAllItemsFromCart() {
@@ -164,7 +162,7 @@ private extension PointOfSaleAggregateModel {
     func trackCustomerInteractionStarted() {
         // At the moment we're assumming that an interaction starts simply when the cart is zero
         // but a more complex logic will be needed for other cases
-        if cart.count == 0 {
+        if cart.isEmpty {
             collectOrderPaymentAnalyticsTracker.trackCustomerInteractionStarted()
         }
     }

WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift

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