Use a different plugin URL for WooPayments and Stripe

woocommerce · Jan 23, 2025 · 69a793a · 69a793a
1 parent 041e882
commit 69a793a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/WooCommerce/Classes/Extensions/Site+URL.swift b/WooCommerce/Classes/Extensions/Site+URL.swift
@@ -27,11 +27,15 @@ extension Site {
     }
 
     /// Returns the plugin URL from wp-admin that handles pending tasks or requirements during onboarding.
-    /// Both WCPay and Stripe use the same URL.
-    /// Payments Connect page was recommended by the web team over Payments Overview page in pdfdoF-5Bo-p2#comment-6655
     ///
-    func cardPresentPluginHasPendingTasksURL() -> String {
-        return adminURL + "admin.php?page=wc-admin&path=%2Fpayments%2Fconnect"
+    func cardPresentPluginHasPendingTasksURL(plugin: CardPresentPaymentsPlugin) -> String {
+        switch plugin {
+        case .wcPay:
+            /// Payments Connect page was recommended by the web team over Payments Overview page in pdfdoF-5Bo-p2#comment-6655
+            return adminURL + "admin.php?page=wc-admin&path=%2Fpayments%2Fconnect"
+        case .stripe:
+            return pluginSettingsSectionURL(from: .stripe) + "&panel=settings"
+        }
     }
 
     /// Returns the WooCommerce admin URL, or attempts to construct it from the site URL.

diff --git a/...d/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingViewController.swift b/...d/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingViewController.swift
@@ -66,9 +66,10 @@ struct CardPresentPaymentsOnboardingView: View {
                     viewModel.refresh)
             case .pluginSetupNotCompleted(let plugin):
                 InPersonPaymentsPluginNotSetup(plugin: plugin, analyticReason: viewModel.state.reasonForAnalytics, onRefresh: viewModel.refresh)
-            case .stripeAccountOverdueRequirement:
+            case .stripeAccountOverdueRequirement(let plugin):
                 InPersonPaymentsStripeAccountOverdue(analyticReason: viewModel.state.reasonForAnalytics,
-                                                     onRefresh: viewModel.refresh)
+                                                     onRefresh: viewModel.refresh,
+                                                     plugin: plugin)
             case .stripeAccountPendingRequirement(_, let deadline):
                 InPersonPaymentsStripeAccountPending(
                     deadline: deadline,

diff --git a/...hboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSetup.swift b/...hboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSetup.swift
@@ -54,7 +54,7 @@ struct InPersonPaymentsPluginNotSetup: View {
     }
 
     private var setupURL: URL? {
-        guard let pluginSectionURL = ServiceLocator.stores.sessionManager.defaultSite?.cardPresentPluginHasPendingTasksURL() else {
+        guard let pluginSectionURL = ServiceLocator.stores.sessionManager.defaultSite?.cardPresentPluginHasPendingTasksURL(plugin: plugin) else {
             return nil
         }
 

diff --git a/...tings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAccountOverdueView.swift b/...tings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAccountOverdueView.swift
@@ -4,9 +4,9 @@ import enum Yosemite.CardPresentPaymentsPlugin
 struct InPersonPaymentsStripeAccountOverdue: View {
     let analyticReason: String
     let onRefresh: () -> Void
+    let plugin: CardPresentPaymentsPlugin
     @State private var presentedSetupURL: URL? = nil
 
-    private let plugin: CardPresentPaymentsPlugin = .stripe
 
     var body: some View {
         InPersonPaymentsOnboardingError(
@@ -36,7 +36,7 @@ struct InPersonPaymentsStripeAccountOverdue: View {
      }
 
     private var setupURL: URL? {
-        guard let pluginSectionURL = ServiceLocator.stores.sessionManager.defaultSite?.cardPresentPluginHasPendingTasksURL() else {
+        guard let pluginSectionURL = ServiceLocator.stores.sessionManager.defaultSite?.cardPresentPluginHasPendingTasksURL(plugin: plugin) else {
             return nil
         }
 
@@ -77,6 +77,6 @@ private enum Localization {
 
 struct InPersonPaymentsStripeAccountOverdue_Previews: PreviewProvider {
     static var previews: some View {
-        InPersonPaymentsStripeAccountOverdue(analyticReason: "", onRefresh: { })
+        InPersonPaymentsStripeAccountOverdue(analyticReason: "", onRefresh: { }, plugin: .stripe)
     }
 }
diff --git a/WooCommerce/WooCommerceTests/Extensions/SitePluginsURLTests.swift b/WooCommerce/WooCommerceTests/Extensions/SitePluginsURLTests.swift
@@ -43,4 +43,18 @@ final class Site_PluginsURLTests: XCTestCase {
         // Then
         XCTAssertEqual(site.pluginSettingsSectionURL(from: .stripe), expectedURL)
     }
+
+    func test_cardPresentPluginHasPendingTasksURL_when_plugin_is_wcpay_then_returns_correct_URL() {
+        let expectedURL = adminURL + "admin.php?page=wc-admin&path=%2Fpayments%2Fconnect"
+
+        // Then
+        XCTAssertEqual(site.cardPresentPluginHasPendingTasksURL(plugin: .wcPay), expectedURL)
+    }
+
+    func test_cardPresentPluginHasPendingTasksURL_when_plugin_is_stripe_then_returns_correct_URL() {
+        let expectedURL = adminURL + "admin.php?page=wc-settings&tab=checkout&section=stripe&panel=settings"
+
+        // Then
+        XCTAssertEqual(site.cardPresentPluginHasPendingTasksURL(plugin: .stripe), expectedURL)
+    }
 }