[Woo POS][Barcodes] Set up flow: last scanner – Netum 1228BC (#15945)

Author: staskus

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

@@ -64,10 +64,6 @@ struct PointOfSaleBarcodeScannerSetup: View {
 
     private var scannerOptions: [PointOfSaleBarcodeScannerSetupFlowOption] {
         [
-            PointOfSaleBarcodeScannerSetupFlowOption(
-                title: Localization.socketS720Title,
-                scannerType: .socketS720
-            ),
             PointOfSaleBarcodeScannerSetupFlowOption(
                 title: Localization.starBSH20BTitle,
                 scannerType: .starBSH20B
@@ -76,6 +72,10 @@ struct PointOfSaleBarcodeScannerSetup: View {
                 title: Localization.tera12002DTitle,
                 scannerType: .tera12002D
             ),
+            PointOfSaleBarcodeScannerSetupFlowOption(
+                title: Localization.netum1228BCTitle,
+                scannerType: .netum1228BC
+            ),
             PointOfSaleBarcodeScannerSetupFlowOption(
                 title: Localization.otherTitle,
                 scannerType: .other
@@ -94,11 +94,6 @@ private enum Constants {
 @available(iOS 17.0, *)
 private extension PointOfSaleBarcodeScannerSetup {
     enum Localization {
-        static let socketS720Title = NSLocalizedString(
-            "pos.barcodeScannerSetup.socketS720.title",
-            value: "Socket S720",
-            comment: "Title for Socket S720 scanner option in barcode scanner setup"
-        )
         static let starBSH20BTitle = NSLocalizedString(
             "pos.barcodeScannerSetup.starBSH20B.title",
             value: "Star BSH-20B",
@@ -109,6 +104,11 @@ private extension PointOfSaleBarcodeScannerSetup {
             value: "Tera 1200 2D",
             comment: "Title for Tera 1200 2D scanner option in barcode scanner setup"
         )
+        static let netum1228BCTitle = NSLocalizedString(
+            "pos.barcodeScannerSetup.netum1228BC.title",
+            value: "Netum 1228BC",
+            comment: "Title for Netum 1228BC scanner option in barcode scanner setup"
+        )
         static let otherTitle = NSLocalizedString(
             "pos.barcodeScannerSetup.other.title",
             value: "Other",

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

@@ -104,11 +104,6 @@ class PointOfSaleBarcodeScannerSetupFlow {
 
     private func createFlowSteps(for scannerType: PointOfSaleBarcodeScannerType) -> [PointOfSaleBarcodeScannerStepID: PointOfSaleBarcodeScannerSetupStep] {
         switch scannerType {
-        case .socketS720:
-            return [
-                .setupBarcodeHID: createWelcomeStep(title: "Socket S720 Setup")
-                // TODO: Add more steps for Socket S720 WOOMOB-698
-            ]
         case .starBSH20B:
             return [
                 .setupBarcodeHID: PointOfSaleBarcodeScannerSetupStep(
@@ -177,6 +172,46 @@ class PointOfSaleBarcodeScannerSetupFlow {
                 .complete: setupCompleteStep(),
                 .setupProducts: setupProductsStep()
             ]
+        case .netum1228BC:
+            return [
+                .setupBarcodeHID: PointOfSaleBarcodeScannerSetupStep(
+                    content: {
+                        PointOfSaleBarcodeScannerBarcodeView(
+                            title: Localization.scannerSetUpBarcodeStepTitleFormat,
+                            instruction: Localization.setUpBarcodeHIDStepInstruction,
+                            barcode: .netum1228BCHIDBarcode)
+                    },
+                    transitions: [
+                        .next: .setupBarcodePair,
+                    ]
+                ),
+                .setupBarcodePair: PointOfSaleBarcodeScannerSetupStep(
+                    content: {
+                        PointOfSaleBarcodeScannerBarcodeView(
+                            title: Localization.scannerSetUpBarcodeStepTitleFormat,
+                            instruction: Localization.setUpBarcodePairStepInstruction,
+                            barcode: .netum1228BCPairBarcode)
+                    },
+                    transitions: [
+                        .next: .pairing,
+                        .back: .setupBarcodeHID
+                    ]
+                ),
+                .pairing: PointOfSaleBarcodeScannerSetupStep(
+                    content: {
+                        PointOfSaleBarcodeScannerPairingView(scanner: scannerType)
+                    },
+                    transitions: [
+                        .next: .test,
+                        .back: .setupBarcodePair
+                    ]
+                ),
+                .test: testScanStep(barcode: .ean13),
+                .testScanTimedOut: testScanTimeOutStep(barcode: .ean13),
+                .testScanFailed: testScanFailedStep(),
+                .complete: setupCompleteStep(),
+                .setupProducts: setupProductsStep()
+            ]
         case .other:
             return [
                 .setupInformation: PointOfSaleBarcodeScannerSetupStep(
@@ -194,7 +229,7 @@ class PointOfSaleBarcodeScannerSetupFlow {
 
     private func initialStep(for scannerType: PointOfSaleBarcodeScannerType) -> PointOfSaleBarcodeScannerStepID {
         switch scannerType {
-        case .socketS720, .starBSH20B, .tera12002D:
+        case .starBSH20B, .tera12002D, .netum1228BC:
             return .setupBarcodeHID
         case .other:
             return .setupInformation
@@ -205,14 +240,6 @@ class PointOfSaleBarcodeScannerSetupFlow {
         return currentStepKey.analyticsValue
     }
 
-    private func createWelcomeStep(title: String) -> PointOfSaleBarcodeScannerSetupStep {
-        PointOfSaleBarcodeScannerSetupStep(
-            title: title,
-            content: { PointOfSaleBarcodeScannerWelcomeView(title: title) },
-            buttonCustomization: PointOfSaleBarcodeScannerWelcomeButtonCustomization()
-        )
-    }
-
     // MARK: - Steps
 
     private func testScanStep(

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

@@ -8,32 +8,32 @@ struct PointOfSaleBarcodeScannerSetupFlowOption: Identifiable {
 }
 
 enum PointOfSaleBarcodeScannerType {
-    case socketS720
     case starBSH20B
     case tera12002D
+    case netum1228BC
     case other
 
     var name: String {
         switch self {
-        case .socketS720:
-            return Localization.socketS720Name
         case .starBSH20B:
             return Localization.starBsh20BName
         case .tera12002D:
             return Localization.tera12002DName
+        case .netum1228BC:
+            return Localization.netum1228BCName
         case .other:
             return Localization.otherName
         }
     }
 
     var analyticsName: String {
         switch self {
-        case .socketS720:
-            return "Socket_S720"
         case .starBSH20B:
             return "Star_BSH_20B"
         case .tera12002D:
             return "Tera_1200_2D"
+        case .netum1228BC:
+            return "Netum_1228BC"
         case .other:
             return "other"
         }
@@ -43,9 +43,9 @@ enum PointOfSaleBarcodeScannerType {
 private extension PointOfSaleBarcodeScannerType {
     //TODO: WOOMOB-792
     enum Localization {
-        static let socketS720Name = "Socket S720"
         static let starBsh20BName = "Star BSH-20B"
         static let tera12002DName = "Tera 1200 2D"
+        static let netum1228BCName = "Netum 1228BC"
         static let otherName = "Other scanner"
     }
 }

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

@@ -1,23 +1,5 @@
 import SwiftUI
 
-// TODO: Remove this view when all flows are complete
-struct PointOfSaleBarcodeScannerWelcomeView: View {
-    let title: String
-
-    var body: some View {
-        VStack(spacing: POSSpacing.medium) {
-            Text(title)
-                .font(.posBodyLargeBold)
-                .foregroundColor(.posOnSurface)
-
-            Text("TODO: Implement \(title) setup flow")
-                .font(.posBodyMediumRegular())
-                .foregroundColor(.posOnSurfaceVariantHighest)
-                .multilineTextAlignment(.center)
-        }
-    }
-}
-
 struct PointOfSaleBarcodeScannerBarcodeView: View {
     let title: String
     let instruction: String
@@ -212,25 +194,3 @@ struct PointOfSaleBarcodeScannerErrorView: View {
         "to factory settings, then retry the set up flow."
     }
 }
-
-// MARK: - Button Customizations
-@available(iOS 17.0, *)
-struct PointOfSaleBarcodeScannerWelcomeButtonCustomization: PointOfSaleBarcodeScannerButtonCustomization {
-    func customizeButtons(for flow: PointOfSaleBarcodeScannerSetupFlow) -> PointOfSaleFlowButtonConfiguration {
-        return PointOfSaleFlowButtonConfiguration(
-            primaryButton: PointOfSaleFlowButtonConfiguration.ButtonConfig(
-                title: Localization.doneButtonTitle,
-                action: { flow.nextStep() }
-            ),
-            secondaryButton: nil
-        )
-    }
-
-    private enum Localization {
-        static let doneButtonTitle = NSLocalizedString(
-            "pos.barcodeScannerSetup.done.button.title",
-            value: "Done",
-            comment: "Title for the done button in barcode scanner setup navigation"
-        )
-    }
-}

WooCommerce/Classes/POS/Presentation/PointOfSaleAssets.swift

@@ -20,6 +20,8 @@ enum PointOfSaleAssets: CaseIterable {
     case starBsh20SetupBarcode
     case tera12002DHIDBarcode
     case tera12002DPairBarcode
+    case netum1228BCHIDBarcode
+    case netum1228BCPairBarcode
     case testEan13Barcode
 
     var imageName: String {
@@ -62,6 +64,10 @@ enum PointOfSaleAssets: CaseIterable {
             "tera-1200-2d-hid-barcode"
         case .tera12002DPairBarcode:
             "tera-1200-2d-pair-barcode"
+        case .netum1228BCHIDBarcode:
+            "netum-1228bc-hid-barcode"
+        case .netum1228BCPairBarcode:
+            "netum-1228bc-pair-barcode"
         }
     }
 }

WooCommerce/Resources/Images.xcassets/POS/BarcodeScanning/netum-1228bc-hid-barcode.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "netum-1228bc-hid-barcode.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WooCommerce/Resources/Images.xcassets/POS/BarcodeScanning/netum-1228bc-hid-barcode.imageset/netum-1228bc-hid-barcode.pdf

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "netum-1228bc-pair-barcode.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WooCommerce/Resources/Images.xcassets/POS/BarcodeScanning/netum-1228bc-pair-barcode.imageset/Contents.json

@@ -75,7 +75,7 @@ struct PointOfSaleBarcodeScannerSetupFlowManagerTests {
         )
 
         // Setup a scanner flow
-        sut.selectScanner(.socketS720)
+        sut.selectScanner(.netum1228BC)
         mockAnalytics.events.removeAll() // Clear the selection event
 
         // When keyboard connected notification is posted
@@ -84,7 +84,7 @@ struct PointOfSaleBarcodeScannerSetupFlowManagerTests {
         // Then it tracks the scanner connected event
         let event = mockAnalytics.events.first
         #expect(event?.eventName == WooAnalyticsStat.pointOfSaleBarcodeScannerSetupScannerConnected.rawValue)
-        #expect(event?.properties["scanner"] as? String == "Socket_S720")
+        #expect(event?.properties["scanner"] as? String == "Netum_1228BC")
     }
 
     @available(iOS 17.0, *)