[DTPP-142] PayPalWebPayments show stages of order

Demo/Demo/CardPayments/CardPaymentViewModel/CardPaymentState.swift

@@ -49,3 +49,50 @@ struct CardPaymentState: Equatable {
         }
     }
 }
+
+struct PayPalPaymentState: Equatable {
+
+    struct ApprovalResult: Decodable, Equatable {
+        let id: String
+        let status: String?
+
+    }
+    var createOrder: Order?
+    var authorizedOrder: Order?
+    var capturedOrder: Order?
+    var intent: Intent = .authorize
+    var approveResult: ApprovalResult?
+
+    var createdOrderResponse: LoadingState<Order> = .idle {
+        didSet {
+            if case .loaded(let value) = createdOrderResponse {
+                createOrder = value
+            }
+        }
+    }
+
+    var approveResultResponse: LoadingState<ApprovalResult> = .idle {
+        didSet {
+            if case .loaded(let value) = approveResultResponse {
+
+                approveResult = value
+            }
+        }
+    }
+
+    var capturedOrderResponse: LoadingState<Order> = .idle {
+        didSet {
+            if case .loaded(let value) = capturedOrderResponse {
+                capturedOrder = value
+            }
+        }
+    }
+
+    var authorizedOrderResponse: LoadingState<Order> = .idle {
+        didSet {
+            if case .loaded(let value) = authorizedOrderResponse {
+                authorizedOrder = value
+            }
+        }
+    }
+}

Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebButtonsView.swift

@@ -39,7 +39,7 @@ struct PayPalWebButtonsView: View {
                             payPalWebViewModel.paymentButtonTapped(funding: .paypal)
                         }
                     }
-                    if payPalWebViewModel.state == .loading &&
+                    if payPalWebViewModel.state.createdOrderResponse == .loading &&
                         payPalWebViewModel.checkoutResult == nil &&
                         payPalWebViewModel.orderID != nil {
                         CircularProgressView()

Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebCreateOrderView.swift

@@ -40,7 +40,7 @@ struct PayPalWebCreateOrderView: View {
                     }
                 }
                 .buttonStyle(RoundedBlueButtonStyle())
-                if payPalWebViewModel.state == .loading && payPalWebViewModel.checkoutResult == nil && payPalWebViewModel.orderID == nil {
+                if case .loading = payPalWebViewModel.state.createdOrderResponse {
                     CircularProgressView()
                 }
             }

Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebPaymentsView.swift

