Merge pull request #5930 from woocommerce/issue/5529-stripe-extension-too-old

[Mobile Payments] Prompt user to update the specific out of date plugin

Author: allendav

WooCommerce/Classes/Extensions/UIImage+Woo.swift

@@ -585,9 +585,15 @@ extension UIImage {
         return UIImage(named: "woo-payments-loading")!
     }
 
-    /// Payments plugin
+    /// WooCommerce Stripe Gateway plugin
     ///
-    static var paymentsPlugin: UIImage {
+    static var stripePlugin: UIImage {
+        return UIImage(named: "stripe-payments-plugin")!
+    }
+
+    /// WooCommerce Payments plugin
+    ///
+    static var wcPayPlugin: UIImage {
         return UIImage(named: "woo-payments-plugin")!
     }
 

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift

@@ -178,7 +178,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
             return .pluginNotInstalled
         }
         guard isWCPayVersionSupported(plugin: plugin) else {
-            return .pluginUnsupportedVersion
+            return .pluginUnsupportedVersion(plugin: .wcPay)
         }
         guard plugin.active else {
             return .pluginNotActivated
@@ -190,7 +190,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
 
     func stripeGatewayOnlyOnboardingState(plugin: SystemPlugin) -> CardPresentPaymentOnboardingState {
         guard isStripeVersionSupported(plugin: plugin) else {
-            return .pluginUnsupportedVersion
+            return .pluginUnsupportedVersion(plugin: .stripe)
         }
         return accountChecks()
     }
@@ -244,15 +244,15 @@ private extension CardPresentPaymentsOnboardingUseCase {
     }
 
     func isCountrySupported(countryCode: String) -> Bool {
-        return Constants.WCPay.supportedCountryCodes.contains(countryCode)
+        return CardPresentPaymentsPlugins.wcPay.supportedCountryCodes.contains(countryCode)
     }
 
     func getWCPayPlugin() -> SystemPlugin? {
         guard let siteID = siteID else {
             return nil
         }
         return storageManager.viewStorage
-            .loadSystemPlugin(siteID: siteID, name: Constants.WCPay.pluginName)?
+            .loadSystemPlugin(siteID: siteID, name: CardPresentPaymentsPlugins.wcPay.pluginName)?
             .toReadOnly()
     }
 
@@ -261,7 +261,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
             return nil
         }
         return storageManager.viewStorage
-            .loadSystemPlugin(siteID: siteID, name: Constants.Stripe.pluginName)?
+            .loadSystemPlugin(siteID: siteID, name: CardPresentPaymentsPlugins.stripe.pluginName)?
             .toReadOnly()
     }
 
@@ -282,11 +282,11 @@ private extension CardPresentPaymentsOnboardingUseCase {
     }
 
     func isWCPayVersionSupported(plugin: SystemPlugin) -> Bool {
-        VersionHelpers.isVersionSupported(version: plugin.version, minimumRequired: Constants.WCPay.minimumSupportedPluginVersion)
+        VersionHelpers.isVersionSupported(version: plugin.version, minimumRequired: CardPresentPaymentsPlugins.wcPay.minimumSupportedPluginVersion)
     }
 
     func isStripeVersionSupported(plugin: SystemPlugin) -> Bool {
-        VersionHelpers.isVersionSupported(version: plugin.version, minimumRequired: Constants.Stripe.minimumSupportedPluginVersion)
+        VersionHelpers.isVersionSupported(version: plugin.version, minimumRequired: CardPresentPaymentsPlugins.stripe.minimumSupportedPluginVersion)
     }
 
     // Note: This counts on synchronizeStoreCountryAndPlugins having been called to get
@@ -348,17 +348,3 @@ private extension PaymentGatewayAccount {
         .init(rawValue: status)
     }
 }
-
-private enum Constants {
-    enum WCPay {
-        static let pluginName = "WooCommerce Payments"
-        static let minimumSupportedPluginVersion = "3.2.1"
-        static let supportedCountryCodes = ["US"]
-    }
-
-    enum Stripe {
-        static let pluginName = "WooCommerce Stripe Gateway"
-        static let minimumSupportedPluginVersion = "5.9.0"
-        static let supportedCountryCodes = ["US"]
-    }
-}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift

