[Woo POS][Barcodes] Set up flow: low end – Scanner Tera 1200 2D (#15913)

Author: staskus

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

@@ -66,8 +66,8 @@ struct PointOfSaleBarcodeScannerSetup: View {
                 scannerType: .starBSH20B
             ),
             PointOfSaleBarcodeScannerSetupFlowOption(
-                title: Localization.tbcScannerTitle,
-                scannerType: .tbcScanner
+                title: Localization.tera12002DTitle,
+                scannerType: .tera12002D
             ),
             PointOfSaleBarcodeScannerSetupFlowOption(
                 title: Localization.otherTitle,
@@ -96,10 +96,10 @@ private extension PointOfSaleBarcodeScannerSetup {
             value: "Star BSH-20B",
             comment: "Title for Star BSH-20B scanner option in barcode scanner setup"
         )
-        static let tbcScannerTitle = NSLocalizedString(
-            "pos.barcodeScannerSetup.tbcScanner.title",
-            value: "Scanner TBC",
-            comment: "Title for TBC scanner option in barcode scanner setup"
+        static let tera12002DTitle = NSLocalizedString(
+            "pos.barcodeScannerSetup.tera12002D.title",
+            value: "Tera 1200 2D",
+            comment: "Title for Tera 1200 2D scanner option in barcode scanner setup"
         )
         static let otherTitle = NSLocalizedString(
             "pos.barcodeScannerSetup.other.title",

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

@@ -111,8 +111,8 @@ class PointOfSaleBarcodeScannerSetupFlow {
                 .setupBarcodeHID: PointOfSaleBarcodeScannerSetupStep(
                     content: {
                         PointOfSaleBarcodeScannerBarcodeView(
-                            title: String(format: Localization.starSetUpBarcodeStepTitleFormat, scannerType.name),
-                            instruction: Localization.setUpBarcodeStepInstruction,
+                            title: String(format: Localization.scannerSetUpBarcodeStepTitleFormat, scannerType.name),
+                            instruction: Localization.setUpBarcodeHIDStepInstruction,
                             barcode: .starBsh20SetupBarcode)
                     },
                     transitions: [
@@ -128,35 +128,51 @@ class PointOfSaleBarcodeScannerSetupFlow {
                         .back: .setupBarcodeHID
                     ]
                 ),
-                .test: testBarcodeStep(barcode: .ean13, timerCompleted: false),
-                .testScanTimedOut: testBarcodeStep(barcode: .ean13, timerCompleted: true),
-                .complete: PointOfSaleBarcodeScannerSetupStep(
+                .test: testScanStep(barcode: .ean13),
+                .testScanTimedOut: testScanTimeOutStep(barcode: .ean13),
+                .testScanFailed: testScanFailedStep(),
+                .complete: setupCompleteStep(),
+                .setupInformation: setupInformationStep()
+            ]
+        case .tera12002D:
+            return [
+                .setupBarcodeHID: PointOfSaleBarcodeScannerSetupStep(
                     content: {
-                        PointOfSaleBarcodeScannerSetupCompleteView()
+                        PointOfSaleBarcodeScannerBarcodeView(
+                            title: Localization.scannerSetUpBarcodeStepTitleFormat,
+                            instruction: Localization.setUpBarcodeHIDStepInstruction,
+                            barcode: .tera12002DHIDBarcode)
                     },
-                    buttonCustomization: PointOfSaleBarcodeScannerOptionalScannerInformationButtonCustomization(),
                     transitions: [
-                        .next: .setupInformation,
-                    ]),
-                .testScanFailed: PointOfSaleBarcodeScannerSetupStep(
+                        .next: .setupBarcodePair,
+                    ]
+                ),
+                .setupBarcodePair: PointOfSaleBarcodeScannerSetupStep(
                     content: {
-                        PointOfSaleBarcodeScannerErrorView()
+                        PointOfSaleBarcodeScannerBarcodeView(
+                            title: Localization.scannerSetUpBarcodeStepTitleFormat,
+                            instruction: Localization.setUpBarcodePairStepInstruction,
+                            barcode: .tera12002DPairBarcode)
                     },
-                    buttonCustomization: PointOfSaleBarcodeScannerErrorButtonCustomization(),
                     transitions: [
-                        .retry: .setupBarcodeHID,
-                        .back: .test
+                        .next: .pairing,
+                        .back: .setupBarcodeHID
                     ]
                 ),
-                .setupInformation: PointOfSaleBarcodeScannerSetupStep(
-                    content: { ProductBarcodeSetupInformation() },
-                    buttonCustomization: PointOfSaleBarcodeScannerNoButtonsButtonCustomization()
-                )
-            ]
-        case .tbcScanner:
-            return [
-                .setupBarcodeHID: createWelcomeStep(title: "TBC Scanner Setup")
-                // TODO: Add more steps for TBC Scanner WOOMOB-699
+                .pairing: PointOfSaleBarcodeScannerSetupStep(
+                    content: {
+                        PointOfSaleBarcodeScannerPairingView(scanner: scannerType)
+                    },
+                    transitions: [
+                        .next: .test,
+                        .back: .setupBarcodePair
+                    ]
+                ),
+                .test: testScanStep(barcode: .ean13),
+                .testScanTimedOut: testScanTimeOutStep(barcode: .ean13),
+                .testScanFailed: testScanFailedStep(),
+                .complete: setupCompleteStep(),
+                .setupInformation: setupInformationStep()
             ]
         case .other:
             return [
@@ -175,7 +191,7 @@ class PointOfSaleBarcodeScannerSetupFlow {
 
     private func initialStep(for scannerType: PointOfSaleBarcodeScannerType) -> PointOfSaleBarcodeScannerStepID {
         switch scannerType {
-        case .socketS720, .starBSH20B, .tbcScanner:
+        case .socketS720, .starBSH20B, .tera12002D:
             return .setupBarcodeHID
         case .other:
             return .setupInformation
@@ -194,7 +210,9 @@ class PointOfSaleBarcodeScannerSetupFlow {
         )
     }
 
-    private func testBarcodeStep(barcode: PointOfSaleBarcodeScannerTestBarcode, timerCompleted: Bool) -> PointOfSaleBarcodeScannerSetupStep {
+    // MARK: - Steps
+
+    private func testScanStep(barcode: PointOfSaleBarcodeScannerTestBarcode, timerCompleted: Bool = false) -> PointOfSaleBarcodeScannerSetupStep {
         PointOfSaleBarcodeScannerSetupStep(
             content: {
                 PointOfSaleBarcodeScannerTestBarcodeView(
@@ -221,6 +239,41 @@ class PointOfSaleBarcodeScannerSetupFlow {
             ]
         )
     }
+
+    private func testScanTimeOutStep(barcode: PointOfSaleBarcodeScannerTestBarcode) -> PointOfSaleBarcodeScannerSetupStep {
+        testScanStep(barcode: barcode, timerCompleted: true)
+    }
+
+    private func testScanFailedStep() -> PointOfSaleBarcodeScannerSetupStep {
+        PointOfSaleBarcodeScannerSetupStep(
+            content: {
+                PointOfSaleBarcodeScannerErrorView()
+            },
+            buttonCustomization: PointOfSaleBarcodeScannerErrorButtonCustomization(),
+            transitions: [
+                .retry: .setupBarcodeHID,
+                .back: .test
+            ]
+        )
+    }
+
+    private func setupCompleteStep() -> PointOfSaleBarcodeScannerSetupStep {
+        PointOfSaleBarcodeScannerSetupStep(
+            content: {
+                PointOfSaleBarcodeScannerSetupCompleteView()
+            },
+            buttonCustomization: PointOfSaleBarcodeScannerOptionalScannerInformationButtonCustomization(),
+            transitions: [
+                .next: .setupInformation,
+            ])
+    }
+
+    private func setupInformationStep() -> PointOfSaleBarcodeScannerSetupStep {
+        PointOfSaleBarcodeScannerSetupStep(
+            content: { ProductBarcodeSetupInformation() },
+            buttonCustomization: PointOfSaleBarcodeScannerNoButtonsButtonCustomization()
+        )
+    }
 }
 
 @available(iOS 17.0, *)
@@ -326,9 +379,7 @@ private extension PointOfSaleBarcodeScannerSetupFlow {
     }
 
     private func trackRetry() {
-        if let step = getCurrentAnalyticsStepValue() {
-            analytics.track(event: WooAnalyticsEvent.PointOfSale.barcodeScannerSetupRetryTapped(scanner: scannerType))
-        }
+        analytics.track(event: WooAnalyticsEvent.PointOfSale.barcodeScannerSetupRetryTapped(scanner: scannerType))
     }
 }
 
@@ -347,7 +398,8 @@ private extension PointOfSaleBarcodeScannerSetupFlow {
             comment: "Title for the back button in barcode scanner setup navigation"
         )
         //TODO: WOOMOB-792
-        static let starSetUpBarcodeStepTitleFormat = "%1$@ Setup"
-        static let setUpBarcodeStepInstruction = "Scan the barcode to set up your scanner."
+        static let scannerSetUpBarcodeStepTitleFormat = "Scanner Setup"
+        static let setUpBarcodeHIDStepInstruction = "Scan the Bluetooth HID symbol."
+        static let setUpBarcodePairStepInstruction = "Scan the Pair symbol to get the scanner ready for pairing."
     }
 }

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

@@ -10,7 +10,7 @@ struct PointOfSaleBarcodeScannerSetupFlowOption: Identifiable {
 enum PointOfSaleBarcodeScannerType {
     case socketS720
     case starBSH20B
-    case tbcScanner
+    case tera12002D
     case other
 
     var name: String {
@@ -19,8 +19,8 @@ enum PointOfSaleBarcodeScannerType {
             return Localization.socketS720Name
         case .starBSH20B:
             return Localization.starBsh20BName
-        case .tbcScanner:
-            return Localization.tbcScannerName
+        case .tera12002D:
+            return Localization.tera12002DName
         case .other:
             return Localization.otherName
         }
@@ -32,8 +32,8 @@ enum PointOfSaleBarcodeScannerType {
             return "Socket_S720"
         case .starBSH20B:
             return "Star_BSH_20B"
-        case .tbcScanner:
-            return "TBC"
+        case .tera12002D:
+            return "Tera_1200_2D"
         case .other:
             return "other"
         }
@@ -45,7 +45,7 @@ private extension PointOfSaleBarcodeScannerType {
     enum Localization {
         static let socketS720Name = "Socket S720"
         static let starBsh20BName = "Star BSH-20B"
-        static let tbcScannerName = "TBC scanner"
+        static let tera12002DName = "Tera 1200 2D"
         static let otherName = "Other scanner"
     }
 }

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

@@ -41,13 +41,14 @@ struct PointOfSaleBarcodeScannerBarcodeView: View {
                 .resizable()
                 .aspectRatio(contentMode: .fit)
                 .frame(maxHeight: Constants.maxBarcodeSize)
+                .background(Color.white)
         }
     }
 }
 
 extension PointOfSaleBarcodeScannerBarcodeView {
     enum Constants {
-        static let maxBarcodeSize: CGFloat = 168
+        static let maxBarcodeSize: CGFloat = 142
     }
 }
 

WooCommerce/Classes/POS/Presentation/PointOfSaleAssets.swift

@@ -18,6 +18,8 @@ enum PointOfSaleAssets: CaseIterable {
     case barcodeFieldScreenshot
     //TODO: WOOMOB-793 Update the imagesets for these barcodes to vector/dark mode friendly images
     case starBsh20SetupBarcode
+    case tera12002DHIDBarcode
+    case tera12002DPairBarcode
     case testEan13Barcode
 
     var imageName: String {
@@ -56,6 +58,10 @@ enum PointOfSaleAssets: CaseIterable {
             "star-bsh20-setup-barcode"
         case .testEan13Barcode:
             "test-ean13-barcode"
+        case .tera12002DHIDBarcode:
+            "tera-1200-2d-hid-barcode"
+        case .tera12002DPairBarcode:
+            "tera-1200-2d-pair-barcode"
         }
     }
 }

WooCommerce/Resources/Images.xcassets/POS/BarcodeScanning/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}