@@ -10,7 +10,7 @@ struct PayPalWebPaymentsView: View {
                 VStack(spacing: 16) {
                     PayPalWebCreateOrderView(payPalWebViewModel: payPalWebViewModel)
 
-                    if payPalWebViewModel.orderID != nil {
+                    if payPalWebViewModel.state.createOrder?.id != nil {
                         PayPalWebButtonsView(payPalWebViewModel: payPalWebViewModel)
                     }
 

Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebResultView.swift

@@ -5,44 +5,41 @@ struct PayPalWebResultView: View {
     @ObservedObject var payPalWebViewModel: PayPalWebViewModel
 
     var body: some View {
-        switch payPalWebViewModel.state {
+        switch payPalWebViewModel.state.createdOrderResponse {
         case .idle, .loading:
             EmptyView()
-        case .success:
-            successView
+        case .loaded(let createOrderResponse):
+            getSuccessView(createOrderResponse: createOrderResponse)
         case .error(let errorMessage):
             ErrorView(errorMessage: errorMessage)
         }
     }
 
-    var successView: some View {
+    func getSuccessView(createOrderResponse: Order) -> some View {
         VStack(alignment: .leading, spacing: 16) {
             HStack {
                 Text("Order Details")
                     .font(.system(size: 20))
                 Spacer()
             }
-            if let orderID = payPalWebViewModel.orderID {
-                LabelViewText("Order ID:", bodyText: orderID)
-            }
-
-            if let status = payPalWebViewModel.order?.status {
-                LabelViewText("Status:", bodyText: status)
-            }
+
+            LabelViewText("Order ID:", bodyText: createOrderResponse.id)
+
+            LabelViewText("Status:", bodyText: createOrderResponse.status)
 
             if let payerID = payPalWebViewModel.checkoutResult?.payerID {
                 LabelViewText("Payer ID:", bodyText: payerID)
             }
 
-            if let emailAddress = payPalWebViewModel.order?.paymentSource?.paypal?.emailAddress {
+            if let emailAddress = createOrderResponse.paymentSource?.paypal?.emailAddress {
                 LabelViewText("Email:", bodyText: emailAddress)
             }
 
-            if let vaultID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.id {
+            if let vaultID = createOrderResponse.paymentSource?.paypal?.attributes?.vault.id {
                 LabelViewText("Payment Token:", bodyText: vaultID)
             }
 
-            if let customerID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.customer?.id {
+            if let customerID = createOrderResponse.paymentSource?.paypal?.attributes?.vault.customer?.id {
                 LabelViewText("Customer ID:", bodyText: customerID)
             }
         }

Demo/Demo/PayPalWebPayments/PayPalWebPaymentsView/PayPalWebTransactionView.swift

@@ -19,7 +19,7 @@ struct PayPalWebTransactionView: View {
                 .buttonStyle(RoundedBlueButtonStyle())
                 .padding()
 
-                if payPalWebViewModel.state == .loading {
+                if payPalWebViewModel.state.capturedOrderResponse == .loading {
                     CircularProgressView()
                 }
             }

Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift

@@ -5,7 +5,7 @@ import FraudProtection
 
 class PayPalWebViewModel: ObservableObject {
 
-    @Published var state: CurrentState = .idle
+    @Published var state = PayPalPaymentState()
     @Published var intent: Intent = .authorize
     @Published var order: Order?
     @Published var checkoutResult: PayPalWebCheckoutResult?
@@ -44,25 +44,73 @@ class PayPalWebViewModel: ObservableObject {
         )
 
         do {
-            updateState(.loading)
+            DispatchQueue.main.async {
+                self.state.createdOrderResponse = .loading
+            }
             let order = try await DemoMerchantAPI.sharedService.createOrder(
                 orderParams: orderRequestParams,
                 selectedMerchantIntegration: DemoSettings.merchantIntegration
             )
-
-            updateOrder(order)
-            updateState(.success)
+            DispatchQueue.main.async {
+                self.state.createdOrderResponse = .loaded(order)
+            }
             print("✅ fetched orderID: \(order.id) with status: \(order.status)")
         } catch {
-            updateState(.error(message: error.localizedDescription))
+            DispatchQueue.main.async {
+                self.state.createdOrderResponse = .error(message: error.localizedDescription)
+            }
             print("❌ failed to fetch orderID with error: \(error.localizedDescription)")
         }
     }
+
+    func captureOrder(orderID: String, selectedMerchantIntegration: MerchantIntegration) async {
+        do {
+            self.state.capturedOrderResponse = .loading
+            let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
+            let order = try await DemoMerchantAPI.sharedService.captureOrder(
+                orderID: orderID,
+                selectedMerchantIntegration: selectedMerchantIntegration,
+                payPalClientMetadataID: payPalClientMetadataID
+            )
+            DispatchQueue.main.async {
+                self.state.capturedOrderResponse = .loaded(order)
+            }
+        } catch {
+            DispatchQueue.main.async {
+                self.state.capturedOrderResponse = .error(message: error.localizedDescription)
+            }
+            print("❌ Failed to capture order: \(error.localizedDescription)")
+        }
+    }
+
+    func authorizeOrder(orderID: String, selectedMerchantIntegration: MerchantIntegration) async {
+        do {
+            DispatchQueue.main.async {
+                self.state.authorizedOrderResponse = .loading
+            }
+            let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
+            let order = try await DemoMerchantAPI.sharedService.authorizeOrder(
+                orderID: orderID,
+                selectedMerchantIntegration: selectedMerchantIntegration,
+                payPalClientMetadataID: payPalClientMetadataID
+            )
+            DispatchQueue.main.async {
+                self.state.authorizedOrderResponse = .loaded(order)
+            }
+        } catch {
+            DispatchQueue.main.async {
+                self.state.authorizedOrderResponse = .error(message: error.localizedDescription)
+            }
+            print("❌ Failed to authorize order: \(error.localizedDescription)")
+        }
+    }
 
     func paymentButtonTapped(funding: PayPalWebCheckoutFundingSource) {
         Task {
             do {
-                self.updateState(.loading)
+                DispatchQueue.main.async {
+                    self.state.createdOrderResponse = .loading
+                }
                 payPalWebCheckoutClient = try await getPayPalClient()
                 guard let payPalWebCheckoutClient else {
                     print("Error initializing PayPalWebCheckoutClient")
@@ -73,22 +121,26 @@ class PayPalWebViewModel: ObservableObject {
                     let payPalRequest = PayPalWebCheckoutRequest(orderID: orderID, fundingSource: funding)
                     payPalWebCheckoutClient.start(request: payPalRequest) { result, error in
                         if let error {
-                            if error == PayPalError.checkoutCanceledError {
-                                print("Canceled")
-                                self.updateState(.idle)
-                            } else {
-                                self.updateState(.error(message: error.localizedDescription))
+                            DispatchQueue.main.async {
+                                if error == PayPalError.checkoutCanceledError {
+                                    print("Canceled")
+                                    self.state.createdOrderResponse = .idle
+                                } else {
+                                    self.state.createdOrderResponse = .error(message: error.localizedDescription)
+                                }
                             }
                         } else {
-                            self.updateState(.success)
-                            self.checkoutResult = result
+                            DispatchQueue.main.async {
+                                self.state.createdOrderResponse = .loaded(Order(id: orderID, status: "COMPLETED"))
+                                self.checkoutResult = result
+                                print("✅ Checkout result: \(String(describing: result))")
+                            }
                         }
                     }
                 }
-                updateState(.success)
             } catch {
                 print("Error starting PayPalWebCheckoutClient")
-                updateState(.error(message: error.localizedDescription))
+                self.state.createdOrderResponse = .error(message: error.localizedDescription)
             }
         }
     }
@@ -100,15 +152,17 @@ class PayPalWebViewModel: ObservableObject {
             payPalDataCollector = PayPalDataCollector(config: config)
             return payPalClient
         } catch {
-            updateState(.error(message: error.localizedDescription))
+            DispatchQueue.main.async {
+                self.state.createdOrderResponse = .error(message: error.localizedDescription)
+            }
             print("❌ failed to create PayPalWebCheckoutClient with error: \(error.localizedDescription)")
             return nil
         }
     }
 
     func completeTransaction() async throws {
         do {
-            updateState(.loading)
+            self.state.authorizedOrderResponse = .loading
 
             let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
             if let orderID {
@@ -117,30 +171,21 @@ class PayPalWebViewModel: ObservableObject {
                     orderID: orderID,
                     payPalClientMetadataID: payPalClientMetadataID
                 )
-                updateOrder(order)
-                updateState(.success)
+                DispatchQueue.main.async {
+                    self.state.authorizedOrderResponse = .loaded(order)
+                }
             }
         } catch {
-            updateState(.error(message: error.localizedDescription))
+            DispatchQueue.main.async {
+                self.state.authorizedOrderResponse = .error(message: error.localizedDescription)
+            }
             print("Error with \(intent) order: \(error.localizedDescription)")
         }
     }
 
     func resetState() {
-        updateState(.idle)
+        self.state = PayPalPaymentState()
         order = nil
         checkoutResult = nil
     }
-
-    private func updateOrder(_ order: Order) {
-        DispatchQueue.main.async {
-            self.order = order
-        }
-    }
-
-    private func updateState(_ state: CurrentState) {
-        DispatchQueue.main.async {
-            self.state = state
-        }
-    }
 }