Use correct CoD learnMore url for current plugin

joshheald · joshheald · commit cbbecd94b354 · 2022-08-30T06:10:58.000+01:00
diff --git a/WooCommerce/Classes/System/WooConstants.swift b/WooCommerce/Classes/System/WooConstants.swift
@@ -180,9 +180,14 @@ extension WooConstants {
 #else
         case couponManagementFeedback = "https://automattic.survey.fm/woo-app-coupon-management-production"
 #endif
-        /// URL for the Enable Cash on Delivery (or Pay in Person) onboarding step's learn more link.
+        /// URL for the Enable Cash on Delivery (or Pay in Person) onboarding step's learn more link using the Stripe plugin
         /// 
-        case cashOnDeliveryLearnMoreUrl = "https://woocommerce.com/document/stripe/accept-in-person-payments-with-stripe/#section-8"
+        case stripeCashOnDeliveryLearnMoreUrl = "https://woocommerce.com/document/stripe/accept-in-person-payments-with-stripe/#section-8"
+
+        /// URL for the Enable Cash on Delivery (or Pay in Person) onboarding step's learn more link using the WCPay plugin
+        ///
+        case wcPayCashOnDeliveryLearnMoreUrl =
+                "https://woocommerce.com/document/payments/getting-started-with-in-person-payments-with-woocommerce-payments/#add-cod-payment-method"
 
         /// Returns the URL version of the receiver
         ///
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift
@@ -309,7 +309,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
         }
         if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.promptToEnableCodInIppOnboarding) {
             if shouldShowCashOnDeliveryStep {
-                return .codPaymentGatewayNotSetUp
+                return .codPaymentGatewayNotSetUp(plugin: plugin)
             }
         }
         guard !isInUndefinedState(account: account) else {
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import Yosemite
 
 final class InPersonPaymentsViewController: UIHostingController<InPersonPaymentsView> {
     private let onWillDisappear: (() -> ())?
@@ -71,8 +72,12 @@ struct InPersonPaymentsView: View {
                 InPersonPaymentsStripeAccountReview(analyticReason: viewModel.state.reasonForAnalytics)
             case .stripeAccountRejected:
                 InPersonPaymentsStripeRejected(analyticReason: viewModel.state.reasonForAnalytics)
-            case .codPaymentGatewayNotSetUp:
-                InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView(viewModel: viewModel.codStepViewModel)
+            case .codPaymentGatewayNotSetUp(let plugin):
+                InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView(
+                    viewModel: InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+                        plugin: plugin,
+                        analyticReason: viewModel.state.reasonForAnalytics,
+                        completion: viewModel.refresh))
             case .completed:
                 InPersonPaymentsCompleted()
             case .noConnectionError:
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewModel.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewModel.swift
@@ -9,11 +9,6 @@ final class InPersonPaymentsViewModel: ObservableObject {
     private let useCase: CardPresentPaymentsOnboardingUseCase
     let stores: StoresManager
 
-    lazy var codStepViewModel: InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel = {
-        InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(configuration: useCase.configurationLoader.configuration,
-                                                                      completion: refresh)
-    }()
-
     /// Initializes the view model for a specific site
     ///
     init(stores: StoresManager = ServiceLocator.stores,
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView.swift
@@ -28,7 +28,7 @@ struct InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView: View {
 
             Spacer()
 
-            InPersonPaymentsLearnMore(url: WooConstants.URLs.cashOnDeliveryLearnMoreUrl.asURL(),
+            InPersonPaymentsLearnMore(url: viewModel.learnMoreURL,
                                       formatText: Localization.cashOnDeliveryLearnMore,
                                       analyticReason: viewModel.analyticReason)
         }
@@ -37,8 +37,11 @@ struct InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView: View {
 
 struct InPersonPaymentsCodPaymentGatewayNotSetUp_Previews: PreviewProvider {
     static var previews: some View {
-        let viewModel = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(configuration: CardPresentPaymentsConfiguration(country: "US"),
-                                                                                      completion: {})
+        let viewModel = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+            configuration: CardPresentPaymentsConfiguration(country: "US"),
+            plugin: .wcPay,
+            analyticReason: "",
+            completion: {})
         return InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView(viewModel: viewModel)
     }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel.swift
@@ -36,7 +36,7 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel: Obser
 
     @Published var awaitingResponse = false
 
-    let analyticReason: String = CardPresentPaymentOnboardingState.codPaymentGatewayNotSetUp.reasonForAnalytics
+    let analyticReason: String
 
     // MARK: - Configuration properties
     private let cardPresentPaymentsConfiguration: CardPresentPaymentsConfiguration
@@ -45,11 +45,17 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel: Obser
         stores.sessionManager.defaultStoreID
     }
 
+    let learnMoreURL: URL
+
     init(dependencies: Dependencies = Dependencies(),
-         configuration: CardPresentPaymentsConfiguration,
+         configuration: CardPresentPaymentsConfiguration = CardPresentConfigurationLoader().configuration,
+         plugin: CardPresentPaymentsPlugin,
+         analyticReason: String,
          completion: @escaping () -> Void) {
         self.dependencies = dependencies
         self.cardPresentPaymentsConfiguration = configuration
+        self.learnMoreURL = plugin.cashOnDeliveryLearnMoreURL
+        self.analyticReason = analyticReason
         self.completion = completion
     }
 
@@ -169,3 +175,14 @@ private enum Localization {
 private enum Constants {
     static let cashOnDeliveryGatewayID = "cod"
 }
+
+private extension CardPresentPaymentsPlugin {
+    var cashOnDeliveryLearnMoreURL: URL {
+        switch self {
+        case .wcPay:
+            return WooConstants.URLs.wcPayCashOnDeliveryLearnMoreUrl.asURL()
+        case .stripe:
+            return WooConstants.URLs.stripeCashOnDeliveryLearnMoreUrl.asURL()
+        }
+    }
+}
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift
@@ -780,7 +780,7 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {
         let state = useCase.state
 
         // Then
-        assertEqual(.codPaymentGatewayNotSetUp, state)
+        assertEqual(.codPaymentGatewayNotSetUp(plugin: .wcPay), state)
     }
 
     func test_onboarding_returns_complete_when_cod_disabled_and_cod_step_was_skipped() {
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests.swift
@@ -31,19 +31,25 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
             noticePresenter: noticePresenter,
             analytics: analytics
         )
-        sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: dependencies,
-                                                                            configuration: configuration,
-                                                                            completion: {})
+        sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+            dependencies: dependencies,
+            configuration: configuration,
+            plugin: .wcPay,
+            analyticReason: AnalyticProperties.cashOnDeliveryDisabledReason,
+            completion: {})
     }
 
     func test_skip_always_calls_completion() {
         // Given
         let completionCalled: Bool = waitFor { promise in
-            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: self.dependencies,
-                                                                                    configuration: self.configuration,
-                                                                                    completion: {
-                promise(true)
-            })
+            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+                dependencies: self.dependencies,
+                configuration: self.configuration,
+                plugin: .wcPay,
+                analyticReason: AnalyticProperties.cashOnDeliveryDisabledReason,
+                completion: {
+                    promise(true)
+                })
 
             // When
             sut.skipTapped()
@@ -85,11 +91,14 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
         }
 
         let completionCalled: Bool = waitFor { promise in
-            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: self.dependencies,
-                                                                                    configuration: self.configuration,
-                                                                                    completion: {
-                promise(true)
-            })
+            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+                dependencies: self.dependencies,
+                configuration: self.configuration,
+                plugin: .wcPay,
+                analyticReason: AnalyticProperties.cashOnDeliveryDisabledReason,
+                completion: {
+                    promise(true)
+                })
             // When
             sut.enableTapped()
         }
