Paypal fixes

lunarphp · Sep 22, 2023 · 64a0457 · 64a0457
1 parent e5e3966
commit 64a0457
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/payment/paypal/src/Paypal.php b/payment/paypal/src/Paypal.php
@@ -46,7 +46,7 @@ public function getOrder(string $orderId)
     public function capture(string $orderId)
     {
         return $this->baseHttpClient()->withToken($this->getAccessToken())
-            ->withBody('')
+            ->withBody('', 'application/json')
             ->post("/v2/checkout/orders/{$orderId}/capture")
             ->json();
     }
@@ -60,6 +60,8 @@ public function buildInitialOrder(Cart $cart): array
         $billingAddress = $cart->billingAddress;
         $shippingAddress = $cart->shippingAddress ?: $billingAddress;
 
+        $successRoute = config('lunar.payments.paypal.success_route', 'checkout.success');
+
         $requestData = [
             'intent' => 'CAPTURE',
             'purchase_units' => [
@@ -87,13 +89,13 @@ public function buildInitialOrder(Cart $cart): array
                     'shipping_preference' => 'SET_PROVIDED_ADDRESS',
                     'payment_method_preference' => 'IMMEDIATE_PAYMENT_REQUIRED',
                     'email' => $billingAddress?->contact_email,
-                    'return_url' => route('checkout.success'),
-                    'cancel_url' => route('checkout.index', $cart->fingerprint()),
+                    'return_url' => route($successRoute),
+                    'cancel_url' => route($successRoute, $cart->fingerprint()),
                     'name' => [
                         'given_name' => $billingAddress?->first_name,
                         'surname' => $billingAddress?->last_name,
                     ],
-                    'email_address' => $billingAddress->email,
+                    'email_address' => $billingAddress->contact_email,
                     'address' => [
                         'address_line_1' => $billingAddress?->line_one,
                         'address_line_2' => $billingAddress?->line_two,
@@ -107,7 +109,7 @@ public function buildInitialOrder(Cart $cart): array
         ];
 
         return $this->baseHttpClient()->withToken($this->getAccessToken())->withBody(
-            json_encode($requestData)
+            json_encode($requestData), 'application/json'
         )->post('v2/checkout/orders')->json();
     }
 }