Merge pull request #6922 from woocommerce/issue/6905-change-text-after-card-payment

toupper · web-flow · commit 6f51e46a8b19 · 2022-05-24T10:10:29.000+02:00
[Mobile Payments] Change text after card payment
diff --git a/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccess.swift b/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccess.swift
@@ -26,7 +26,7 @@ final class CardPresentModalSuccess: CardPresentPaymentsModalViewModel {
 
     let secondaryButtonTitle: String? = Localization.emailReceipt
 
-    let auxiliaryButtonTitle: String?
+    let auxiliaryButtonTitle: String? = Localization.saveReceiptAndContinue
 
     let bottomTitle: String? = nil
 
@@ -38,12 +38,10 @@ final class CardPresentModalSuccess: CardPresentPaymentsModalViewModel {
 
     init(printReceipt: @escaping () -> Void,
          emailReceipt: @escaping () -> Void,
-         noReceiptTitle: String,
          noReceiptAction: @escaping () -> Void) {
         self.printReceiptAction = printReceipt
         self.emailReceiptAction = emailReceipt
         self.noReceiptAction = noReceiptAction
-        self.auxiliaryButtonTitle = noReceiptTitle
     }
 
     func didTapPrimaryButton(in viewController: UIViewController?) {
@@ -81,5 +79,10 @@ private extension CardPresentModalSuccess {
             "Email receipt",
             comment: "Button to email receipts. Presented to users after a payment has been successfully collected"
         )
+
+        static let saveReceiptAndContinue = NSLocalizedString(
+            "Save receipt and continue",
+            comment: "Button when the user does not want to print or email receipt. Presented to users after a payment has been successfully collected"
+        )
     }
 }
diff --git a/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccessWithoutEmail.swift b/WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccessWithoutEmail.swift
@@ -20,7 +20,7 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod
 
     let primaryButtonTitle: String? = Localization.printReceipt
 
-    let secondaryButtonTitle: String?
+    let secondaryButtonTitle: String? = Localization.saveReceiptAndContinue
 
     let auxiliaryButtonTitle: String? = nil
 
@@ -33,11 +33,9 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod
     }
 
     init(printReceipt: @escaping () -> Void,
-         noReceiptTitle: String,
          noReceiptAction: @escaping () -> Void) {
         self.printReceiptAction = printReceipt
         self.noReceiptAction = noReceiptAction
-        self.secondaryButtonTitle = noReceiptTitle
     }
 
     func didTapPrimaryButton(in viewController: UIViewController?) {
@@ -66,5 +64,10 @@ private extension CardPresentModalSuccessWithoutEmail {
             "Print receipt",
             comment: "Button to print receipts. Presented to users after a payment has been successfully collected"
         )
+
+        static let saveReceiptAndContinue = NSLocalizedString(
+            "Save receipt and continue",
+            comment: "Button when the user does not want to print the receipt. Presented to users after a payment has been successfully collected"
+        )
     }
 }
diff --git a/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlerts.swift b/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlerts.swift
@@ -69,10 +69,9 @@ final class OrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {
         presentViewModel(viewModel: viewModel)
     }
 
-    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptTitle: String, noReceiptAction: @escaping () -> Void) {
+    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptAction: @escaping () -> Void) {
         let viewModel = successViewModel(printReceipt: printReceipt,
                                          emailReceipt: emailReceipt,
-                                         noReceiptTitle: noReceiptTitle,
                                          noReceiptAction: noReceiptAction)
         presentViewModel(viewModel: viewModel)
     }
@@ -115,15 +114,13 @@ private extension OrderDetailsPaymentAlerts {
 
     func successViewModel(printReceipt: @escaping () -> Void,
                           emailReceipt: @escaping () -> Void,
-                          noReceiptTitle: String,
                           noReceiptAction: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
         if MFMailComposeViewController.canSendMail() {
             return CardPresentModalSuccess(printReceipt: printReceipt,
                                            emailReceipt: emailReceipt,
-                                           noReceiptTitle: noReceiptTitle,
                                            noReceiptAction: noReceiptAction)
         } else {
-            return CardPresentModalSuccessWithoutEmail(printReceipt: printReceipt, noReceiptTitle: noReceiptTitle, noReceiptAction: noReceiptAction)
+            return CardPresentModalSuccessWithoutEmail(printReceipt: printReceipt, noReceiptAction: noReceiptAction)
         }
     }
 
diff --git a/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlertsProtocol.swift b/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlertsProtocol.swift
@@ -12,7 +12,7 @@ protocol OrderDetailsPaymentAlertsProtocol {
 
     func processingPayment()
 
-    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptTitle: String, noReceiptAction: @escaping () -> Void)
+    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptAction: @escaping () -> Void)
 
     func error(error: Error, tryAgain: @escaping () -> Void, dismissCompletion: @escaping () -> Void)
 
