This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ 185.768406] usb 1-1.4: USB disconnect, device number 6 | |
[ 186.221886] usb 1-1.4: new full-speed USB device number 7 using xhci_hcd | |
[ 186.309282] usb 1-1.4: New USB device found, idVendor=2e3c, idProduct=df11, bcdDevice= 2.00 | |
[ 186.309295] usb 1-1.4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 | |
[ 186.309300] usb 1-1.4: Product: DFU in FS Mode | |
[ 186.309304] usb 1-1.4: Manufacturer: Artery-Tech | |
[ 186.309308] usb 1-1.4: SerialNumber: AT32 | |
[ 190.888587] usb 1-1.4: USB disconnect, device number 7 | |
[ 193.113266] usb 1-1.4: new high-speed USB device number 8 using xhci_hcd | |
[ 193.198524] usb 1-1.4: New USB device found, idVendor=3434, idProduct=0521, bcdDevice= 1.00 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-----BEGIN PGP SIGNATURE----- | |
iF0EABECAB0WIQRTfp4EYbpfKwpG2yW81a2QeT9rAgUCaDVqbQAKCRC81a2QeT9r | |
AlXYAJ9T1FFXC5ZW3RvRrEynytDm3v2/RQCdE++TcbjjNzpJUKsboANFlB5Vyog= | |
=IZgZ | |
-----END PGP SIGNATURE----- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
index d26f26b356..a3a0f44a9d 100644 | |
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
@@ -28,6 +28,26 @@ protocol CardPresentPaymentsOnboardingUseCaseProtocol { | |
func updateState() | |
} | |
+protocol CardPresentPaymentsOnboardingUseCaseStateCheckResultProtocol { | |
+ var state: CardPresentPaymentOnboardingState { get } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
index d26f26b356..ff25da7b4e 100644 | |
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
@@ -28,6 +28,26 @@ protocol CardPresentPaymentsOnboardingUseCaseProtocol { | |
func updateState() | |
} | |
+protocol CardPresentPaymentsOnboardingUseCaseStateCheckResultProtocol { | |
+ var state: CardPresentPaymentOnboardingState { get } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
index d26f26b356..bb4eeb5019 100644 | |
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift | |
@@ -96,7 +96,7 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU | |
precondition(state == .selectPlugin) | |
preferredPluginLocal = plugin | |
updateState() | |
- if state == .completed(plugin: plugin) { | |
+ if state == .completed(plugin: plugin, multipleGateways: true) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import Storage | |
enum BetaFeature: CaseIterable { | |
case viewAddOns | |
case productSKUScanner | |
case couponManagement | |
} | |
extension BetaFeature { | |
var title: String { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import Storage | |
enum BetaFeature { | |
case viewAddOns | |
case productSKUScanner | |
case couponManagement | |
} | |
extension BetaFeature { | |
var title: String { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
index 88d5f9c4e..cf5a438c6 100644 | |
--- a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
+++ b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
@@ -42,12 +42,12 @@ extension StripeCardReaderService: CardReaderService { | |
} | |
public var connectedReaders: AnyPublisher<[CardReader], Never> { | |
- connectedReadersSubject.eraseToAnyPublisher() | |
+ connectedReadersSubject.print("🐞💳 connectedReaders").eraseToAnyPublisher() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift b/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift | |
index 0aae4c9b9..8ef7cd097 100644 | |
--- a/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift | |
+++ b/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift | |
@@ -2,25 +2,25 @@ import Foundation | |
public struct CardPresentPaymentsConfiguration { | |
private let countryCode: String | |
- private let stripeTerminalforCanadaEnabled: Bool | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift b/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift | |
index d913d37e1..e4b96334b 100644 | |
--- a/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift | |
+++ b/WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift | |
@@ -551,20 +551,14 @@ extension WooAnalyticsEvent { | |
static let softwareUpdateType = "software_update_type" | |
} | |
- static let unknownGatewayID = "unknown" | |
- |
NewerOlder