Merge branch 'trunk' into fix/splitting-shipment-ui-bugs

Author: itsmeichigo

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -93,6 +93,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .pointOfSaleAsATabi1:
             return true
+        case .pointOfSaleAsATabi2:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleOrdersi1:
+            return false
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -195,4 +195,12 @@ public enum FeatureFlag: Int {
     /// Enables displaying POS as a tab in the tab bar with the same eligibility as the previous entry point
     ///
     case pointOfSaleAsATabi1
+
+    /// 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
 }

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.

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?

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>

Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/Model 123.xcdatamodel/contents

@@ -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

Modules/Tests/StorageTests/CoreData/MigrationTests.swift

@@ -4,7 +4,7 @@
 22.8
 -----
 - [*] Shipping Labels: Improve UI of Split shipments screen. [https://github.com/woocommerce/woocommerce-ios/pull/15838]
-
+- [*] POS: icon button with confirmation step used for clearing the cart [https://github.com/woocommerce/woocommerce-ios/pull/15829]
 
 22.7
 -----
@@ -19,6 +19,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

RELEASE-NOTES.txt

@@ -0,0 +1,27 @@
+import UIKit
+
+extension UILabel {
+    /// Applies the appropriate style to sales channel label
+    ///
+    func applySalesChannelStyle() {
+        applyFootnoteStyle()
+        applyLayerSettings()
+        backgroundColor = .lightGray
+        textColor = .black
+    }
+
+    /// Setup: Layer
+    ///
+    private func applyLayerSettings() {
+        layer.masksToBounds = true
+        layer.borderWidth = Layout.borderWidth
+        layer.cornerRadius = Layout.cornerRadius
+    }
+}
+
+private extension UILabel {
+    enum Layout {
+        static let borderWidth = CGFloat(0.0)
+        static let cornerRadius = CGFloat(4.0)
+    }
+}

WooCommerce/Classes/Extensions/UILabel+SalesChannel.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