diff --git a/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift b/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift
@@ -534,7 +534,7 @@ extension OrderDetailsViewModel {
     /// Checks onboarding status before connecting to a reader.
     /// Handles receipt sharing.
     ///
-    func collectPayment(rootViewController: UIViewController, backButtonTitle: String, onCollect: @escaping (Result<Void, Error>) -> Void) {
+    func collectPayment(rootViewController: UIViewController, onCollect: @escaping (Result<Void, Error>) -> Void) {
         cardPresentPaymentsOnboardingPresenter.showOnboardingIfRequired(from: rootViewController) { [weak self] in
             guard let self = self else { return }
             guard let paymentGateway = self.cardPresentPaymentGatewayAccounts.first else {
@@ -559,7 +559,6 @@ extension OrderDetailsViewModel {
                 configuration: self.configurationLoader.configuration)
 
             self.collectPaymentsUseCase?.collectPayment(
-                backButtonTitle: backButtonTitle,
                 onCollect: onCollect,
                 onCompleted: { [weak self] in
                     // Make sure we free all the resources
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Collect Payments/CollectOrderPaymentUseCase.swift b/WooCommerce/Classes/ViewRelated/Orders/Collect Payments/CollectOrderPaymentUseCase.swift
@@ -15,10 +15,9 @@ protocol CollectOrderPaymentProtocol {
     /// Starts the collect payment flow.
     ///
     ///
-    /// - Parameter backButtonTitle: Title for the back button after a payment is successful.
     /// - Parameter onCollect: Closure Invoked after the collect process has finished.
     /// - Parameter onCompleted: Closure Invoked after the flow has been totally completed.
-    func collectPayment(backButtonTitle: String, onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ())
+    func collectPayment(onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ())
 }
 
 /// Use case to collect payments from an order.
@@ -126,10 +125,9 @@ final class CollectOrderPaymentUseCase: NSObject, CollectOrderPaymentProtocol {
     /// 4. If failure: Allows retry
     ///
     ///
-    /// - Parameter backButtonTitle: Title for the back button after a payment is successful.
     /// - Parameter onCollect: Closure Invoked after the collect process has finished.
     /// - Parameter onCompleted: Closure Invoked after the flow has been totally completed, Currently after merchant has handled the receipt.
-    func collectPayment(backButtonTitle: String, onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ()) {
+    func collectPayment(onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ()) {
         guard isTotalAmountValid() else {
             let error = totalAmountInvalidError()
             onCollect(.failure(error))
@@ -150,7 +148,7 @@ final class CollectOrderPaymentUseCase: NSObject, CollectOrderPaymentProtocol {
                     guard let paymentData = try? result.get() else {
                         return onCompleted()
                     }
-                    self?.presentReceiptAlert(receiptParameters: paymentData.receiptParameters, backButtonTitle: backButtonTitle, onCompleted: onCompleted)
+                    self?.presentReceiptAlert(receiptParameters: paymentData.receiptParameters, onCompleted: onCompleted)
                 })
             case .failure(let error):
                 onCollect(.failure(error))
@@ -377,7 +375,7 @@ private extension CollectOrderPaymentUseCase {
 
     /// Allow merchants to print or email the payment receipt.
     ///
-    func presentReceiptAlert(receiptParameters: CardPresentReceiptParameters, backButtonTitle: String, onCompleted: @escaping () -> ()) {
+    func presentReceiptAlert(receiptParameters: CardPresentReceiptParameters, onCompleted: @escaping () -> ()) {
         // Present receipt alert
         alerts.success(printReceipt: { [order, configuration, weak self] in
             guard let self = self else { return }
@@ -405,8 +403,7 @@ private extension CollectOrderPaymentUseCase {
             paymentOrchestrator.emailReceipt(for: order, params: receiptParameters) { [weak self] emailContent in
                 self?.presentEmailForm(content: emailContent, onCompleted: onCompleted)
             }
-        }, noReceiptTitle: backButtonTitle,
-           noReceiptAction: {
+        }, noReceiptAction: {
             // Inform about flow completion.
             onCompleted()
         })
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift
@@ -725,7 +725,7 @@ private extension OrderDetailsViewController {
     }
 
     @objc private func collectPaymentTapped() {
-        viewModel.collectPayment(rootViewController: self, backButtonTitle: Localization.Payments.backToOrder) { [weak self] result in
+        viewModel.collectPayment(rootViewController: self) { [weak self] result in
             guard let self = self else { return }
             // Refresh date & view once payment has been collected.
             if result.isSuccess {
@@ -980,11 +980,6 @@ private extension OrderDetailsViewController {
                                   comment: "Track shipment of a shipping label from the shipping label tracking more menu action sheet")
         }
 
-        enum Payments {
-            static let backToOrder = NSLocalizedString("Back to Order",
-                                                       comment: "Button to dismiss modal overlay and go back to the order after a sucessful payment")
-        }
-
         enum ActionsMenu {
             static let cancelAction = NSLocalizedString("Cancel", comment: "Cancel the main more actions menu sheet.")
             static let paymentLink = NSLocalizedString("Share Payment Link", comment: "Title to share an order payment link.")
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Method/SimplePaymentsMethodsViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Method/SimplePaymentsMethodsViewModel.swift
@@ -209,7 +209,6 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
                     configuration: CardPresentConfigurationLoader().configuration)
 
                 self.collectPaymentsUseCase?.collectPayment(
-                    backButtonTitle: Localization.continueToOrders,
                     onCollect: { [weak self] result in
                         guard case let .failure(error) = result else { return }
 
@@ -299,8 +298,6 @@ private extension SimplePaymentsMethodsViewModel {
                                                        comment: "Text when there is an error while marking the order as paid for simple payments.")
         static let genericCollectError = NSLocalizedString("There was an error while trying to collect the payment.",
                                                        comment: "Text when there is an unknown error while trying to collect payments")
-        static let continueToOrders = NSLocalizedString("Continue To Orders",
-                                                        comment: "Button to dismiss modal overlay and go back to the orders list after a sucessful payment")
 
         static let title = NSLocalizedString("Take Payment (%1$@)",
                                              comment: "Navigation bar title for the Simple Payments Methods screens. " +
diff --git a/WooCommerce/WooCommerceTests/Mocks/MockOrderDetailsPaymentAlerts.swift b/WooCommerce/WooCommerceTests/Mocks/MockOrderDetailsPaymentAlerts.swift
@@ -39,7 +39,7 @@ extension MockOrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {
         // no-op
     }
 
-    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptTitle: String, noReceiptAction: @escaping () -> Void) {
+    func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptAction: @escaping () -> Void) {
         printReceiptFromSuccessAlert = printReceipt
         emailReceiptFromSuccessAlert = emailReceipt
     }
diff --git a/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalSuccessTests.swift b/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalSuccessTests.swift
@@ -10,7 +10,6 @@ final class CardPresentModalSuccessTests: XCTestCase {
         closures = Closures()
         viewModel = CardPresentModalSuccess(printReceipt: closures.printReceipt(),
                                             emailReceipt: closures.emailReceipt(),
-                                            noReceiptTitle: "Back",
                                             noReceiptAction: closures.noReceiptAction())
     }
 
@@ -42,7 +41,6 @@ final class CardPresentModalSuccessTests: XCTestCase {
 
     func test_auxiliary_button_title_is_not_nil() {
         XCTAssertNotNil(viewModel.auxiliaryButtonTitle)
-        XCTAssertEqual(viewModel.auxiliaryButtonTitle, "Back")
     }
 
     func test_bottom_title_is_nil() {
diff --git a/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalSuccessWithoutEmailTests.swift b/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalSuccessWithoutEmailTests.swift
@@ -9,7 +9,6 @@ final class CardPresentModalSuccessWithoutEmailTests: XCTestCase {
         super.setUp()
         closures = Closures()
         viewModel = CardPresentModalSuccessWithoutEmail(printReceipt: closures.printReceipt(),
-                                                        noReceiptTitle: "Back",
                                                         noReceiptAction: closures.noReceiptAction())
     }
 
@@ -37,7 +36,6 @@ final class CardPresentModalSuccessWithoutEmailTests: XCTestCase {
 
     func test_secondary_button_title_is_not_nil() {
         XCTAssertNotNil(viewModel.secondaryButtonTitle)
-        XCTAssertEqual(viewModel.secondaryButtonTitle, "Back")
     }
 
     func test_auxiliary_button_title_is_nil() {
diff --git a/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CollectOrderPaymentUseCaseTests.swift b/WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CollectOrderPaymentUseCaseTests.swift
@@ -45,7 +45,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
     func test_collectPayment_without_reader_connection_does_not_track_collectPaymentTapped_event() {
         // When
-        useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {})
+        useCase.collectPayment(onCollect: { _ in }, onCompleted: {})
 
         // Then
         XCTAssertFalse(analyticsProvider.receivedEvents.contains("card_present_collect_payment_tapped"))
@@ -54,7 +54,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
     func test_collectPayment_tracks_collectPaymentTapped_event() throws {
         // When
         mockCardPresentPaymentActions()
-        useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {})
+        useCase.collectPayment(onCollect: { _ in }, onCompleted: {})
 
         // Then
         let indexOfEvent = try XCTUnwrap(analyticsProvider.receivedEvents.firstIndex(where: { $0 == "card_present_collect_payment_tapped"}))
@@ -71,7 +71,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
         // When
         mockCardPresentPaymentActions()
         let _: Void = waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {
+            self.useCase.collectPayment(onCollect: { _ in }, onCompleted: {
                 promise(())
             })
             self.alerts.cancelReaderIsReadyAlert?()
@@ -100,7 +100,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
@@ -120,7 +120,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
@@ -138,7 +138,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
@@ -158,7 +158,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
@@ -190,7 +190,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
         mockCardPresentPaymentActions()
         var result: Result<Void, Error>? = nil
         let _: Void = waitFor { [weak self] promise in
-            useCase.collectPayment(backButtonTitle: "", onCollect: { collectPaymentResult in
+            useCase.collectPayment(onCollect: { collectPaymentResult in
                 result = collectPaymentResult
             }, onCompleted: {
                 promise(())
@@ -221,7 +221,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
@@ -245,7 +245,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
 
         // When
         waitFor { promise in
-            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in
+            self.useCase.collectPayment(onCollect: { _ in
                 promise(())
             }, onCompleted: {})
         }
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Simple Payments/MockCollectOrderPaymentUseCase.swift b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Simple Payments/MockCollectOrderPaymentUseCase.swift
@@ -11,7 +11,7 @@ struct MockCollectOrderPaymentUseCase: CollectOrderPaymentProtocol {
 
     /// Calls `onCollect` and `onCompleted` secuencially.
     ///
-    func collectPayment(backButtonTitle: String, onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ()) {
+    func collectPayment(onCollect: @escaping (Result<Void, Error>) -> (), onCompleted: @escaping () -> ()) {
         onCollect(onCollectResult)
         if onCollectResult.isSuccess {
             onCompleted()

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod`
`20`	`20`
`21`	`21`	`let primaryButtonTitle: String? = Localization.printReceipt`
`22`	`22`
`23`		`- let secondaryButtonTitle: String?`
	`23`	`+ let secondaryButtonTitle: String? = Localization.saveReceiptAndContinue`
`24`	`24`
`25`	`25`	`let auxiliaryButtonTitle: String? = nil`
`26`	`26`
`@@ -33,11 +33,9 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`init(printReceipt: @escaping () -> Void,`
`36`		`- noReceiptTitle: String,`
`37`	`36`	`noReceiptAction: @escaping () -> Void) {`
`38`	`37`	`self.printReceiptAction = printReceipt`
`39`	`38`	`self.noReceiptAction = noReceiptAction`
`40`		`- self.secondaryButtonTitle = noReceiptTitle`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`func didTapPrimaryButton(in viewController: UIViewController?) {`
`@@ -66,5 +64,10 @@ private extension CardPresentModalSuccessWithoutEmail {`
`66`	`64`	`"Print receipt",`
`67`	`65`	`comment: "Button to print receipts. Presented to users after a payment has been successfully collected"`
`68`	`66`	`)`
	`67`	`+`
	`68`	`+ static let saveReceiptAndContinue = NSLocalizedString(`
	`69`	`+ "Save receipt and continue",`
	`70`	`+ comment: "Button when the user does not want to print the receipt. Presented to users after a payment has been successfully collected"`
	`71`	`+ )`
`69`	`72`	`}`
`70`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ extension MockOrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {`
`39`	`39`	`// no-op`
`40`	`40`	`}`
`41`	`41`
`42`		`- func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptTitle: String, noReceiptAction: @escaping () -> Void) {`
	`42`	`+ func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptAction: @escaping () -> Void) {`
`43`	`43`	`printReceiptFromSuccessAlert = printReceipt`
`44`	`44`	`emailReceiptFromSuccessAlert = emailReceipt`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ final class CardPresentModalSuccessTests: XCTestCase {`
`10`	`10`	`closures = Closures()`
`11`	`11`	`viewModel = CardPresentModalSuccess(printReceipt: closures.printReceipt(),`
`12`	`12`	`emailReceipt: closures.emailReceipt(),`
`13`		`- noReceiptTitle: "Back",`
`14`	`13`	`noReceiptAction: closures.noReceiptAction())`
`15`	`14`	`}`
`16`	`15`
`@@ -42,7 +41,6 @@ final class CardPresentModalSuccessTests: XCTestCase {`
`42`	`41`
`43`	`42`	`func test_auxiliary_button_title_is_not_nil() {`
`44`	`43`	`XCTAssertNotNil(viewModel.auxiliaryButtonTitle)`
`45`		`- XCTAssertEqual(viewModel.auxiliaryButtonTitle, "Back")`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`func test_bottom_title_is_nil() {`