Merge pull request #147 from ketangarala/Issues/Issue-50

SI: PayPal Express Authorize Setting Not Creating Authorizations #50
HotcakesCommerce · Jul 27, 2018 · 5dd7920 · 5dd7920
2 parents 630aaec + fe7f1d0
commit 5dd7920
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Libraries/Hotcakes.Commerce/BusinessRules/OrderTasks/StartPaypalExpressCheckout.cs b/Libraries/Hotcakes.Commerce/BusinessRules/OrderTasks/StartPaypalExpressCheckout.cs
@@ -63,14 +63,10 @@ public override bool ProcessCheckout(OrderTaskContext context)
                     EventLog.LogEvent("PayPal Express Checkout", "CartReturnUrl=" + cartReturnUrl, EventLogSeverity.Information);
 
                     PaymentActionCodeType mode = PaymentActionCodeType.Authorization;
-                    if (context.HccApp.CurrentStore.Settings.PayPal.ExpressAuthorizeOnly)
-					{
-						mode = PaymentActionCodeType.Order;
-					}
-                    else
+                    if (!context.HccApp.CurrentStore.Settings.PayPal.ExpressAuthorizeOnly)
 					{
                         mode = PaymentActionCodeType.Sale;
-					}
+                    }
 
                     // Accelerated boarding
                     if (string.IsNullOrWhiteSpace(context.HccApp.CurrentStore.Settings.PayPal.UserName))

diff --git a/Libraries/Hotcakes.Commerce/Payment/Methods/PaypalExpress.cs b/Libraries/Hotcakes.Commerce/Payment/Methods/PaypalExpress.cs
@@ -70,10 +70,16 @@ public bool Authorize(Transaction t, HotcakesApplication app)
                 {
                     var OrderNumber = t.MerchantInvoiceNumber + Guid.NewGuid();
 
+                    PaymentActionCodeType mode = PaymentActionCodeType.Authorization;
+                    if (!app.CurrentStore.Settings.PayPal.ExpressAuthorizeOnly)
+                    {
+                        mode = PaymentActionCodeType.Sale;
+                    }
+
                     var paymentResponse = ppAPI.DoExpressCheckoutPayment(t.PreviousTransactionNumber,
                         t.PreviousTransactionAuthCode,
                         t.Amount.ToString("N", CultureInfo.InvariantCulture),
-                        PaymentActionCodeType.Order,
+                        mode,
                         PayPalAPI.GetCurrencyCodeType(app.CurrentStore.Settings.PayPal.Currency),
                         OrderNumber);