Read order payment link from order entity

Author: Ecarrion

WooCommerce/Classes/Tools/PaymentLinkBuilder.swift

@@ -25,7 +25,7 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
 
     /// Stores the payment link for the order.
     ///
-    @Published private(set) var paymentLink: URL?
+    let paymentLink: URL?
 
     /// Defines if the view should be disabled to prevent any further action.
     /// Useful to prevent any double tap while a network operation is being performed.
@@ -99,7 +99,7 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
 
     init(siteID: Int64 = 0,
          orderID: Int64 = 0,
-         orderKey: String = "",
+         paymentLink: URL? = nil,
          formattedTotal: String,
          presentNoticeSubject: PassthroughSubject<SimplePaymentsNotice, Never> = PassthroughSubject(),
          cppStoreStateObserver: CardPresentPaymentsOnboardingUseCaseProtocol = CardPresentPaymentsOnboardingUseCase(),
@@ -108,6 +108,7 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
          analytics: Analytics = ServiceLocator.analytics) {
         self.siteID = siteID
         self.orderID = orderID
+        self.paymentLink = paymentLink
         self.formattedTotal = formattedTotal
         self.presentNoticeSubject = presentNoticeSubject
         self.cppStoreStateObserver = cppStoreStateObserver
@@ -117,7 +118,6 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
         self.title = String(format: Localization.title, formattedTotal)
 
         bindStoreCPPState()
-        fetchPaymentLink(orderKey: orderKey)
     }
 
     /// Creates the info text when the merchant selects the cash payment method.
@@ -226,29 +226,6 @@ private extension SimplePaymentsMethodsViewModel {
         cppStoreStateObserver.refresh()
     }
 
-
-    /// Fetches and builds the order payment link based on the store settings.
-    ///
-    func fetchPaymentLink(orderKey: String) {
-        guard let storeURL = stores.sessionManager.defaultSite?.url else {
-            return DDLogError("⛔️ Couldn't find a valid store URL")
-        }
-
-        let action = SettingAction.getPaymentsPagePath(siteID: siteID) { [weak self] result in
-            guard let self = self else { return }
-
-            switch result {
-            case .success(let paymentPagePath):
-                let linkBuilder = PaymentLinkBuilder(host: storeURL, orderID: self.orderID, orderKey: orderKey, paymentPagePath: paymentPagePath)
-                self.paymentLink = URL(string: linkBuilder.build())
-
-            case .failure(let error):
-                DDLogError("⛔️ Error retrieving the payments page path: \(error.localizedDescription)")
-            }
-        }
-        stores.dispatch(action)
-    }
-
     /// Tracks the `simplePaymentsFlowCompleted` event.
     ///
     func trackFlowCompleted(method: WooAnalyticsEvent.SimplePayments.PaymentMethod) {

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

@@ -114,9 +114,10 @@ final class SimplePaymentsSummaryViewModel: ObservableObject {
     ///
     private let orderID: Int64
 
-    /// Order Key. Needed to generate the payment link in `PaymentMethodViewModel`
+    /// Order payment URL.
+    /// Optional because older stores `(< 6.4)` don't provide this information.
     ///
-    private let orderKey: String
+    private let paymentLink: URL?
 
     /// Fee ID to update.
     ///
@@ -144,15 +145,15 @@ final class SimplePaymentsSummaryViewModel: ObservableObject {
          noteContent: String? = nil,
          siteID: Int64 = 0,
          orderID: Int64 = 0,
-         orderKey: String = "",
+         paymentLink: URL? = nil,
          feeID: Int64 = 0,
          presentNoticeSubject: PassthroughSubject<SimplePaymentsNotice, Never> = PassthroughSubject(),
          currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
          stores: StoresManager = ServiceLocator.stores,
          analytics: Analytics = ServiceLocator.analytics) {
         self.siteID = siteID
         self.orderID = orderID
-        self.orderKey = orderKey
+        self.paymentLink = paymentLink
         self.feeID = feeID
         self.presentNoticeSubject = presentNoticeSubject
         self.currencyFormatter = currencyFormatter
@@ -194,7 +195,7 @@ final class SimplePaymentsSummaryViewModel: ObservableObject {
                   taxLines: taxLines,
                   siteID: order.siteID,
                   orderID: order.orderID,
-                  orderKey: order.orderKey,
+                  paymentLink: order.paymentURL,
                   feeID: order.fees.first?.feeID ?? 0,
                   presentNoticeSubject: presentNoticeSubject,
                   currencyFormatter: currencyFormatter,
@@ -249,7 +250,7 @@ final class SimplePaymentsSummaryViewModel: ObservableObject {
     func createMethodsViewModel() -> SimplePaymentsMethodsViewModel {
         SimplePaymentsMethodsViewModel(siteID: siteID,
                                        orderID: orderID,
-                                       orderKey: orderKey,
+                                       paymentLink: paymentLink,
                                        formattedTotal: total,
                                        presentNoticeSubject: presentNoticeSubject,
                                        stores: stores)