Skip to content

[Woo POS] Remove site_id frompos_card_present_collect_payment_success event #15894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025
Merged

[Woo POS] Remove site_id frompos_card_present_collect_payment_success event #15894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,15 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac

private let analytics: Analytics

private let siteID: Int64
private var paymentGatewayAccount: PaymentGatewayAccount?
private let configuration: CardPresentPaymentsConfiguration
private var connectedReader: CardReader?
var connectedReaderModel: String? {
connectedReader?.readerType.model
}

init(siteID: Int64,
analytics: Analytics = ServiceLocator.analytics,
init(analytics: Analytics = ServiceLocator.analytics,
configuration: CardPresentPaymentsConfiguration = CardPresentConfigurationLoader().configuration) {
self.siteID = siteID
self.analytics = analytics
self.configuration = configuration
}
Expand Down Expand Up @@ -61,7 +58,6 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac
countryCode: configuration.countryCode,
paymentMethod: capturedPaymentData.paymentMethod,
cardReaderModel: connectedReaderModel,
siteID: siteID,
millisecondsSinceCustomerIteractionStarted: elapsedTimeSinceCustomerInteraction,
millisecondsSinceOrderSyncSuccess: elapsedTimeSinceOrderSync,
millisecondsSinceReaderReadyToCollect: elapsedTimeSinceCardReaderReady,
Expand Down
3 changes: 0 additions & 3 deletions WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ extension WooAnalyticsEvent {
static let cardReaderModel = "card_reader_model"
static let countryCode = "country"
static let paymentMethodType = "payment_method_type"
static let siteID = "site_id"
static let gatewayID = "plugin_slug"
}

Expand Down Expand Up @@ -111,7 +110,6 @@ extension WooAnalyticsEvent {
countryCode: CountryCode,
paymentMethod: PaymentMethod,
cardReaderModel: String?,
siteID: Int64,
millisecondsSinceCustomerIteractionStarted: Double,
millisecondsSinceOrderSyncSuccess: Double,
millisecondsSinceReaderReadyToCollect: Double,
Expand All @@ -122,7 +120,6 @@ extension WooAnalyticsEvent {
Key.countryCode: countryCode.rawValue,
Key.gatewayID: safeGatewayID(for: forGatewayID),
Key.paymentMethodType: paymentMethod.analyticsValue,
Key.siteID: siteID,
Key.millisecondsSinceCustomerInteractionStarted: "\(millisecondsSinceCustomerIteractionStarted)",
Key.millisecondsSinceOrderSyncSuccess: "\(millisecondsSinceOrderSyncSuccess)",
Key.millisecondsSinceReaderReadyToCollect: "\(millisecondsSinceReaderReadyToCollect)",
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private extension POSTabCoordinator {
func presentPOSView() {
Task { @MainActor [weak self] in
guard let self else { return }
let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID)
let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
stores: storesManager,
collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
Expand Down
3 changes: 1 addition & 2 deletions WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ final class HubMenuViewModel: ObservableObject {
}()

private(set) var cardPresentPaymentService: CardPresentPaymentFacade?
private(set) var collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics
private(set) var collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
private let analytics: Analytics

init(siteID: Int64,
Expand All @@ -181,7 +181,6 @@ final class HubMenuViewModel: ObservableObject {
currencySettings: ServiceLocator.currencySettings,
featureFlagService: featureFlagService)
self.analytics = analytics
self.collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID)
observeSiteForUIUpdates()
observePlanName()
observeGoogleAdsEntryPointAvailability()
Expand Down
3 changes: 1 addition & 2 deletions WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct POSCollectOrderPaymentAnalyticsTests {
// Given
let siteID: Int64 = 123
let configuration = CardPresentPaymentsConfiguration(country: .US)
let sut = POSCollectOrderPaymentAnalytics(siteID: siteID, analytics: analytics, configuration: configuration)
let sut = POSCollectOrderPaymentAnalytics(analytics: analytics, configuration: configuration)
let capturedPaymentData = CardPresentCapturedPaymentData(paymentMethod: .cardPresent(details: .fake()), receiptParameters: nil)
let expectedEvent = "card_present_collect_payment_success"
let expectedProperties = [
Expand All @@ -29,7 +29,6 @@ struct POSCollectOrderPaymentAnalyticsTests {
"card_reader_model",
"country",
"payment_method_type",
"site_id",
"plugin_slug"
]

Expand Down
Loading