Merge branch 'trunk' into feat/WOOMOB-687-fix-ios-screenshots-gen-ci

Author: jaclync

CHANGELOG.md

@@ -1,8 +1,11 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 22.8
+Our latest update brings smoother split shipment screens and improved accessibility for Shipping Labels, plus easier label size selection, and POS badges within the order list. In Point of Sale, enjoy a new barcode scan flow, and a safer cart clear button.
+
 ## 22.7
-Say hello to smoother shipping and sales! 🎉 We’ve enhanced Shipping Labels with UPS extras and smarter forms, fixed price and display glitches, and made shipment management easier. Plus, Point of Sale now has its own tab for eligible stores, barcode scanning, and smoother product refresh for faster checkout.
+Say hello to smoother shipping and sales! We’ve enhanced Shipping Labels with UPS extras and smarter forms, fixed price and display glitches, and made shipment management easier. Plus, Point of Sale now has its own tab for eligible stores, barcode scanning, and smoother product refresh for faster checkout.
 
 ## 22.6
 Shipping just got a major upgrade! Our revamped flow makes it easier than ever to create and manage shipping labels for stores using WooCommerce Shipping. We've also improved some icons and fixed a display issue with the order list's last updated time. This release includes some behind-the-scenes performance improvements too.

Modules/Package.swift

@@ -109,6 +109,7 @@ let package = Package(
         .target(
             name: "Experiments",
             dependencies: [
+                "WooFoundationCore",
                 .product(name: "AutomatticTracks", package: "Automattic-Tracks-iOS"),
             ]
         ),
@@ -341,16 +342,14 @@ enum XcodeSupport {
             .xcodeTarget(
                 XcodeTargetNames.notificationExtension,
                 dependencies: [
-                    "Networking",
+                    "NetworkingCore",
                     "WooFoundation",
-                    "Yosemite",
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                 ]
             ),
             .xcodeTarget(
                 XcodeTargetNames.storeWidgetsExtension,
                 dependencies: [
-                    "Experiments",
                     "Networking",
                     "WooFoundation",
                     .product(name: "KeychainAccess", package: "KeychainAccess"),

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -1,3 +1,5 @@
+import enum WooFoundationCore.BuildConfiguration
+
 public struct DefaultFeatureFlagService: FeatureFlagService {
     public init() {}
 
@@ -93,6 +95,14 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .pointOfSaleAsATabi1:
             return true
+        case .pointOfSaleAsATabi2:
+            return true
+        case .pointOfSaleOrdersi1:
+            return true
+        case .pointOfSaleOrdersi2:
+            return true
+        case .pointOfSaleBarcodeScanningi2:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -195,4 +195,20 @@ 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
+
+    /// Enables displaying Point Of Sale as a filter in order list
+    ///
+    case pointOfSaleOrdersi2
+
+    /// Enables the Point of Sale Barcode Scanner set up flows, as part of i2
+    ///
+    case pointOfSaleBarcodeScanningi2
 }

Modules/Sources/Fakes/Networking.generated.swift

@@ -1451,6 +1451,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: .fake(),
             paperSize: .fake(),
             lastSelectedPackageID: .fake(),
+            lastOrderCompleted: .fake(),
             addPaymentMethodURL: .fake()
         )
     }
@@ -2483,6 +2484,19 @@ extension Networking.WooShippingSelectedRate {
         )
     }
 }
+extension Networking.WooShippingShipment {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.WooShippingShipment {
+        .init(
+            siteID: .fake(),
+            orderID: .fake(),
+            index: .fake(),
+            items: .fake(),
+            shippingLabel: .fake()
+        )
+    }
+}
 extension Networking.WooShippingShipmentItem {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Fakes/NetworkingCore.generated.swift

@@ -185,7 +185,8 @@ extension NetworkingCore.Order {
             renewalSubscriptionID: .fake(),
             appliedGiftCards: .fake(),
             attributionInfo: .fake(),
-            shippingLabels: .fake()
+            shippingLabels: .fake(),
+            createdVia: .fake()
         )
     }
 }

Modules/Sources/Networking/Mapper/SingleItemMapper.swift

