Merge pull request #5819 from woocommerce/issue/payment-link-bits

Author: Ecarrion

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -37,8 +37,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .couponManagement:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .simplePaymentsLink:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .productSKUInputScanner:
             return true
         default:

Experiments/Experiments/FeatureFlag.swift

@@ -70,10 +70,6 @@ public enum FeatureFlag: Int {
     ///
     case myStoreTabUpdates
 
-    /// Allow merchants to share a payment link when creating a simple payments order.
-    ///
-    case simplePaymentsLink
-
     /// Displays the option to manage coupons
     ///
     case couponManagement

RELEASE-NOTES.txt

@@ -5,6 +5,7 @@
 - [***] All merchants can create Simple Payments orders. [https://github.com/woocommerce/woocommerce-ios/pull/5684]
 - [**] System status report can now be viewed and copied directly from within the app. [https://github.com/woocommerce/woocommerce-ios/pull/5702]
 - [**] Product SKU input scanner is now available as a beta feature. To try it, enable it from settings and you can scan a barcode to use as the product SKU in product inventory settings! [https://github.com/woocommerce/woocommerce-ios/pull/5695]
+- [**] Now you chan share a payment link when creating a Simple Payments order [https://github.com/woocommerce/woocommerce-ios/pull/5819]
 
 8.2
 -----

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -382,6 +382,7 @@ extension WooAnalyticsEvent {
         enum PaymentMethod: String {
             case card
             case cash
+            case paymentLink = "payment_link"
         }
 
         /// Possible view sources

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Method/SimplePaymentsMethod.swift

@@ -58,7 +58,7 @@ struct SimplePaymentsMethod: View {
 
                     MethodRow(icon: .linkImage, title: Localization.link) {
                         sharingPaymentLink = true
-                        // TODO: Analytics
+                        viewModel.trackCollectByPaymentLink()
                     }
                 }
             }
@@ -161,7 +161,7 @@ private extension SimplePaymentsMethod {
         static let header = NSLocalizedString("Choose your payment method", comment: "Heading text on the select payment method screen for simple payments")
         static let cash = NSLocalizedString("Cash", comment: "Cash method title on the select payment method screen for simple payments")
         static let card = NSLocalizedString("Card", comment: "Card method title on the select payment method screen for simple payments")
-        static let link = NSLocalizedString("Payment Link", comment: "Payment Link method title on the select payment method screen for simple payments")
+        static let link = NSLocalizedString("Share Payment Link", comment: "Payment Link method title on the select payment method screen for simple payments")
         static let markAsPaidTitle = NSLocalizedString("Mark as Paid?", comment: "Alert title when selecting the cash payment method for simple payments")
         static let markAsPaidButton = NSLocalizedString("Mark as Paid", comment: "Alert button when selecting the cash payment method for simple payments")
     }

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Method/SimplePaymentsMethodsViewModel.swift

@@ -37,7 +37,7 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
     /// Defines if the view should show a payment link payment method.
     ///
     var showPaymentLinkRow: Bool {
-        enablePaymentLink && paymentLink != nil
+        paymentLink != nil
     }
 
     /// Store's ID.
@@ -72,10 +72,6 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
     ///
     private let analytics: Analytics
 
-    /// Defines if sharing a payment link should be enabled or not.
-    ///
-    private let enablePaymentLink: Bool
-
     /// Stored payment gateways accounts.
     /// We will care about the first one because only one is supported right now.
     ///
@@ -109,8 +105,7 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
          cppStoreStateObserver: CardPresentPaymentsOnboardingUseCaseProtocol = CardPresentPaymentsOnboardingUseCase(),
          stores: StoresManager = ServiceLocator.stores,
          storage: StorageManagerType = ServiceLocator.storageManager,
-         analytics: Analytics = ServiceLocator.analytics,
-         enablePaymentLink: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(FeatureFlag.simplePaymentsLink)) {
+         analytics: Analytics = ServiceLocator.analytics) {
         self.siteID = siteID
         self.orderID = orderID
         self.formattedTotal = formattedTotal
@@ -119,7 +114,6 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
         self.stores = stores
         self.storage = storage
         self.analytics = analytics
-        self.enablePaymentLink = enablePaymentLink
         self.title = Localization.title(total: formattedTotal)
 
         bindStoreCPPState()
@@ -203,11 +197,15 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
         trackCollectIntention(method: .cash)
     }
 
+    func trackCollectByPaymentLink() {
+        trackCollectIntention(method: .paymentLink)
+    }
+
     /// Perform the necesary tasks after a link is shared.
     ///
     func performLinkSharedTasks() {
-        self.presentNoticeSubject.send(.created)
-        // TODO: Analytics
+        presentNoticeSubject.send(.created)
+        trackFlowCompleted(method: .paymentLink)
     }
 }
 

WooCommerce/WooCommerceTests/ViewRelated/Orders/Simple Payments/SimplePaymentsMethodsViewModelTests.swift

@@ -177,6 +177,20 @@ final class SimplePaymentsMethodsViewModelTests: XCTestCase {
         assertEqual(analytics.receivedProperties.first?["amount"] as? String, "$12.00")
     }
 
+    func test_completed_event_is_tracked_after_sharing_a_link() {
+        // Given
+        let analytics = MockAnalyticsProvider()
+        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", analytics: WooAnalytics(analyticsProvider: analytics))
+
+        // When
+        viewModel.performLinkSharedTasks()
+
+        // Then
+        assertEqual(analytics.receivedEvents.first, WooAnalyticsStat.simplePaymentsFlowCompleted.rawValue)
+        assertEqual(analytics.receivedProperties.first?["payment_method"] as? String, "payment_link")
+        assertEqual(analytics.receivedProperties.first?["amount"] as? String, "$12.00")
+    }
+
     func test_failed_event_is_tracked_after_failing_to_mark_order_as_paid() {
         // Given
         let stores = MockStoresManager(sessionManager: .testingInstance)
@@ -200,7 +214,7 @@ final class SimplePaymentsMethodsViewModelTests: XCTestCase {
         assertEqual(analytics.receivedProperties.first?["source"] as? String, "payment_method")
     }
 
-    func test_collect_event_is_tracked_when_required() {
+    func test_collect_event_is_tracked_when_paying_by_cash() {
         // Given
         let analytics = MockAnalyticsProvider()
         let stores = MockStoresManager(sessionManager: .testingInstance)
@@ -214,6 +228,19 @@ final class SimplePaymentsMethodsViewModelTests: XCTestCase {
         assertEqual(analytics.receivedProperties.first?["payment_method"] as? String, "cash")
     }
 
+    func test_collect_event_is_tracked_when_sharing_payment_links() {
+        // Given
+        let analytics = MockAnalyticsProvider()
+        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", analytics: WooAnalytics(analyticsProvider: analytics))
+
+        // When
+        viewModel.trackCollectByPaymentLink()
+
+        // Then
+        assertEqual(analytics.receivedEvents, [WooAnalyticsStat.simplePaymentsFlowCollect.rawValue])
+        assertEqual(analytics.receivedProperties.first?["payment_method"] as? String, "payment_link")
+    }
+
     func test_collect_event_is_tracked_when_collecting_payment() {
         // Given
         let analytics = MockAnalyticsProvider()
@@ -273,7 +300,7 @@ final class SimplePaymentsMethodsViewModelTests: XCTestCase {
         }
 
         // When
-        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", stores: stores, enablePaymentLink: true)
+        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", stores: stores)
 
         // Then
         XCTAssertFalse(viewModel.showPaymentLinkRow)
@@ -296,7 +323,7 @@ final class SimplePaymentsMethodsViewModelTests: XCTestCase {
         }
 
         // When
-        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", stores: stores, enablePaymentLink: true)
+        let viewModel = SimplePaymentsMethodsViewModel(formattedTotal: "$12.00", stores: stores)
 
         // Then
         XCTAssertTrue(viewModel.showPaymentLinkRow)