Merge branch 'trunk' into woomob-1657-ios-move-ios-notification-opt-in-alert-after-log-in

Author: itsmeichigo

Modules/Sources/Fakes/Yosemite.generated.swift

@@ -35,6 +35,23 @@ extension Yosemite.JustInTimeMessageTemplate {
         .banner
     }
 }
+extension Yosemite.POSItemIdentifier {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Yosemite.POSItemIdentifier {
+        .init(
+            underlyingType: .fake(),
+            itemID: .fake()
+        )
+    }
+}
+extension Yosemite.POSItemIdentifier.UnderlyingType {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Yosemite.POSItemIdentifier.UnderlyingType {
+        .product
+    }
+}
 extension Yosemite.POSSimpleProduct {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/PointOfSale/Controllers/PointOfSaleOrderController.swift

@@ -291,7 +291,7 @@ private extension POSCart {
             guard case let .loaded(item) = purchasableItem.state else { return nil }
             return POSCartItem(item: item, quantity: Decimal(purchasableItem.quantity))
         }
-        let coupons = cart.coupons.map { POSCoupon(id: $0.id, code: $0.code, summary: $0.summary) }
+        let coupons = cart.coupons.map { POSCoupon(id: $0.posItemIdentifier, code: $0.code, summary: $0.summary) }
         self.init(items: items, coupons: coupons)
     }
 }

Modules/Sources/PointOfSale/Models/Cart.swift

@@ -2,6 +2,7 @@ import Foundation
 import protocol Yosemite.POSOrderableItem
 import enum Yosemite.POSItem
 import enum Yosemite.PointOfSaleBarcodeScanError
