Merge branch 'trunk' into feat/WOOMOB-575-separate-pos-tab-visibility

jaclync · jaclync · commit 1e2dcaccd1f3 · 2025-06-30T11:18:07.000-04:00
# Conflicts:
#	Modules/Sources/Experiments/DefaultFeatureFlagService.swift
#	Modules/Sources/Experiments/FeatureFlag.swift
diff --git a/Modules/Sources/Experiments/DefaultFeatureFlagService.swift b/Modules/Sources/Experiments/DefaultFeatureFlagService.swift
@@ -95,6 +95,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleAsATabi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleOrdersi1:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }
diff --git a/Modules/Sources/Experiments/FeatureFlag.swift b/Modules/Sources/Experiments/FeatureFlag.swift
@@ -199,4 +199,8 @@ public enum FeatureFlag: Int {
     /// Enables displaying POS as a tab in the tab bar for stores in eligible countries
     ///
     case pointOfSaleAsATabi2
+
+    /// Enables displaying Point Of Sale details in order list and order details
+    ///
+    case pointOfSaleOrdersi1
 }
diff --git a/Modules/Sources/Storage/Model/MIGRATIONS.md b/Modules/Sources/Storage/Model/MIGRATIONS.md
@@ -2,6 +2,10 @@
 
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
+## Model 123 (Release 22.8.0.0)
+- @iamgabrielma 2025-06-30
+    - Added `createdVia` attribute to `Order` entity. 
+
 ## Model 122 (Release 22.7.0.0)
 - @itsmeichigo 2025-06-20
     - Added `shipmentID` attribute to `ShippingLabel` entity.
diff --git a/Modules/Sources/Storage/Model/Order+CoreDataProperties.swift b/Modules/Sources/Storage/Model/Order+CoreDataProperties.swift
@@ -20,6 +20,7 @@ extension Order {
     @NSManaged public var billingPostcode: String?
     @NSManaged public var billingState: String?
     @NSManaged public var chargeID: String?
+    @NSManaged public var createdVia: String?
     @NSManaged public var currency: String?
     @NSManaged public var customerID: Int64
     @NSManaged public var customerNote: String?
diff --git a/Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/.xccurrentversion b/Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model 122.xcdatamodel</string>
+	<string>Model 123.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/Model 123.xcdatamodel/contents b/Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/Model 123.xcdatamodel/contents
diff --git a/Modules/Tests/StorageTests/CoreData/MigrationTests.swift b/Modules/Tests/StorageTests/CoreData/MigrationTests.swift
@@ -3363,6 +3363,41 @@ final class MigrationTests: XCTestCase {
         let updatedShipmentID = migratedLabel.value(forKey: "shipmentID") as? String
         XCTAssertEqual(updatedShipmentID, id)
     }
+
+    func test_migrating_from_122_to_123_adds_new_attribute_createdVia_to_order() throws {
+        // Given
+        let sourceContainer = try startPersistentContainer("Model 122")
+        let sourceContext = sourceContainer.viewContext
+
+        let object = sourceContext.insert(entityName: "Order", properties: [
+            "orderID": 123,
+            "statusKey": "" // statusKey is a required value, unrelated to this migration
+        ])
+        try sourceContext.save()
+
+        // `createdVia` should not be present in model 122
+        XCTAssertNil(object.entity.attributesByName["createdVia"], "Precondition. Attribute does not exist.")
+
+        // When
+        let targetContainer = try migrate(sourceContainer, to: "Model 123")
+
+        // Then
+        let targetContext = targetContainer.viewContext
+        let migratedObject = try XCTUnwrap(targetContext.first(entityName: "Order"))
+
+        // `createdVia` should be present in model 123
+        XCTAssertNotNil(migratedObject.entity.attributesByName["createdVia"])
+
+        // `createdVia` value should default as nil in model 123
+        let value = migratedObject.value(forKey: "createdVia") as? String
+        XCTAssertNil(value)
+
+        // `createdVia` must be settable
+        migratedObject.setValue("pos-rest-api", forKey: "createdVia")
+        try targetContext.save()
+        let updatedValue = migratedObject.value(forKey: "createdVia") as? String
+        XCTAssertEqual(updatedValue, "pos-rest-api")
+    }
 }
 
 // MARK: - Persistent Store Setup and Migrations
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,7 +3,7 @@
 
 22.8
 -----