@@ -163,9 +172,12 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
         }
 
         let _: Void = waitFor { promise in
-            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: self.dependencies,
-                                                                                    configuration: self.configuration,
-                                                                                    completion: {
+            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(
+                dependencies: self.dependencies,
+                configuration: self.configuration,
+                plugin: .wcPay,
+                analyticReason: AnalyticProperties.cashOnDeliveryDisabledReason,
+                completion: {
                 promise(())
             })
             // When
diff --git a/Yosemite/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift b/Yosemite/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift
@@ -64,7 +64,7 @@ public enum CardPresentPaymentOnboardingState: Equatable {
     /// The Cash on Delivery payment gateway is missing or disabled
     /// Enabling Cash on Delivery is not essential for Card Present Payments, but allows web store customers to place orders and pay by card in person.
     ///
-    case codPaymentGatewayNotSetUp
+    case codPaymentGatewayNotSetUp(plugin: CardPresentPaymentsPlugin)
 
     /// Generic error - for example, one of the requests failed.
     ///

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ private extension CardPresentPaymentsOnboardingUseCase {`
`309`	`309`	`}`
`310`	`310`	`if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.promptToEnableCodInIppOnboarding) {`
`311`	`311`	`if shouldShowCashOnDeliveryStep {`
`312`		`- return .codPaymentGatewayNotSetUp`
	`312`	`+ return .codPaymentGatewayNotSetUp(plugin: plugin)`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`	`guard !isInUndefinedState(account: account) else {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ struct InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView: View {`
`28`	`28`
`29`	`29`	`Spacer()`
`30`	`30`
`31`		`- InPersonPaymentsLearnMore(url: WooConstants.URLs.cashOnDeliveryLearnMoreUrl.asURL(),`
	`31`	`+ InPersonPaymentsLearnMore(url: viewModel.learnMoreURL,`
`32`	`32`	`formatText: Localization.cashOnDeliveryLearnMore,`
`33`	`33`	`analyticReason: viewModel.analyticReason)`
`34`	`34`	`}`
`@@ -37,8 +37,11 @@ struct InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView: View {`
`37`	`37`
`38`	`38`	`struct InPersonPaymentsCodPaymentGatewayNotSetUp_Previews: PreviewProvider {`
`39`	`39`	`static var previews: some View {`
`40`		`- let viewModel = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(configuration: CardPresentPaymentsConfiguration(country: "US"),`
`41`		`- completion: {})`
	`40`	`+ let viewModel = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(`
	`41`	`+ configuration: CardPresentPaymentsConfiguration(country: "US"),`
	`42`	`+ plugin: .wcPay,`
	`43`	`+ analyticReason: "",`
	`44`	`+ completion: {})`
`42`	`45`	`return InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpView(viewModel: viewModel)`
`43`	`46`	`}`
`44`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,7 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {`
`780`	`780`	`let state = useCase.state`
`781`	`781`
`782`	`782`	`// Then`
`783`		`- assertEqual(.codPaymentGatewayNotSetUp, state)`
	`783`	`+ assertEqual(.codPaymentGatewayNotSetUp(plugin: .wcPay), state)`
`784`	`784`	`}`
`785`	`785`
`786`	`786`	`func test_onboarding_returns_complete_when_cod_disabled_and_cod_step_was_skipped() {`