Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Authorize/Capture for PayPalWebPayments in Demo App #216

Merged
merged 8 commits into from
Nov 16, 2023
Merged

Add Authorize/Capture for PayPalWebPayments in Demo App #216

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
691dc9b
add authorize/capture for PayPalWebPayments
KunJeongPark Nov 7, 2023
263b3d7
add missing pbxproj changes, remove name header
KunJeongPark Nov 7, 2023
293097b
spacing PayPalTransactionButtonView
KunJeongPark Nov 7, 2023
e8d1cf5
display sandbox email in demo app
KunJeongPark Nov 9, 2023
80ac172
Revert project.pbxproj to match main
KunJeongPark Nov 13, 2023
1bdfd45
Change view names for consistency between PayPalWeb and Card
KunJeongPark Nov 15, 2023
ac238c5
Jax PR feedback
KunJeongPark Nov 15, 2023
9fff03a
Update Demo/Demo/ViewModels/PayPalWebViewModel.swift
jaxdesmarais Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions Demo/Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
3B22E8BC2A84397600962E34 /* PaymentTokenResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B22E8BB2A84397600962E34 /* PaymentTokenResponse.swift */; };
3B4DD9A02A892A7000F4A716 /* CardVaultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B4DD99F2A892A7000F4A716 /* CardVaultView.swift */; };
3B4DD9A22A8982B000F4A716 /* CardFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B4DD9A12A8982B000F4A716 /* CardFormView.swift */; };
3B6472A32AFAE5E3004745C4 /* PayPalWebOrderCompletionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B6472A22AFAE5E3004745C4 /* PayPalWebOrderCompletionView.swift */; };
3B6472A52AFAEB1E004745C4 /* PayPalWebOrderCompletionResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B6472A42AFAEB1E004745C4 /* PayPalWebOrderCompletionResultView.swift */; };
3B6472A72AFAEB3A004745C4 /* PayPalOrderActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B6472A62AFAEB3A004745C4 /* PayPalOrderActionButton.swift */; };
3B80D50E2A291C0800D2EAC4 /* ClientIDRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B80D50D2A291C0800D2EAC4 /* ClientIDRequest.swift */; };
3B80D5102A291CB100D2EAC4 /* ClientIDResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B80D50F2A291CB100D2EAC4 /* ClientIDResponse.swift */; };
3B8EF4DB2A932DA300A70D0B /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B8EF4DA2A932DA300A70D0B /* ErrorView.swift */; };
3BA56FE72A9DC9D70081D14F /* CardPaymentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FE62A9DC9D70081D14F /* CardPaymentViewModel.swift */; };
3BA56FE92A9DCA520081D14F /* CardPaymentState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FE82A9DCA520081D14F /* CardPaymentState.swift */; };
3BA56FEC2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FEB2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift */; };
3BA56FEE2A9DCC340081D14F /* OrderCreateCardPaymentResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FED2A9DCC340081D14F /* OrderCreateCardPaymentResultView.swift */; };
3BA56FEE2A9DCC340081D14F /* OrderCreateCardResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FED2A9DCC340081D14F /* OrderCreateCardResultView.swift */; };
3BA56FF02A9DCCFD0081D14F /* CardOrderApproveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FEF2A9DCCFD0081D14F /* CardOrderApproveView.swift */; };
3BA56FF22A9DCD440081D14F /* CardApprovalResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FF12A9DCD440081D14F /* CardApprovalResultView.swift */; };
3BA56FF42A9DCD790081D14F /* CardPaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA56FF32A9DCD790081D14F /* CardPaymentView.swift */; };
Expand All @@ -34,8 +37,8 @@
3BA570012AA052E80081D14F /* PayPalWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570002AA052E80081D14F /* PayPalWebView.swift */; };
3BA570032AA053AE0081D14F /* CreateOrderPayPalWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570022AA053AE0081D14F /* CreateOrderPayPalWebView.swift */; };
3BA570052AA0BBF10081D14F /* OrderCreatePayPalWebResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570042AA0BBF10081D14F /* OrderCreatePayPalWebResultView.swift */; };
3BA570072AA0DF330081D14F /* PayPalTransactionButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570062AA0DF330081D14F /* PayPalTransactionButtonsView.swift */; };
3BA570092AA0E8340081D14F /* PayPalWebApprovalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570082AA0E8340081D14F /* PayPalWebApprovalView.swift */; };
3BA570072AA0DF330081D14F /* PayPalTransactionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570062AA0DF330081D14F /* PayPalTransactionsView.swift */; };
3BA570092AA0E8340081D14F /* PayPalWebApprovalResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA570082AA0E8340081D14F /* PayPalWebApprovalResultView.swift */; };
3BA5700B2AA13C1C0081D14F /* CoreConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA5700A2AA13C1C0081D14F /* CoreConfigManager.swift */; };
3BB7A9772A5CA6FD00C05140 /* MerchantIntegration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BB7A9762A5CA6FD00C05140 /* MerchantIntegration.swift */; };
3BC622072A97115700251B85 /* RoundedBlueButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC622062A97115700251B85 /* RoundedBlueButtonStyle.swift */; };
Expand Down Expand Up @@ -134,13 +137,16 @@
3B22E8BB2A84397600962E34 /* PaymentTokenResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentTokenResponse.swift; sourceTree = "<group>"; };
3B4DD99F2A892A7000F4A716 /* CardVaultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardVaultView.swift; sourceTree = "<group>"; };
3B4DD9A12A8982B000F4A716 /* CardFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardFormView.swift; sourceTree = "<group>"; };
3B6472A22AFAE5E3004745C4 /* PayPalWebOrderCompletionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PayPalWebOrderCompletionView.swift; sourceTree = "<group>"; };
3B6472A42AFAEB1E004745C4 /* PayPalWebOrderCompletionResultView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PayPalWebOrderCompletionResultView.swift; sourceTree = "<group>"; };
3B6472A62AFAEB3A004745C4 /* PayPalOrderActionButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PayPalOrderActionButton.swift; sourceTree = "<group>"; };
3B80D50D2A291C0800D2EAC4 /* ClientIDRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientIDRequest.swift; sourceTree = "<group>"; };
3B80D50F2A291CB100D2EAC4 /* ClientIDResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientIDResponse.swift; sourceTree = "<group>"; };
3B8EF4DA2A932DA300A70D0B /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
3BA56FE62A9DC9D70081D14F /* CardPaymentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPaymentViewModel.swift; sourceTree = "<group>"; };
3BA56FE82A9DCA520081D14F /* CardPaymentState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPaymentState.swift; sourceTree = "<group>"; };
3BA56FEB2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateOrderCardPaymentView.swift; sourceTree = "<group>"; };
3BA56FED2A9DCC340081D14F /* OrderCreateCardPaymentResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreateCardPaymentResultView.swift; sourceTree = "<group>"; };
3BA56FED2A9DCC340081D14F /* OrderCreateCardResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreateCardResultView.swift; sourceTree = "<group>"; };
3BA56FEF2A9DCCFD0081D14F /* CardOrderApproveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardOrderApproveView.swift; sourceTree = "<group>"; };
3BA56FF12A9DCD440081D14F /* CardApprovalResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardApprovalResultView.swift; sourceTree = "<group>"; };
3BA56FF32A9DCD790081D14F /* CardPaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPaymentView.swift; sourceTree = "<group>"; };
Expand All @@ -152,8 +158,8 @@
3BA570002AA052E80081D14F /* PayPalWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalWebView.swift; sourceTree = "<group>"; };
3BA570022AA053AE0081D14F /* CreateOrderPayPalWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateOrderPayPalWebView.swift; sourceTree = "<group>"; };
3BA570042AA0BBF10081D14F /* OrderCreatePayPalWebResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreatePayPalWebResultView.swift; sourceTree = "<group>"; };
3BA570062AA0DF330081D14F /* PayPalTransactionButtonsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalTransactionButtonsView.swift; sourceTree = "<group>"; };
3BA570082AA0E8340081D14F /* PayPalWebApprovalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalWebApprovalView.swift; sourceTree = "<group>"; };
3BA570062AA0DF330081D14F /* PayPalTransactionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalTransactionsView.swift; sourceTree = "<group>"; };
3BA570082AA0E8340081D14F /* PayPalWebApprovalResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalWebApprovalResultView.swift; sourceTree = "<group>"; };
3BA5700A2AA13C1C0081D14F /* CoreConfigManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreConfigManager.swift; sourceTree = "<group>"; };
3BB7A9762A5CA6FD00C05140 /* MerchantIntegration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MerchantIntegration.swift; sourceTree = "<group>"; };
3BC622062A97115700251B85 /* RoundedBlueButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedBlueButtonStyle.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -256,7 +262,7 @@
isa = PBXGroup;
children = (
3BA56FEB2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift */,
3BA56FED2A9DCC340081D14F /* OrderCreateCardPaymentResultView.swift */,
3BA56FED2A9DCC340081D14F /* OrderCreateCardResultView.swift */,
3BA56FEF2A9DCCFD0081D14F /* CardOrderApproveView.swift */,
3BA56FF12A9DCD440081D14F /* CardApprovalResultView.swift */,
3BA56FF32A9DCD790081D14F /* CardPaymentView.swift */,
Expand All @@ -270,11 +276,14 @@
3BA56FFF2A9FF6630081D14F /* PayPalWebViews */ = {
isa = PBXGroup;
children = (
3B6472A62AFAEB3A004745C4 /* PayPalOrderActionButton.swift */,
3B6472A42AFAEB1E004745C4 /* PayPalWebOrderCompletionResultView.swift */,
3B6472A22AFAE5E3004745C4 /* PayPalWebOrderCompletionView.swift */,
3BA570002AA052E80081D14F /* PayPalWebView.swift */,
3BA570022AA053AE0081D14F /* CreateOrderPayPalWebView.swift */,
3BA570042AA0BBF10081D14F /* OrderCreatePayPalWebResultView.swift */,
3BA570062AA0DF330081D14F /* PayPalTransactionButtonsView.swift */,
3BA570082AA0E8340081D14F /* PayPalWebApprovalView.swift */,
3BA570062AA0DF330081D14F /* PayPalTransactionsView.swift */,
3BA570082AA0E8340081D14F /* PayPalWebApprovalResultView.swift */,
);
path = PayPalWebViews;
sourceTree = "<group>";
Expand Down Expand Up @@ -582,7 +591,7 @@
files = (
3BA56FE92A9DCA520081D14F /* CardPaymentState.swift in Sources */,
3B2027412A8A72050007907E /* CardVaultState.swift in Sources */,
3BA570092AA0E8340081D14F /* PayPalWebApprovalView.swift in Sources */,
3BA570092AA0E8340081D14F /* PayPalWebApprovalResultView.swift in Sources */,
80F33CED26F8E7A9006811B1 /* Order.swift in Sources */,
3B4DD9A02A892A7000F4A716 /* CardVaultView.swift in Sources */,
3BA56FF62A9E9AAB0081D14F /* CardOrderActionButton.swift in Sources */,
Expand Down Expand Up @@ -618,11 +627,12 @@
BECD84A227036DDB007CCAE4 /* Intent.swift in Sources */,
BED041AF270CA0FB00C80954 /* CustomButton.swift in Sources */,
3BB7A9772A5CA6FD00C05140 /* MerchantIntegration.swift in Sources */,
3BA56FEE2A9DCC340081D14F /* OrderCreateCardPaymentResultView.swift in Sources */,
3BA56FEE2A9DCC340081D14F /* OrderCreateCardResultView.swift in Sources */,
BE1766B326F911A2007EF438 /* URLResponseError.swift in Sources */,
3B2027452A8AA78B0007907E /* UpdateSetupTokenView.swift in Sources */,
3BA56FF82A9FDB5A0081D14F /* CardPaymentOrderCompletionView.swift in Sources */,
3B8EF4DB2A932DA300A70D0B /* ErrorView.swift in Sources */,
3B6472A32AFAE5E3004745C4 /* PayPalWebOrderCompletionView.swift in Sources */,
3BF9997A2A8AE12C009CBDF2 /* PaymentTokenResultView.swift in Sources */,
3BA56FFC2A9FEFE90081D14F /* PayPalWebViewModel.swift in Sources */,
3BDB34922A7CB5DE008100D7 /* SetupTokenResponse.swift in Sources */,
Expand All @@ -635,14 +645,16 @@
3B20273D2A89E3F00007907E /* CreateSetupTokenView.swift in Sources */,
3BA570052AA0BBF10081D14F /* OrderCreatePayPalWebResultView.swift in Sources */,
3B22E8BA2A842D8900962E34 /* PaymentTokenRequest.swift in Sources */,
3BA570072AA0DF330081D14F /* PayPalTransactionButtonsView.swift in Sources */,
3B6472A52AFAEB1E004745C4 /* PayPalWebOrderCompletionResultView.swift in Sources */,
3BA570072AA0DF330081D14F /* PayPalTransactionsView.swift in Sources */,
3BCCFE492A9D96CA00C5102F /* DemoApp.swift in Sources */,
3BA56FEC2A9DCBF30081D14F /* CreateOrderCardPaymentView.swift in Sources */,
536A5CA82898AA2A005C053D /* SwiftUINativeCheckoutDemo.swift in Sources */,
3B20273F2A89F24E0007907E /* CardVaultViewModel.swift in Sources */,
BC6460CD2A12A2A0002B974B /* EmptyBodyParams.swift in Sources */,
3BF999782A8AD072009CBDF2 /* CreatePaymentTokenView.swift in Sources */,
BED042312710833F00C80954 /* CardType.swift in Sources */,
3B6472A72AFAEB3A004745C4 /* PayPalOrderActionButton.swift in Sources */,
5301468C28918B4D00184F22 /* ApprovalResult.swift in Sources */,
3BC6220B2A97204E00251B85 /* CircularProgressView.swift in Sources */,
);
Expand Down
8 changes: 7 additions & 1 deletion Demo/Demo/Models/Order.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ struct Order: Codable, Equatable {

struct PaymentSource: Codable, Equatable {

let card: Card
let card: Card?
let paypal: PayPal?
}

init(id: String, status: String, paymentSource: PaymentSource? = nil) {
Expand All @@ -22,6 +23,11 @@ struct Order: Codable, Equatable {
let attributes: Attributes?
}

struct PayPal: Codable, Equatable {
jaxdesmarais marked this conversation as resolved.
Show resolved Hide resolved

let emailAddress: String
}

struct Attributes: Codable, Equatable {

let vault: Vault
Expand Down
8 changes: 4 additions & 4 deletions Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderCompletionResultView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ struct CardOrderCompletionResultView: View {
LeadingText("\(orderResponse.id)")
LeadingText("Status", weight: .bold)
LeadingText("\(orderResponse.status)")
if let lastDigits = orderResponse.paymentSource?.card.lastDigits {
if let lastDigits = orderResponse.paymentSource?.card?.lastDigits {
LeadingText("Card Last Digits", weight: .bold)
LeadingText("\(lastDigits)")
}
if let brand = orderResponse.paymentSource?.card.brand {
if let brand = orderResponse.paymentSource?.card?.brand {
LeadingText("Brand", weight: .bold)
LeadingText("\(brand)")
}
if let vaultID = orderResponse.paymentSource?.card.attributes?.vault.id {
if let vaultID = orderResponse.paymentSource?.card?.attributes?.vault.id {
LeadingText("Vault ID / Payment Token", weight: .bold)
LeadingText("\(vaultID)")
}
if let customerID = orderResponse.paymentSource?.card.attributes?.vault.customer.id {
if let customerID = orderResponse.paymentSource?.card?.attributes?.vault.customer.id {
LeadingText("Customer ID", weight: .bold)
LeadingText("\(customerID)")
}
Expand Down
2 changes: 1 addition & 1 deletion Demo/Demo/SwiftUIComponents/CardPaymentViews/CardPaymentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct CardPaymentView: View {
)

if let order = cardPaymentViewModel.state.createOrder {
OrderCreateCardPaymentResultView(cardPaymentViewModel: cardPaymentViewModel)
OrderCreateCardResultView(cardPaymentViewModel: cardPaymentViewModel)
NavigationLink {
CardOrderApproveView(orderID: order.id, cardPaymentViewModel: cardPaymentViewModel)
} label: {
Expand Down
2 changes: 1 addition & 1 deletion ...ws/OrderCreateCardPaymentResultView.swift → ...mentViews/OrderCreateCardResultView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftUI

struct OrderCreateCardPaymentResultView: View {
struct OrderCreateCardResultView: View {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the refactor ticket can we please include updating some of these names? This name doesn't seem to match up with what the code in this file is doing and it's not clear why it's being changed since there are no other code changes in this file. I don't think the original name was super clear but it's especially confusing we made this change with no other changes here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically we have result views for each Orders API calls to check if they are working as expected.
so there are OrderCreateCardResultView, OrderCreatePayPalWebResultView, etc.
And there are also container views since I didn't want them to be all on one scrollable page.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like this will be a great thing to refactor or can be shared in some way across payment methods since most of the logic is the same. I think that will help with naming as then we can have a singular OrderResultView.

Copy link
Collaborator Author

@KunJeongPark KunJeongPark Nov 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what I want to investigate in the refactor ticket. How to organize the different states to minimize views where it makes sense. Most of the result views have different content. There are two that are identical, order create result views and the "action buttons" for authorize/capture. To me, it's easier to follow if there are separate views for each API call result so we can find them more easily but I will explore different options.

That's why I wanted to create a different PR for the refactor as it will be quite a bit of code change in the viewModels and some backtracking and modifications based on feedback. I wanted to be able to track these changes.


@ObservedObject var cardPaymentViewModel: CardPaymentViewModel

Expand Down
53 changes: 53 additions & 0 deletions Demo/Demo/SwiftUIComponents/PayPalWebViews/PayPalOrderActionButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import SwiftUI

struct PayPalOrderActionButton: View {

let intent: Intent
let orderID: String
let selectedMerchantIntegration: MerchantIntegration

@ObservedObject var paypalWebViewModel: PayPalWebViewModel

var body: some View {
ZStack {
Button("\(intent.rawValue)") {
completeOrder()
}
.buttonStyle(RoundedBlueButtonStyle())
.padding()

if .loading == paypalWebViewModel.state.authorizedOrderResponse ||
.loading == paypalWebViewModel.state.capturedOrderResponse {
CircularProgressView()
}
}
}

private func completeOrder() {
if intent == .capture {
jaxdesmarais marked this conversation as resolved.
Show resolved Hide resolved
Task {
do {
try await paypalWebViewModel.captureOrder(
jaxdesmarais marked this conversation as resolved.
Show resolved Hide resolved
orderID: orderID,
selectedMerchantIntegration: selectedMerchantIntegration
)
print("Order Captured. ID: \(paypalWebViewModel.state.capturedOrder?.id ?? "")")
} catch {
print("Error capturing order: \(error.localizedDescription)")
}
}
} else {
Task {
do {
try await paypalWebViewModel.authorizeOrder(
orderID: orderID,
selectedMerchantIntegration: selectedMerchantIntegration
)
print("Order Authorized. ID: \(paypalWebViewModel.state.authorizedOrder?.id ?? "")")
} catch {
print("Error authorizing order: \(error.localizedDescription)")
}
}
}
}
}
13 changes: 11 additions & 2 deletions ...bViews/PayPalTransactionButtonsView.swift → ...yPalWebViews/PayPalTransactionsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SwiftUI
import PaymentButtons

struct PayPalTransactionButtonsView: View {
struct PayPalTransactionsView: View {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
struct PayPalTransactionsView: View {
struct PayPalTransactionView: View {

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are three options of transactions on that view PayPal, PayPal Credit, Pay Later. That's why I put Transactions. What do you think?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the singular is fine even though it's used in multiple places there will ever only be 1 transaction


@ObservedObject var paypalWebViewModel: PayPalWebViewModel
let orderID: String
Expand Down Expand Up @@ -29,7 +29,16 @@ struct PayPalTransactionButtonsView: View {
.stroke(.gray, lineWidth: 2)
.padding(5)
)
PayPalWebApprovalView(paypalWebViewModel: paypalWebViewModel)
PayPalWebApprovalResultView(paypalWebViewModel: paypalWebViewModel)
if paypalWebViewModel.state.checkoutResult != nil {
NavigationLink {
PayPalWebOrderCompletionView(orderID: orderID, payPalWebViewModel: paypalWebViewModel)
} label: {
Text("Complete Order Transaction")
}
.buttonStyle(RoundedBlueButtonStyle())
.padding()
}
Spacer()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ayPalWebViews/PayPalWebApprovalView.swift → ...ebViews/PayPalWebApprovalResultView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftUI

struct PayPalWebApprovalView: View {
struct PayPalWebApprovalResultView: View {

@ObservedObject var paypalWebViewModel: PayPalWebViewModel

Expand Down
Loading
Loading