-
+- [*] POS: icon button with confirmation step used for clearing the cart [https://github.com/woocommerce/woocommerce-ios/pull/15829]
 
 22.7
 -----
@@ -18,6 +18,7 @@
 - [*] POS: Prevent card reader connection success alert flashing when connecting during a payment [https://github.com/woocommerce/woocommerce-ios/pull/15784]
 - [**] Shipping Labels: Support UPS extra services [https://github.com/woocommerce/woocommerce-ios/pull/15819, https://github.com/woocommerce/woocommerce-ios/pull/15821]
 - [*] Shipping Labels: Pre-fill custom forms with item description, value, and weight [https://github.com/woocommerce/woocommerce-ios/pull/15811]
+- [*] Shipping Labels: Pre-fill custom forms with item origin country [https://github.com/woocommerce/woocommerce-ios/pull/15835]
 - [internal] POS: Improved scrolling and animation performance by refactoring the shadow implementation and updating the cart and checkout views. [https://github.com/woocommerce/woocommerce-ios/pull/15817]
 
 22.6
diff --git a/WooCommerce/Classes/POS/Presentation/CartView.swift b/WooCommerce/Classes/POS/Presentation/CartView.swift
@@ -32,7 +32,7 @@ struct CartView: View {
                 POSPageHeaderView(title: Localization.cartTitle,
                                   backButtonConfiguration: backButtonConfiguration,
                                   trailingContent: {
-                    DynamicHStack(horizontalAlignment: .trailing, verticalAlignment: .center, spacing: Constants.cartHeaderElementSpacing) {
+                    HStack(spacing: Constants.cartHeaderElementSpacing) {
                         if let itemsInCartLabel = viewHelper.itemsInCartLabel(for: posModel.cart.purchasableItems.count) {
                             Text(itemsInCartLabel)
                                 .font(Constants.itemsFont)
@@ -42,13 +42,9 @@ struct CartView: View {
                                 .foregroundColor(Color.posOnSurfaceVariantLowest)
                         }
 
-                        Button {
+                        CartClearMenuButton(removeAllItemsFromCart: {
                             posModel.removeAllItemsFromCart()
-                            ServiceLocator.analytics.track(.pointOfSaleClearCartTapped)
-                        } label: {
-                            Text(Localization.clearButtonTitle)
-                        }
-                        .buttonStyle(POSOutlinedButtonStyle(size: .extraSmall))
+                        })
                         .renderedIf(shouldShowClearCartButton)
                     }
                 })
@@ -137,10 +133,6 @@ private extension CartView {
             "pos.cartView.cartTitle",
             value: "Cart",
             comment: "Title at the header for the Cart view.")
-        static let clearButtonTitle = NSLocalizedString(
-            "pos.cartView.clearButtonTitle",
-            value: "Clear",
-            comment: "Title for the 'Clear' button to remove all products from the Cart.")
         static let addItemsToCartHint = NSLocalizedString(
             "pos.cartView.addItemsToCartHint",
             value: "Tap on a product to \n add it to the cart",
@@ -221,6 +213,37 @@ private extension CartView {
 
 }
 
+@available(iOS 17.0, *)
+private struct CartClearMenuButton: View {
+    let removeAllItemsFromCart: () -> Void
+
+    var body: some View {
+        Menu {
+            Button(role: .destructive,
+                   action: {
+                removeAllItemsFromCart()
+                ServiceLocator.analytics.track(.pointOfSaleClearCartTapped)
+            }) {
+                Text(Localization.clearButtonTitle)
+            }
+
+        } label: {
+            Image(systemName: "trash")
+                .font(.posButtonSymbolMedium)
+                .foregroundStyle(Color.posOnSurface)
+                .dynamicTypeSize(...POSHeaderLayoutConstants.maximumDynamicTypeSize)
+                .accessibilityLabel(Localization.clearButtonTitle)
+        }
+    }
+
+    enum Localization {
+        static let clearButtonTitle = NSLocalizedString(
+            "pos.cartView.clearButtonTitle.1",
+            value: "Clear cart",
+            comment: "Title for the 'Clear cart' confirmation button to remove all products from the Cart.")
+    }
+}
+
 @available(iOS 17.0, *)
 private struct CartScrollViewContent: View {
     @Environment(PointOfSaleAggregateModel.self) private var posModel
diff --git a/WooCommerce/Classes/POS/Presentation/Item Selector/ParentProductCardView.swift b/WooCommerce/Classes/POS/Presentation/Item Selector/ParentProductCardView.swift
@@ -40,6 +40,12 @@ struct ParentProductCardView: View {
             .padding(.horizontal, Constants.horizontalTextPadding * (1 / scale))
             .padding(.vertical, Constants.verticalTextPadding * (1 / scale))
             Spacer()
+
+            Image(systemName: "chevron.forward")
+                .accessibilityHidden(true)
+                .font(.posButtonSymbolSmall)
+                .foregroundStyle(Color.posOnSurfaceVariantLowest)
+                .padding(.horizontal, POSPadding.medium * (1 / scale))
         }
         .frame(maxWidth: .infinity, idealHeight: dynamicTypeSize.isAccessibilitySize ? nil : dimension)
         .background(Constants.backgroundColor)
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/ShipmentDetails/WooShippingShipmentDetailsViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/ShipmentDetails/WooShippingShipmentDetailsViewModel.swift
@@ -2,11 +2,13 @@ import Foundation
 import Yosemite
 import WooFoundation
 import Combine
+import protocol Storage.StorageManagerType
 
 final class WooShippingShipmentDetailsViewModel: ObservableObject {
 
     private let order: Order
     private let stores: StoresManager
+    private let storageManager: StorageManagerType
     private let currencyFormatter: CurrencyFormatter
     private let onLabelPurchase: ((ShippingLabel) -> Void)?
     private let onLabelRefund: ((Int64) -> Void)?
@@ -64,9 +66,15 @@ final class WooShippingShipmentDetailsViewModel: ObservableObject {
     @Published private var customsForm: ShippingLabelCustomsForm?
 
     lazy private(set) var customsFormViewModel: WooShippingCustomsFormViewModel = {
-        WooShippingCustomsFormViewModel(order: order, shipment: shipment, onCompletion: { [weak self] form in
+        return WooShippingCustomsFormViewModel(
+            order: order,
+            shipment: shipment,
+            originCountryCode: originCountryCodePublisher(),
+            stores: stores,
+            storageManager: storageManager
+        ) { [weak self] form in
             self?.customsForm = form
-        })
+        }
     }()
 
     /// Whether the custom information is completed or not.
@@ -130,13 +138,15 @@ final class WooShippingShipmentDetailsViewModel: ObservableObject {
          originAddress: AnyPublisher<WooShippingAddress?, Never>,
          destinationAddress: AnyPublisher<WooShippingAddress?, Never>,
          stores: StoresManager = ServiceLocator.stores,
+         storageManager: StorageManagerType = ServiceLocator.storageManager,
          analytics: Analytics = ServiceLocator.analytics,
          currencySettings: CurrencySettings = ServiceLocator.currencySettings,
          debounceDuration: Double = 1,
          onLabelPurchase: ((ShippingLabel) -> Void)? = nil,
          onLabelRefund: ((Int64) -> Void)? = nil) {
         self.order = order
         self.stores = stores
+        self.storageManager = storageManager
         self.analytics = analytics
         self.shipment = shipment
         self.currencyFormatter = CurrencyFormatter(currencySettings: currencySettings)
@@ -453,6 +463,12 @@ private extension WooShippingShipmentDetailsViewModel {
         }
         return foundCarrierPackage
     }
+
+    func originCountryCodePublisher() -> AnyPublisher<String?, Never> {
+        $originAddress
+            .map(\.?.country)
+            .eraseToAnyPublisher()
+    }
 }
 
 private extension WooShippingShipmentDetailsViewModel {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsFormViewModel.swift
@@ -2,6 +2,7 @@ import SwiftUI
 import Yosemite
 import Combine
 import WooFoundation
+import protocol Storage.StorageManagerType
 
 final class WooShippingCustomsFormViewModel: ObservableObject {
     enum ITNValidationError {
@@ -31,7 +32,12 @@ final class WooShippingCustomsFormViewModel: ObservableObject {
     private var cancellables = Set<AnyCancellable>()
     private let onCompletion: (ShippingLabelCustomsForm) -> ()
 
-    init(order: Order, shipment: Shipment, onCompletion: @escaping (ShippingLabelCustomsForm) -> ()) {
+    init(order: Order,
+         shipment: Shipment,
+         originCountryCode: AnyPublisher<String?, Never>? = nil,
+         stores: StoresManager = ServiceLocator.stores,
+         storageManager: StorageManagerType = ServiceLocator.storageManager,
+         onCompletion: @escaping (ShippingLabelCustomsForm) -> ()) {
         self.onCompletion = onCompletion
 
         itemsViewModels = shipment.items.map {
@@ -40,7 +46,10 @@ final class WooShippingCustomsFormViewModel: ObservableObject {
                                             itemQuantity: $0.quantity,
                                             itemValue: $0.value,
                                             itemWeight: $0.weight,
-                                            currencySymbol: currencySymbol(from: order))
+                                            currencySymbol: currencySymbol(from: order),
+                                            originCountryCode: originCountryCode,
+                                            storageManager: storageManager,
+                                            stores: stores)
         }
 
         listenToItemsRequiredInformationValues()
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Customs/WooShippingCustomsItemViewModel.swift
@@ -12,6 +12,8 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
     // Useful to determine externally if the shipping requires an ITN
     @Published var hsTariffNumberTotalValue: (String, Decimal)?
 
+    @Published private var originCountryCode: String?
+
     private let storageManager: StorageManagerType
     private let stores: StoresManager
     private let siteID: Int64
@@ -29,9 +31,7 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
 
     @Published private(set) var selectedCountry: Country?
 
-    var countries: [Country] {
-        resultsController.fetchedObjects
-    }
+    @Published private(set) var countries: [Country] = []
 
     var totalValue: Decimal {
         guard currencySymbol == "$",
@@ -74,6 +74,7 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
          itemValue: Double,
          itemWeight: Double,
          currencySymbol: String,
+         originCountryCode: AnyPublisher<String?, Never>? = nil,
          storageManager: StorageManagerType = ServiceLocator.storageManager,
          stores: StoresManager = ServiceLocator.stores) {
         self.title = itemName
@@ -87,20 +88,39 @@ final class WooShippingCustomsItemViewModel: ObservableObject {
         self.stores = stores
         self.siteID = stores.sessionManager.defaultStoreID ?? Int64.min
 
+        originCountryCode?
+            .assign(to: &$originCountryCode)
+
         fetchCountries()
+
+        combineToPreselectCountry()
         combineRequiredInformationIsEntered()
         combineHSTariffNumberTotalValue()
     }
 }
 
 private extension WooShippingCustomsItemViewModel {
+    func combineToPreselectCountry() {
+        $originCountryCode
+            .compactMap { $0 }
+            .first() /// Make sure to only handle the initial value
+            .combineLatest($countries)
+            .map { code, countries in
+                return countries.first(where: { $0.code == code })
+            }
+            .assign(to: &$selectedCountry)
+    }
+
     func fetchCountries() {
         try? resultsController.performFetch()
+        countries = resultsController.fetchedObjects
+
         let action = DataAction.synchronizeCountries(siteID: siteID) { [weak self] (result) in
             guard let self = self else { return }
             switch result {
             case .success:
                 try? self.resultsController.performFetch()
+                self.countries = self.resultsController.fetchedObjects
             case .failure:
                 break
             }
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingShipmentDetailsViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingShipmentDetailsViewModelTests.swift

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {`
`95`	`95`	`return true`
`96`	`96`	`case .pointOfSaleAsATabi2:`
`97`	`97`	`return buildConfig == .localDeveloper \|\| buildConfig == .alpha`
	`98`	`+ case .pointOfSaleOrdersi1:`
	`99`	`+ return buildConfig == .localDeveloper \|\| buildConfig == .alpha`
`98`	`100`	`default:`
`99`	`101`	`return true`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,4 +199,8 @@ public enum FeatureFlag: Int {`
`199`	`199`	`/// Enables displaying POS as a tab in the tab bar for stores in eligible countries`
`200`	`200`	`///`
`201`	`201`	`case pointOfSaleAsATabi2`
	`202`	`+`
	`203`	`+ /// Enables displaying Point Of Sale details in order list and order details`
	`204`	`+ ///`
	`205`	`+ case pointOfSaleOrdersi1`
`202`	`206`	`}`