@@ -33,8 +33,8 @@ struct InPersonPaymentsView: View {
                 InPersonPaymentsCountryNotSupported(countryCode: countryCode)
             case .pluginNotInstalled:
                 InPersonPaymentsPluginNotInstalled(onRefresh: viewModel.refresh)
-            case .pluginUnsupportedVersion:
-                InPersonPaymentsPluginNotSupportedVersion(onRefresh: viewModel.refresh)
+            case .pluginUnsupportedVersion(let plugin):
+                InPersonPaymentsPluginNotSupportedVersion(plugin: plugin, onRefresh: viewModel.refresh)
             case .pluginNotActivated:
                 InPersonPaymentsPluginNotActivated(onRefresh: viewModel.refresh)
             case .pluginInTestModeWithLiveStripeAccount:

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsLiveSiteInTestModeView.swift

@@ -8,7 +8,7 @@ struct InPersonPaymentsLiveSiteInTestMode: View {
             title: Localization.title,
             message: Localization.message,
             image: InPersonPaymentsOnboardingError.ImageInfo(
-                image: .paymentsPlugin,
+                image: .wcPayPlugin,
                 height: 108.0
             ),
             supportLink: false,

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotActivatedView.swift

@@ -8,7 +8,7 @@ struct InPersonPaymentsPluginNotActivated: View {
             title: Localization.title,
             message: Localization.message,
             image: InPersonPaymentsOnboardingError.ImageInfo(
-                image: .paymentsPlugin,
+                image: .wcPayPlugin,
                 height: 108.0
             ),
             supportLink: false,

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotInstalledView.swift

@@ -8,7 +8,7 @@ struct InPersonPaymentsPluginNotInstalled: View {
             title: Localization.title,
             message: Localization.message,
             image: InPersonPaymentsOnboardingError.ImageInfo(
-                image: .paymentsPlugin,
+                image: .wcPayPlugin,
                 height: 126.0
             ),
             supportLink: false,

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSupportedVersionView.swift

@@ -1,14 +1,16 @@
 import SwiftUI
+import Yosemite
 
 struct InPersonPaymentsPluginNotSupportedVersion: View {
+    let plugin: CardPresentPaymentsPlugins
     let onRefresh: () -> Void
 
     var body: some View {
         InPersonPaymentsOnboardingError(
-            title: Localization.title,
-            message: Localization.message,
+            title: String(format: Localization.title, plugin.pluginName),
+            message: String(format: Localization.message, plugin.pluginName),
             image: InPersonPaymentsOnboardingError.ImageInfo(
-                image: .paymentsPlugin,
+                image: image,
                 height: 108.0
             ),
             supportLink: false,
@@ -19,28 +21,37 @@ struct InPersonPaymentsPluginNotSupportedVersion: View {
             )
         )
     }
+
+    var image: UIImage {
+        switch plugin {
+        case .wcPay:
+            return .wcPayPlugin
+        case .stripe:
+            return .stripePlugin
+        }
+    }
 }
 
 private enum Localization {
     static let title = NSLocalizedString(
-        "Unsupported WooCommerce Payments version",
-        comment: "Title for the error screen when the installed version of WooCommerce Payments is unsupported"
+        "Unsupported %@ version",
+        comment: "Title for the error screen when the installed version of a Card Present Payments extension is unsupported"
     )
 
     static let message = NSLocalizedString(
-        "The WooCommerce Payments extension is installed on your store, but needs to be updated for In-Person Payments. "
-            + "Please update WooCommerce Payments to the most recent version.",
-        comment: "Error message when WooCommerce Payments is installed but the version is not supported"
+        "The %@ extension is installed on your store, but needs to be updated for In-Person Payments. "
+            + "Please update it to the most recent version.",
+        comment: "Error message when a Card Present Payments extension is installed but the version is not supported"
     )
 
     static let primaryButton = NSLocalizedString(
         "Refresh After Updating",
-        comment: "Button to reload plugin data after updating the WooCommerce Payments plugin"
+        comment: "Button to reload plugin data after updating a Card Present Payments extension plugin"
     )
 }
 
 struct InPersonPaymentsPluginNotSupportedVersion_Previews: PreviewProvider {
     static var previews: some View {
-        InPersonPaymentsPluginNotSupportedVersion(onRefresh: {})
+        InPersonPaymentsPluginNotSupportedVersion(plugin: .wcPay, onRefresh: {})
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsSelectPluginView.swift

@@ -12,7 +12,7 @@ struct InPersonPaymentsSelectPlugin: View {
                 title: Localization.title,
                 message: Localization.message,
                 image: InPersonPaymentsOnboardingError.ImageInfo(
-                    image: .paymentsPlugin,
+                    image: .wcPayPlugin,
                     height: Constants.height
                 ),
                 supportLink: false

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsWCPayNotSetup.swift

@@ -12,7 +12,7 @@ struct InPersonPaymentsWCPayNotSetup: View {
                 title: Localization.title,
                 message: Localization.message,
                 image: InPersonPaymentsOnboardingError.ImageInfo(
-                    image: .paymentsPlugin,
+                    image: .wcPayPlugin,
                     height: 108.0
                 ),
                 supportLink: false

WooCommerce/Resources/Images.xcassets/stripe-payments-plugin.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "stripe-payments-plugin.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "stripe-payments-plugin-1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}