PayPal Web Demo App Refactor #223
+386
−534
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import Foundation | ||
|
|
||
| enum CurrentState: Equatable { | ||
|
There was a problem hiding this comment. Ideally we can use this across the other demo features as well vs the individual states per feature that exist today |
||
| case idle | ||
| case loading | ||
| case success | ||
| case error(message: String) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import SwiftUI | ||
|
|
||
| struct PayPalWebPaymentsView: View { | ||
|
|
||
| @StateObject var payPalWebViewModel = PayPalWebViewModel() | ||
|
|
||
| var body: some View { | ||
| ScrollView { | ||
| VStack(spacing: 16) { | ||
| PayPalWebCreateOrderView(payPalWebViewModel: payPalWebViewModel) | ||
| if payPalWebViewModel.order != nil { | ||
| PayPalWebResultView(payPalWebViewModel: payPalWebViewModel, status: .created) | ||
| NavigationLink { | ||
jaxdesmarais marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| PayPalWebButtonsView(payPalWebViewModel: payPalWebViewModel) | ||
| .navigationTitle("Checkout with PayPal") | ||
| } label: { | ||
| Text("Checkout with PayPal") | ||
| } | ||
| .buttonStyle(RoundedBlueButtonStyle()) | ||
| .padding() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import SwiftUI | ||
|
|
||
| enum OrderStatus { | ||
| case created | ||
| case approved | ||
| case completed | ||
| } | ||
|
|
||
| struct PayPalWebResultView: View { | ||
|
|
||
| @ObservedObject var payPalWebViewModel: PayPalWebViewModel | ||
|
|
||
| var status: OrderStatus | ||
|
|
||
| var body: some View { | ||
| switch payPalWebViewModel.state { | ||
| case .idle, .loading: | ||
| EmptyView() | ||
| case .success: | ||
| PayPalWebStatusView(status: status, payPalWebViewModel: payPalWebViewModel) | ||
| case .error(let errorMessage): | ||
| ErrorView(errorMessage: errorMessage) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import SwiftUI | ||
|
|
||
| struct PayPalWebStatusView: View { | ||
|
|
||
| var status: OrderStatus | ||
| var payPalWebViewModel: PayPalWebViewModel | ||
|
|
||
| var body: some View { | ||
| VStack(spacing: 16) { | ||
| switch status { | ||
| case .created: | ||
| HStack { | ||
| Text("Order Created") | ||
| .font(.system(size: 20)) | ||
| Spacer() | ||
| } | ||
| if let order = payPalWebViewModel.order { | ||
| LeadingText("Order ID", weight: .bold) | ||
| LeadingText("\(order.id)") | ||
| LeadingText("Status", weight: .bold) | ||
| LeadingText("\(order.status)") | ||
| } | ||
| case .approved: | ||
| HStack { | ||
| Text("Order Approved") | ||
| .font(.system(size: 20)) | ||
| Spacer() | ||
| } | ||
| if let order = payPalWebViewModel.order { | ||
| LeadingText("Intent", weight: .bold) | ||
| LeadingText("\(payPalWebViewModel.intent)") | ||
| LeadingText("Order ID", weight: .bold) | ||
| LeadingText("\(order.id)") | ||
| LeadingText("Payer ID", weight: .bold) | ||
| LeadingText("\(payPalWebViewModel.checkoutResult?.payerID ?? "")") | ||
| } | ||
| case .completed: | ||
| if let order = payPalWebViewModel.order { | ||
| HStack { | ||
| Text("Order \(payPalWebViewModel.intent.rawValue.capitalized)d") | ||
| .font(.system(size: 20)) | ||
| Spacer() | ||
| } | ||
| LeadingText("Order ID", weight: .bold) | ||
| LeadingText("\(order.id)") | ||
| LeadingText("Status", weight: .bold) | ||
| LeadingText("\(order.status)") | ||
|
|
||
| if let emailAddress = payPalWebViewModel.order?.paymentSource?.paypal?.emailAddress { | ||
| LeadingText("Email", weight: .bold) | ||
| LeadingText("\(emailAddress)") | ||
| } | ||
|
|
||
| if let vaultID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.id { | ||
| LeadingText("Vault ID / Payment Token", weight: .bold) | ||
| LeadingText("\(vaultID)") | ||
| } | ||
|
|
||
| if let customerID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.customer.id { | ||
| LeadingText("Customer ID", weight: .bold) | ||
| LeadingText("\(customerID)") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .frame(maxWidth: .infinity) | ||
| .padding() | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 10) | ||
| .stroke(.gray, lineWidth: 2) | ||
| .padding(5) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import SwiftUI | ||
|
|
||
| struct PayPalWebTransactionView: View { | ||
|
|
||
| @ObservedObject var payPalWebViewModel: PayPalWebViewModel | ||
|
|
||
| var body: some View { | ||
| ScrollView { | ||
| ScrollViewReader { scrollView in | ||
| VStack { | ||
| PayPalWebStatusView(status: .approved, payPalWebViewModel: payPalWebViewModel) | ||
| ZStack { | ||
| Button("\(payPalWebViewModel.intent.rawValue.capitalized) Order") { | ||
| Task { | ||
| do { | ||
| try await payPalWebViewModel.completeTransaction() | ||
| } catch { | ||
| print("Error capturing order: \(error.localizedDescription)") | ||
| } | ||
| } | ||
| } | ||
| .buttonStyle(RoundedBlueButtonStyle()) | ||
| .padding() | ||
|
|
||
| if payPalWebViewModel.state == .loading { | ||
| CircularProgressView() | ||
| } | ||
| } | ||
|
|
||
| if payPalWebViewModel.state == .success && payPalWebViewModel.order?.status == "COMPLETED" { | ||
| PayPalWebResultView(payPalWebViewModel: payPalWebViewModel, status: .completed) | ||
jaxdesmarais marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .id("bottomView") | ||
| } | ||
| } | ||
| .onChange(of: payPalWebViewModel.order) { _ in | ||
| withAnimation { | ||
| scrollView.scrollTo("bottomView") | ||
| } | ||
| } | ||
| Spacer() | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't related to this PR but at one point I was poking around at this file and noticed we had this one as a variable - should be a constant to match all other structs in this file