@@ -2,16 +2,20 @@ import Foundation
 
 /// SingleItemMapper: Maps generic REST API requests for a single item
 ///
-struct SingleItemMapper<Output: Decodable>: Mapper {
+public struct SingleItemMapper<Output: Decodable>: Mapper {
     /// Site Identifier associated to the items that will be parsed.
     ///
     /// We're injecting this field via `JSONDecoder.userInfo` because SiteID is not returned by our endpoints.
     ///
     let siteID: Int64
 
+    public init(siteID: Int64) {
+        self.siteID = siteID
+    }
+
     /// (Attempts) to convert a dictionary into Output.
     ///
-    func map(response: Data) throws -> Output {
+    public func map(response: Data) throws -> Output {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
         decoder.userInfo = [

Modules/Sources/Networking/Mapper/WooShippingConfigMapper.swift

@@ -44,5 +44,10 @@ private struct WooShippingConfigMapperEnvelope: Decodable {
 extension WooShippingConfigMapper {
     /// Load only the relevant fields from remote
     ///
-    static let fieldsToLoad = "config.shipments, config.shippingLabelData.currentOrderLabels"
+    static let fieldsToLoad = [
+        "config.shipments",
+        "config.shippingLabelData.currentOrderLabels",
+        "config.shippingLabelData.storedData.selected_destination",
+        "config.shippingLabelData.storedData.selected_origin"
+    ].joined(separator: ", ")
 }

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -2424,6 +2424,7 @@ extension Networking.ShippingLabelAccountSettings {
         isEmailReceiptsEnabled: CopiableProp<Bool> = .copy,
         paperSize: CopiableProp<ShippingLabelPaperSize> = .copy,
         lastSelectedPackageID: CopiableProp<String> = .copy,
+        lastOrderCompleted: CopiableProp<Bool> = .copy,
         addPaymentMethodURL: NullableCopiableProp<URL> = .copy
     ) -> Networking.ShippingLabelAccountSettings {
         let siteID = siteID ?? self.siteID
@@ -2438,6 +2439,7 @@ extension Networking.ShippingLabelAccountSettings {
         let isEmailReceiptsEnabled = isEmailReceiptsEnabled ?? self.isEmailReceiptsEnabled
         let paperSize = paperSize ?? self.paperSize
         let lastSelectedPackageID = lastSelectedPackageID ?? self.lastSelectedPackageID
+        let lastOrderCompleted = lastOrderCompleted ?? self.lastOrderCompleted
         let addPaymentMethodURL = addPaymentMethodURL ?? self.addPaymentMethodURL
 
         return Networking.ShippingLabelAccountSettings(
@@ -2453,6 +2455,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: isEmailReceiptsEnabled,
             paperSize: paperSize,
             lastSelectedPackageID: lastSelectedPackageID,
+            lastOrderCompleted: lastOrderCompleted,
             addPaymentMethodURL: addPaymentMethodURL
         )
     }
@@ -3481,7 +3484,7 @@ extension Networking.WooShippingAddress {
 extension Networking.WooShippingConfig {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,
-        shipments: CopiableProp<[String: [WooShippingShipmentItem]]> = .copy,
+        shipments: CopiableProp<[WooShippingShipment]> = .copy,
         shippingLabelData: NullableCopiableProp<WooShippingLabelData> = .copy
     ) -> Networking.WooShippingConfig {
         let siteID = siteID ?? self.siteID
@@ -3724,6 +3727,30 @@ extension Networking.WooShippingPackagesResponse {
     }
 }
 
+extension Networking.WooShippingShipment {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        orderID: CopiableProp<Int64> = .copy,
+        index: CopiableProp<String> = .copy,
+        items: CopiableProp<[WooShippingShipmentItem]> = .copy,
+        shippingLabel: NullableCopiableProp<ShippingLabel> = .copy
+    ) -> Networking.WooShippingShipment {
+        let siteID = siteID ?? self.siteID
+        let orderID = orderID ?? self.orderID
+        let index = index ?? self.index
+        let items = items ?? self.items
+        let shippingLabel = shippingLabel ?? self.shippingLabel
+
+        return Networking.WooShippingShipment(
+            siteID: siteID,
+            orderID: orderID,
+            index: index,
+            items: items,
+            shippingLabel: shippingLabel
+        )
+    }
+}
+
 extension Networking.WooShippingShipmentItem {
     public func copy(
         id: CopiableProp<Int64> = .copy,

Modules/Sources/Networking/Model/ShippingLabel/Packages/WooShippingPackagePurchase.swift

@@ -73,6 +73,11 @@ extension WooShippingPackagePurchase {
 
         return rates
     }
+
+    /// shipment ID to set for hazmat and customs form
+    var formattedShipmentID: String {
+        return WooShippingShipmentIDFormatter.formattedShipmentID(shipmentID)
+    }
 }
 
 // MARK: Enodable
@@ -86,7 +91,11 @@ extension WooShippingPackagePurchase: Encodable {
         try container.encode(package.boxID, forKey: .boxID)
         try container.encode(package.length, forKey: .length)
         try container.encode(package.width, forKey: .width)
-        try container.encode(package.height, forKey: .height)
+
+        // workaround because 0 would cause an error for the API request
+        let packageHeight = package.height > 0 ? package.height : 0.25
+        try container.encode(packageHeight, forKey: .height)
+
         try container.encode(package.weight, forKey: .weight)
         try container.encode(package.isLetter, forKey: .isLetter)
         try container.encode(rate.shipmentID, forKey: .shipmentID)
@@ -96,6 +105,20 @@ extension WooShippingPackagePurchase: Encodable {
         try container.encode(rate.title, forKey: .serviceName)
         try container.encode(productIDs, forKey: .products)
 
+        if let hazmat = package.hazmatCategory {
+            try container.encode(hazmat, forKey: .hazmat)
+        }
+
+        if let form = package.customsForm {
+            try container.encode(form.contentsType.rawValue, forKey: .contentsType)
+            try container.encode(form.contentExplanation, forKey: .contentsExplanation)
+            try container.encode(form.restrictionType.rawValue, forKey: .restrictionType)
+            try container.encode(form.restrictionComments, forKey: .restrictionComments)
+            try container.encode(form.nonDeliveryOption.rawValue, forKey: .nonDeliveryOption)
+            try container.encode(form.itn, forKey: .itn)
+            try container.encode(form.items, forKey: .items)
+        }
+
         if selectedRate.signatureRate != nil {
             try container.encode(Values.yes, forKey: .signature)
         } else if selectedRate.adultSignatureRate != nil {
@@ -140,7 +163,7 @@ extension WooShippingPackagePurchase: Encodable {
     /// Converts the hazmat settings to a dictionary as the API expects it.
     /// Includes the shipment ID if there are hazmat settings to report.
     public func encodedHazmat() -> [String: Any] {
-        [shipmentID: [
+        [formattedShipmentID: [
             ParameterKeys.isHazmat: package.hazmatCategory != nil,
             ParameterKeys.category: package.hazmatCategory ?? String()
         ]]
@@ -150,9 +173,9 @@ extension WooShippingPackagePurchase: Encodable {
     /// Includes the shipment ID with the encoded customs form.
     public func encodedCustomsForm() throws -> [String: Any] {
         guard let form = package.customsForm else {
-            return [shipmentID: [:]]
+            return [formattedShipmentID: [:]]
         }
-        return [shipmentID: [
+        return [formattedShipmentID: [
             ParameterKeys.items: try form.items.map { try $0.toDictionary() },
             ParameterKeys.contentsType: form.contentsType.rawValue,
             ParameterKeys.contentsExplanation: form.contentExplanation,
@@ -181,6 +204,14 @@ extension WooShippingPackagePurchase: Encodable {
         case carbonNeutral = "carbon_neutral"
         case saturdayDelivery = "saturday_delivery"
         case additionalHandling = "additional_handling"
+        case hazmat
+        case contentsType = "contents_type"
+        case contentsExplanation = "contents_explanation"
+        case restrictionType = "restriction_type"
+        case restrictionComments = "restriction_comments"
+        case nonDeliveryOption = "non_delivery_option"
+        case itn
+        case items
     }
 
     private enum ParameterKeys {