Merge branch 'trunk' into woomob-945-wooposbarcodes-disable-scanning-when-the-support-view-is

Author: staskus

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -104,7 +104,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSaleBarcodeScanningi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .orderAddressMapSearch:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         default:
             return true
         }

RELEASE-NOTES.txt

@@ -6,6 +6,8 @@
 - [*] Increased decimal sensitivity in order creation to mitigate tax rounding issues [https://github.com/woocommerce/woocommerce-ios/pull/15957]
 - [*] Fix initialization of authenticator to avoid crashes during login [https://github.com/woocommerce/woocommerce-ios/pull/15953]
 - [*] Shipping Labels: Made HS tariff number field required in customs form for EU destinations [https://github.com/woocommerce/woocommerce-ios/pull/15946]
+- [*] Order Details > Edit Shipping/Billing Address: Added map-based address lookup support for iOS 17+. [https://github.com/woocommerce/woocommerce-ios/pull/15964]
+- [*] Order Creation: Prevent subscription products to be added to an order [https://github.com/woocommerce/woocommerce-ios/pull/15960]
 - [internal] Replace COTS_DEVICE reader model name with TAP_TO_PAY_DEVICE. [https://github.com/woocommerce/woocommerce-ios/pull/15961]
 
 22.9

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -450,6 +450,8 @@ enum WooAnalyticsStat: String {
     case orderDetailEditFlowFailed = "order_detail_edit_flow_failed"
     case orderDetailPaymentLinkShared = "order_detail_payment_link_shared"
     case orderDetailTrashButtonTapped = "order_detail_trash_tapped"
+    case orderDetailEditAddressMapPickerTapped = "order_detail_edit_address_map_picker_tapped"
+    case orderDetailEditAddressMapPickerUseAddressTapped = "order_detail_edit_address_map_picker_use_address_tapped"
 
     // MARK: Test order
     //

WooCommerce/Classes/POS/Models/Cart+BarcodeScanError.swift

@@ -121,9 +121,9 @@ extension PointOfSaleBarcodeScanError {
         )
 
         static let incompleteScan = NSLocalizedString(
-            "pointOfSale.barcodeScan.error.incompleteScan",
-            value: "Partial barcode scan",
-            comment: "Error message shown when scan is incomplete."
+            "pointOfSale.barcodeScan.error.incompleteScan.2",
+            value: "The scanner did not send an end-of-line character",
+            comment: "Error message shown when scanner times out without sending end-of-line character."
         )
 
         static let parsingError = NSLocalizedString(

WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupModels.swift

@@ -29,11 +29,11 @@ enum PointOfSaleBarcodeScannerType {
     var analyticsName: String {
         switch self {
         case .starBSH20B:
-            return "Star_BSH_20B"
+            return "star_bsh_20b"
         case .tera12002D:
-            return "Tera_1200_2D"
+            return "tera_1200_2d"
         case .netum1228BC:
-            return "Netum_1228BC"
+            return "netum_1228bc"
         case .other:
             return "other"
         }

WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupStepViews.swift

@@ -196,9 +196,9 @@ private extension PointOfSaleBarcodeScannerSetupCompleteView {
             comment: "Title shown when scanner setup is successfully completed"
         )
         static let instruction = NSLocalizedString(
-            "pos.barcodeScannerSetup.complete.instruction",
-            value: "You are ready to start scanning products. \nRead more about barcode and QR code scanner support.",
-            comment: "Message shown when scanner setup is complete, with additional information link"
+            "pos.barcodeScannerSetup.complete.instruction.2",
+            value: "You are ready to start scanning products. Next time you need to connect your scanner, just turn it on and it will reconnect automatically.",
+            comment: "Message shown when scanner setup is complete"
         )
     }
 }

WooCommerce/Classes/POS/Presentation/Barcode Scanning/GameControllerBarcodeParser.swift

@@ -15,6 +15,7 @@ final class GameControllerBarcodeParser {
     private var buffer = ""
     private var lastKeyPressTime: Date?
     private var scanStartTime: Date?
+    private var timeoutTimer: Timer?
 
     init(configuration: HIDBarcodeParserConfiguration,
          onScan: @escaping (HIDBarcodeParserResult) -> Void,
@@ -49,6 +50,7 @@ final class GameControllerBarcodeParser {
             }
 
             buffer.append(character)
+            scheduleTimeoutTimer()
         }
     }
 
@@ -186,6 +188,31 @@ final class GameControllerBarcodeParser {
         buffer = ""
         lastKeyPressTime = nil
         scanStartTime = nil
+        cancelTimeoutTimer()
+    }
+
+    private func scheduleTimeoutTimer() {
+        cancelTimeoutTimer()
+        timeoutTimer = timeProvider.scheduleTimer(
+            timeInterval: configuration.maximumInterCharacterTime,
+            target: self,
+            selector: #selector(handleTimeoutExpiry)
+        )
+    }
+
+    private func cancelTimeoutTimer() {
+        timeoutTimer?.invalidate()
+        timeoutTimer = nil
+    }
+
+    @objc private func handleTimeoutExpiry() {
+        guard !buffer.isEmpty else { return }
+
+        let scanDurationMs = calculateScanDurationMs()
+        let result = HIDBarcodeParserResult.failure(error: HIDBarcodeParserError.timedOut(barcode: buffer), scanDurationMs: scanDurationMs)
+
+        onScan(result)
+        resetScan()
     }
 
     private func calculateScanDurationMs() -> Int {
@@ -194,6 +221,7 @@ final class GameControllerBarcodeParser {
     }
 
     private func processScan() {
+        cancelTimeoutTimer()
         checkForTimeoutBetweenKeystrokes()
         let scanDurationMs = calculateScanDurationMs()
 

WooCommerce/Classes/POS/Presentation/Barcode Scanning/TimeProvider.swift

@@ -2,10 +2,15 @@ import Foundation
 
 protocol TimeProvider {
     func now() -> Date
+    func scheduleTimer(timeInterval: TimeInterval, target: Any, selector: Selector) -> Timer
 }
 
 struct DefaultTimeProvider: TimeProvider {
     func now() -> Date {
         Date()
     }
+
+    func scheduleTimer(timeInterval: TimeInterval, target: Any, selector: Selector) -> Timer {
+        return Timer.scheduledTimer(timeInterval: timeInterval, target: target, selector: selector, userInfo: nil, repeats: false)
+    }
 }

WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift

@@ -63,7 +63,13 @@ struct POSFloatingControlView: View {
                         ServiceLocator.analytics.track(.pointOfSaleBarcodeScanningMenuItemTapped)
                     } label: {
                         Label(
-                            title: { Text(Localization.barcodeScanning) },
+                            title: {
+                                if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
+                                    Text(Localization.barcodeScanningSetup)
+                                } else {
+                                    Text(Localization.barcodeScanning)
+                                }
+                            },
                             icon: { Image(systemName: "barcode.viewfinder") })
                     }
                 }
@@ -173,6 +179,12 @@ private extension POSFloatingControlView {
             value: "Barcode scanning",
             comment: "The title of the menu button to view barcode scanner documentation, shown in a popover menu."
         )
+
+        static let barcodeScanningSetup = NSLocalizedString(
+            "pointOfSale.floatingButtons.barcodeScanningSetup.button.title",
+            value: "Initial barcode scanner setup",
+            comment: "The title of the menu button to start a barcode scanner setup flow."
+        )
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/AddressMapPickerView.swift

@@ -93,6 +93,7 @@ struct AddressMapPickerView: View {
                         isSearchFocused = false
                         viewModel.updateFields(&fields)
                         dismiss()
+                        ServiceLocator.analytics.track(.orderDetailEditAddressMapPickerUseAddressTapped)
                     }
                     .disabled(!viewModel.hasValidSelection)
                 }