+import struct Yosemite.POSItemIdentifier
 
 struct Cart {
     var purchasableItems: [Cart.PurchasableItem] = []
@@ -12,6 +13,7 @@ struct Cart {
 
 protocol CartItem {
     var id: UUID { get }
+    var posItemIdentifier: POSItemIdentifier { get }
     var type: CartItemType { get }
 }
 
@@ -36,6 +38,17 @@ extension Cart {
             case error
         }
 
+        var posItemIdentifier: POSItemIdentifier {
+            switch state {
+            case .loaded(let item):
+                return item.id
+            case .loading:
+                return POSItemIdentifier(underlyingType: .loading, itemID: 0)
+            case .error:
+                return POSItemIdentifier(underlyingType: .error, itemID: 0)
+            }
+        }
+
         var formattedPrice: String? {
             switch state {
             case .loaded(let item):
@@ -76,6 +89,7 @@ extension Cart {
 
     struct CouponItem: CartItem {
         let id: UUID
+        let posItemIdentifier: POSItemIdentifier
         let code: String
         let summary: String
         let type: CartItemType = .coupon
@@ -89,7 +103,7 @@ extension Cart {
         if let purchasableItem = createPurchasableItem(from: posItem) {
             purchasableItems.insert(purchasableItem, at: purchasableItems.startIndex)
         } else if case .coupon(let coupon) = posItem {
-            let couponItem = Cart.CouponItem(id: coupon.id, code: coupon.code, summary: coupon.summary)
+            let couponItem = Cart.CouponItem(id: UUID(), posItemIdentifier: coupon.id, code: coupon.code, summary: coupon.summary)
             coupons.insert(couponItem, at: coupons.startIndex)
         }
     }

Modules/Sources/PointOfSale/Presentation/CartView.swift

@@ -479,7 +479,7 @@ private extension CartView {
 
 #Preview("Cart with one item") {
     let posModel = POSPreviewHelpers.makePreviewAggregateModel()
-    posModel.addToCart(.simpleProduct(.init(id: UUID(),
+    posModel.addToCart(.simpleProduct(.init(id: .init(underlyingType: .product, itemID: 6),
                                             name: "Sample Product",
                                             formattedPrice: "$10.00",
                                             productID: 6,

Modules/Sources/PointOfSale/Presentation/CouponRowView.swift

@@ -109,6 +109,9 @@ private extension CouponRowView {
 
 #if DEBUG
 #Preview(traits: .sizeThatFitsLayout) {
-    CouponRowView(couponItem: Cart.CouponItem(id: UUID(), code: "10-Discount", summary: "$10 Off · All products"), couponRowState: .idle) {}
+    CouponRowView(couponItem: Cart.CouponItem(id: UUID(),
+                                              posItemIdentifier: .init(underlyingType: .coupon, itemID: 123),
+                                              code: "10-Discount",
+                                              summary: "$10 Off · All products"), couponRowState: .idle) {}
 }
 #endif

Modules/Sources/PointOfSale/Presentation/Coupons/POSCouponCreationSheet.swift

@@ -2,6 +2,7 @@ import SwiftUI
 import class WooFoundation.CurrencySettings
 import struct Yosemite.Coupon
 import enum Yosemite.POSItem
+import struct Yosemite.POSItemIdentifier
 import struct Yosemite.POSCoupon
 
 extension View {
@@ -31,7 +32,8 @@ private struct POSCouponCreationSheetModifier: ViewModifier {
                     discountType: posDiscountType.discountType,
                     showTypeSelection: $showCouponSelectionSheet,
                     onSuccess: { coupon in
-                        addedCouponItem = .coupon(.init(id: UUID(), code: coupon.code, summary: coupon.summary(currencySettings: currencySettings)))
+                        let id = POSItemIdentifier(underlyingType: .coupon, itemID: coupon.couponID)
+                        addedCouponItem = .coupon(.init(id: id, code: coupon.code, summary: coupon.summary(currencySettings: currencySettings)))
                     },
                     dismissHandler: {
                         selectedType = nil

Modules/Sources/PointOfSale/Presentation/Item Selector/ChildItemList.swift

@@ -120,7 +120,7 @@ private extension ChildItemList {
 
 #Preview("Variable product child items") {
     let parentProduct = POSVariableParentProduct(
-        id: .init(),
+        id: .init(underlyingType: .product, itemID: 1),
         name: "Variable latte",
         productImageSource: nil,
         productID: 1
@@ -134,7 +134,7 @@ private extension ChildItemList {
                 [
                     .variation(
                         POSVariation(
-                            id: .init(),
+                            id: .init(underlyingType: .variation, itemID: 256),
                             name: "Cinamon chestnut latte",
                             formattedPrice: "$5.75",
                             price: "5.75",
@@ -145,12 +145,12 @@ private extension ChildItemList {
                     ),
                     .variation(
                         POSVariation(
-                            id: .init(),
+                            id: .init(underlyingType: .variation, itemID: 2567),
                             name: "Choco latte",
                             formattedPrice: "$6.5",
                             price: "6.5",
                             productID: 134,
-                            variationID: 256,
+                            variationID: 2567,
                             parentProductName: parentProduct.name
                         )
                     )
@@ -170,7 +170,7 @@ private extension ChildItemList {
 
 #Preview("Variable items load error") {
     let parentProduct = POSVariableParentProduct(
-        id: .init(),
+        id: .init(underlyingType: .product, itemID: 1),
         name: "Variable latte",
         productImageSource: nil,
         productID: 1

Modules/Sources/PointOfSale/Presentation/Item Selector/CouponCardView.swift

@@ -90,7 +90,7 @@ private extension CouponCardView {
                 .font(.caption)
                 .foregroundStyle(.secondary)
             CouponCardView(coupon: .init(
-                id: .init(),
+                id: .init(underlyingType: .coupon, itemID: 1),
                 code: "Coupon-123",
                 summary: "10% off - All Products"
             ))
@@ -101,7 +101,7 @@ private extension CouponCardView {
                 .font(.caption)
                 .foregroundStyle(.secondary)
             CouponCardView(coupon: .init(
-                id: .init(),
+                id: .init(underlyingType: .coupon, itemID: 2),
                 code: "Old-Coupon-123",
                 summary: "10% off - All Products",
                 dateExpires: Calendar.current.date(byAdding: .month, value: -1, to: Date())

Modules/Sources/PointOfSale/Presentation/Item Selector/ItemList.swift

@@ -68,6 +68,7 @@ struct ItemList<HeaderView: View>: View {
                     .frame(maxWidth: .infinity)
                     .padding(.horizontal, Constants.itemListPadding)
                     .padding(.bottom, keyboardObserver.isFullSizeKeyboardVisible ? Constants.itemListPadding : floatingControlAreaSize.height)
+                    .animation(.default, value: state?.items)
                 }
             )
 

Modules/Sources/PointOfSale/Presentation/Item Selector/POSItemActionHandler.swift

@@ -58,7 +58,7 @@ extension POSItemActionHandler {
     func shouldSkipDuplicate(_ item: POSItem, posModel: PointOfSaleAggregateModelProtocol) -> Bool {
         switch item {
         case .coupon:
-            return posModel.cart.coupons.contains(where: { $0.id == item.id })
+            return posModel.cart.coupons.contains(where: { $0.posItemIdentifier == item.id })
         default:
             return false
         }