From a5bf008f05dc596f6a718e5c60e44593931820e1 Mon Sep 17 00:00:00 2001
From: Alexa Snyder <alexa.snyder@sitecore.com>
Date: Tue, 8 Oct 2024 14:14:57 -0500
Subject: [PATCH] fix initializing payment in paypal

---
 .../Models/PayPalOrder.cs                     |  2 ++
 ...erCloud.Integrations.Payment.PayPal.csproj |  2 +-
 .../PayPalClient.cs                           | 22 ++++++-------------
 .../PayPalService.cs                          |  2 +-
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/OrderCloud.Integrations.Payment.PayPal/Models/PayPalOrder.cs b/OrderCloud.Integrations.Payment.PayPal/Models/PayPalOrder.cs
index 8d611e7..c732855 100644
--- a/OrderCloud.Integrations.Payment.PayPal/Models/PayPalOrder.cs
+++ b/OrderCloud.Integrations.Payment.PayPal/Models/PayPalOrder.cs
@@ -85,6 +85,8 @@ public class Card
         public string last_digits { get; set; }
         public string expiry { get; set; }
         public string brand { get; set; }
+        public string vault_id { get; set; }
+        public string single_use_token { get; set; }
     }
 
     public class PaymentToken
diff --git a/OrderCloud.Integrations.Payment.PayPal/OrderCloud.Integrations.Payment.PayPal.csproj b/OrderCloud.Integrations.Payment.PayPal/OrderCloud.Integrations.Payment.PayPal.csproj
index aa30cba..a7a4e34 100644
--- a/OrderCloud.Integrations.Payment.PayPal/OrderCloud.Integrations.Payment.PayPal.csproj
+++ b/OrderCloud.Integrations.Payment.PayPal/OrderCloud.Integrations.Payment.PayPal.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>2.4.0</Version>
+	  <Version>2.4.1</Version>
 	  <PackageId>OrderCloud.Integrations.Payment.PayPal</PackageId>
 	  <Title>OrderCloud Payment Integration with PayPal</Title>
 	  <Authors>OrderCloud Team</Authors>
diff --git a/OrderCloud.Integrations.Payment.PayPal/PayPalClient.cs b/OrderCloud.Integrations.Payment.PayPal/PayPalClient.cs
index ef73ee7..967c460 100644
--- a/OrderCloud.Integrations.Payment.PayPal/PayPalClient.cs
+++ b/OrderCloud.Integrations.Payment.PayPal/PayPalClient.cs
@@ -17,24 +17,16 @@ public static async Task<PayPalOrder> CreateAuthorizedOrderAsync(PayPalConfig co
             var paymentSource = new PaymentSource();
             if (transaction.CardDetails != null)
             {
+                paymentSource.card = new Card();
                 if (transaction.CardDetails.SavedCardID != null)
                 {
-                    paymentSource.token = new PaymentToken()
-                    {
-                        id = transaction.CardDetails.SavedCardID,
-                        type = "BILLING_AGREEMENT"
-                    };
-                } else {
-                    paymentSource.card = new Card
-                    {
-                        name = transaction.CardDetails.CardHolderName,
-                        last_digits = transaction.CardDetails.NumberLast4Digits,
-                        expiry = $"{transaction.CardDetails.ExpirationMonth}/{transaction.CardDetails.ExpirationYear}",
-                        brand = transaction.CardDetails.CardType
-                    };
+                    paymentSource.card.vault_id = transaction.CardDetails.SavedCardID;
+                } else if (transaction.CardDetails.Token != null)
+                {
+                    paymentSource.card.single_use_token = transaction.CardDetails.Token;
                 }
-
             }
+
             return await BuildClient(config)
                 .AppendPathSegments("v2", "checkout", "orders")
                 .WithHeader("PayPal-Request-Id", transaction.RequestID)
@@ -45,7 +37,7 @@ public static async Task<PayPalOrder> CreateAuthorizedOrderAsync(PayPalConfig co
                         {
                             purchaseUnit
                         },
-                    payment_source = paymentSource
+                    payment_source = paymentSource.card != null ? paymentSource : null
                 })
                 .ReceiveJson<PayPalOrder>();
         }
diff --git a/OrderCloud.Integrations.Payment.PayPal/PayPalService.cs b/OrderCloud.Integrations.Payment.PayPal/PayPalService.cs
index be0c4e8..699f356 100644
--- a/OrderCloud.Integrations.Payment.PayPal/PayPalService.cs
+++ b/OrderCloud.Integrations.Payment.PayPal/PayPalService.cs
@@ -24,7 +24,7 @@ public async Task<CCTransactionResult> InitializePaymentRequestAsync(AuthorizeCC
             var order = await PayPalClient.CreateAuthorizedOrderAsync(config, purchaseUnit, transaction);
             return new CCTransactionResult
             {
-                Succeeded = order.status.ToLowerInvariant() == "created",
+                Succeeded = new List<string>{ "created", "completed" }.Contains(order.status.ToLowerInvariant()),
                 Amount = transaction.Amount,
                 TransactionID = order.id
             };