Skip to content

Commit 88aeb2a

Browse files
committed
refactoring
1 parent 5e2f5aa commit 88aeb2a

File tree

1 file changed

+1
-57
lines changed

1 file changed

+1
-57
lines changed

Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -63,50 +63,6 @@ class PayPalWebViewModel: ObservableObject {
6363
print("❌ failed to fetch orderID with error: \(error.localizedDescription)")
6464
}
6565
}
66-
67-
func captureOrder(orderID: String, selectedMerchantIntegration: MerchantIntegration) async throws {
68-
do {
69-
DispatchQueue.main.async {
70-
self.state.capturedOrderResponse = .loading
71-
}
72-
let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
73-
let order = try await DemoMerchantAPI.sharedService.captureOrder(
74-
orderID: orderID,
75-
selectedMerchantIntegration: selectedMerchantIntegration,
76-
payPalClientMetadataID: payPalClientMetadataID
77-
)
78-
DispatchQueue.main.async {
79-
self.state.capturedOrderResponse = .loaded(order)
80-
}
81-
} catch {
82-
DispatchQueue.main.async {
83-
self.state.capturedOrderResponse = .error(message: error.localizedDescription)
84-
}
85-
print("❌ Failed to capture order: \(error.localizedDescription)")
86-
}
87-
}
88-
89-
func authorizeOrder(orderID: String, selectedMerchantIntegration: MerchantIntegration) async throws {
90-
do {
91-
DispatchQueue.main.async {
92-
self.state.authorizedOrderResponse = .loading
93-
}
94-
let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
95-
let order = try await DemoMerchantAPI.sharedService.authorizeOrder(
96-
orderID: orderID,
97-
selectedMerchantIntegration: selectedMerchantIntegration,
98-
payPalClientMetadataID: payPalClientMetadataID
99-
)
100-
DispatchQueue.main.async {
101-
self.state.authorizedOrderResponse = .loaded(order)
102-
}
103-
} catch {
104-
DispatchQueue.main.async {
105-
self.state.authorizedOrderResponse = .error(message: error.localizedDescription)
106-
}
107-
print("❌ Failed to authorize order: \(error.localizedDescription)")
108-
}
109-
}
11066

11167
func paymentButtonTapped(funding: PayPalWebCheckoutFundingSource) {
11268
Task {
@@ -134,7 +90,7 @@ class PayPalWebViewModel: ObservableObject {
13490
}
13591
} else {
13692
DispatchQueue.main.async {
137-
self.state.approveResultResponse = .loaded(PayPalPaymentState.ApprovalResult(id: orderID, status: "COMPLETED"))
93+
self.state.approveResultResponse = .loaded(PayPalPaymentState.ApprovalResult(id: orderID, status: "APPROVED"))
13894
self.checkoutResult = result
13995
print("✅ Checkout result: \(String(describing: result))")
14096
}
@@ -166,9 +122,6 @@ class PayPalWebViewModel: ObservableObject {
166122
func completeTransaction() async throws {
167123
do {
168124
setLoadingState()
169-
170-
try await processIntent(orderID: orderID ?? "")
171-
172125
if let orderID = state.createOrder?.id {
173126
let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
174127
let order = try await DemoMerchantAPI.sharedService.completeOrder(
@@ -184,15 +137,6 @@ class PayPalWebViewModel: ObservableObject {
184137
}
185138
}
186139

187-
private func processIntent(orderID: String) async throws {
188-
switch intent {
189-
case .authorize:
190-
try await authorizeOrder(orderID: orderID, selectedMerchantIntegration: DemoSettings.merchantIntegration)
191-
case .capture:
192-
try await captureOrder(orderID: orderID, selectedMerchantIntegration: DemoSettings.merchantIntegration)
193-
}
194-
}
195-
196140
private func setLoadingState() {
197141
DispatchQueue.main.async {
198142
switch self.intent {

0 commit comments

Comments
 (0)