Merge pull request #7063 from woocommerce/issue/7004-refactor-CPP-eligibility-logic-into-Yosemite

[Mobile Payments] Refactor cpp eligibility logic into Yosemite

Author: toupper

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -46,11 +46,7 @@ final class OrderDetailsDataSource: NSObject {
 
     /// Whether the order is eligible for card present payment.
     ///
-    var isEligibleForCardPresentPayment: Bool {
-        return cardPresentPaymentsConfiguration.isSupportedCountry &&
-        order.isEligibleForCardPresentPayment(cardPresentPaymentsConfiguration: cardPresentPaymentsConfiguration,
-                                              products: resultsControllers.products)
-    }
+    var isEligibleForCardPresentPayment: Bool = false
 
     var isEligibleForRefund: Bool {
         guard !isRefundedStatus,
@@ -567,7 +563,7 @@ private extension OrderDetailsDataSource {
     private func configureCustomerPaid(cell: TwoColumnHeadlineFootnoteTableViewCell) {
         let paymentViewModel = OrderPaymentDetailsViewModel(order: order)
         cell.leftText = Titles.paidByCustomer
-        cell.rightText = paymentViewModel.paymentTotal
+        cell.rightText = order.paymentTotal
         cell.updateFootnoteText(paymentViewModel.paymentSummary)
     }
 
@@ -603,10 +599,8 @@ private extension OrderDetailsDataSource {
     }
 
     private func configureNetAmount(cell: TwoColumnHeadlineFootnoteTableViewCell) {
-        let paymentViewModel = OrderPaymentDetailsViewModel(order: order)
-
         cell.leftText = Titles.netAmount
-        cell.rightText = paymentViewModel.netAmount
+        cell.rightText = order.netAmount
         cell.hideFootnote()
     }
 

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -233,7 +233,13 @@ extension OrderDetailsViewModel {
         }
 
         group.enter()
-        refreshCardPresentPaymentEligibility()
+        checkCardPresentPaymentEligibility() {
+            onReloadSections?()
+            group.leave()
+        }
+
+        group.enter()
+        loadPaymentGatewayAccounts()
         group.leave()
 
         group.enter()
@@ -601,7 +607,33 @@ extension OrderDetailsViewModel {
         stores.dispatch(action)
     }
 
-    func refreshCardPresentPaymentEligibility() {
+    func checkCardPresentPaymentEligibility(onCompletion: @escaping (() -> Void)) {
+        let configuration = configurationLoader.configuration
+
+        guard configuration.isSupportedCountry else {
+            dataSource.isEligibleForCardPresentPayment = false
+            onCompletion()
+            return
+        }
+
+        let action = OrderCardPresentPaymentEligibilityAction
+            .orderIsEligibleForCardPresentPayment(orderID: order.orderID,
+                                                  siteID: order.siteID,
+                                                  cardPresentPaymentsConfiguration: configurationLoader.configuration) { [weak self] result in
+            switch result {
+            case .success(let eligible):
+                self?.dataSource.isEligibleForCardPresentPayment = eligible
+            case .failure(_):
+                self?.dataSource.isEligibleForCardPresentPayment = false
+            }
+
+            onCompletion()
+        }
+
+        stores.dispatch(action)
+    }
+
+    func loadPaymentGatewayAccounts() {
         /// No need for a completion here. The VC will be notified of changes to the stored paymentGatewayAccounts
         /// by the viewModel (after passing up through the dataSource and originating in the resultsControllers)
         ///

WooCommerce/Classes/ViewModels/Order Details/OrderPaymentDetailsViewModel.swift

@@ -58,15 +58,11 @@ final class OrderPaymentDetailsViewModel {
     }
 
     var totalValue: String {
-        return currencyFormatter.formatAmount(order.total, with: order.currency) ?? String()
+        order.totalValue
     }
 
     var paymentTotal: String {
-        if order.datePaid == nil {
-            return currencyFormatter.formatAmount("0.00", with: order.currency) ?? String()
-        }
-
-        return totalValue
+        order.paymentTotal
     }
 
     private var feesTotal: Decimal {
@@ -162,26 +158,10 @@ final class OrderPaymentDetailsViewModel {
         return currencyFormatter.formatAmount(condensedRefund.normalizedTotalAsNegative, with: order.currency)
     }
 
-    /// Format the net amount with the correct currency
-    ///
-    var netAmount: String? {
-        guard let netDecimal = calculateNetAmount() else {
-            return nil
-        }
-
-        return currencyFormatter.formatAmount(netDecimal, with: order.currency)
-    }
-
     var couponLines: [OrderCouponLine] {
         return order.coupons
     }
 
-    /// Signals whether the net amount for the order matches the total order amount
-    ///
-    var hasBeenPartiallyCharged: Bool {
-        return totalValue != netAmount
-    }
-
     init(order: Order, refund: Refund? = nil, currencySettings: CurrencySettings = ServiceLocator.currencySettings) {
         self.order = order
         self.refund = refund
@@ -204,19 +184,6 @@ final class OrderPaymentDetailsViewModel {
 
         return NSLocalizedString("Discount", comment: "Discount label for payment view") + " (" + output + ")"
     }
-
-    /// Calculate the net amount after refunds
-    ///
-    private func calculateNetAmount() -> NSDecimalNumber? {
-        guard let orderTotal = currencyFormatter.convertToDecimal(order.total) else {
-            return .zero
-        }
-
-        let totalRefundedUseCase = TotalRefundedCalculationUseCase(order: order, currencyFormatter: currencyFormatter)
-        let refundTotal = totalRefundedUseCase.totalRefunded()
-
-        return orderTotal.adding(refundTotal)
-    }
 }
 
 private extension OrderPaymentDetailsViewModel {

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

@@ -600,7 +600,9 @@ private extension OrderDetailsViewController {
             // Refresh date & view once payment has been collected.
             if result.isSuccess {
                 self.viewModel.syncOrderAfterPaymentCollection {
-                    self.viewModel.refreshCardPresentPaymentEligibility()
+                    self.viewModel.checkCardPresentPaymentEligibility {
+                        self.reloadTableViewSectionsAndData()
+                    }
                 }
             }
         }

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

@@ -93,15 +93,6 @@ final class SimplePaymentsMethodsViewModel: ObservableObject {
         return controller
     }()
 
-    /// Product ResultsController.
-    ///
-    private lazy var productResultsController: ResultsController<StorageProduct> = {
-        let predicate = NSPredicate(format: "siteID == %lld", siteID)
-        let descriptor = NSSortDescriptor(key: "name", ascending: true)
-
-        return ResultsController<StorageProduct>(storageManager: storage, matching: predicate, sortedBy: [descriptor])
-    }()
-
     /// Retains the use-case so it can perform all of its async tasks.
     ///
     private var collectPaymentsUseCase: CollectOrderPaymentProtocol?
@@ -270,20 +261,29 @@ private extension SimplePaymentsMethodsViewModel {
     ///
     func bindStoreCPPState() {
         ordersResultController.onDidChangeContent = updateCardPaymentVisibility
-        productResultsController.onDidChangeContent = updateCardPaymentVisibility
         try? ordersResultController.performFetch()
-        try? productResultsController.performFetch()
     }
 
     func updateCardPaymentVisibility() {
-        guard let order = ordersResultController.fetchedObjects.first else {
+        guard cardPresentPaymentsConfiguration.isSupportedCountry else {
             showPayWithCardRow = false
+
             return
         }
 
-        showPayWithCardRow = cardPresentPaymentsConfiguration.isSupportedCountry && order.isEligibleForCardPresentPayment(
-            cardPresentPaymentsConfiguration: cardPresentPaymentsConfiguration,
-            products: productResultsController.fetchedObjects)
+        let action = OrderCardPresentPaymentEligibilityAction
+            .orderIsEligibleForCardPresentPayment(orderID: orderID,
+                                                  siteID: siteID,
+                                                  cardPresentPaymentsConfiguration: cardPresentPaymentsConfiguration) { [weak self] result in
+            switch result {
+            case .success(let eligible):
+                self?.showPayWithCardRow = eligible
+            case .failure(_):
+                self?.showPayWithCardRow = false
+            }
+        }
+
+        stores.dispatch(action)
     }
 
     func updateOrderAsynchronously() {

WooCommerce/Classes/Yosemite/AuthenticatedState.swift

@@ -41,6 +41,7 @@ class AuthenticatedState: StoresManagerState {
             MediaStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             NotificationStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             NotificationCountStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: PListFileStorage()),
+            OrderCardPresentPaymentEligibilityStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             OrderNoteStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             OrderStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
             OrderStatusStore(dispatcher: dispatcher, storageManager: storageManager, network: network),