From e7ffc00306584a4805676eb4980aee25c4e09098 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 29 Oct 2023 20:33:26 +1100
Subject: [PATCH] Fixes for paypal ppcp

---
 app/PaymentDrivers/PayPalPPCPPaymentDriver.php                | 3 ++-
 app/Providers/EventServiceProvider.php                        | 4 +---
 .../views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
index 676760355373..7e9e4a9f7f7c 100644
--- a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
@@ -206,7 +206,8 @@ class PayPalPPCPPaymentDriver extends BaseDriver
         $data['order_id'] = $this->createOrder($data);
         $data['funding_source'] = $this->paypal_payment_method;
         $data['gateway_type_id'] = $this->gateway_type_id;
-
+        $data['merchantId'] = $this->company_gateway->getConfigField('merchantId');
+        
         return render('gateways.paypal.ppcp.pay', $data);
 
     }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 6b95c12cc335..71b654febbea 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -287,9 +287,7 @@ class EventServiceProvider extends ServiceProvider
      *
      */
     protected $listen = [
-        RequestSending::class => [
-            LogRequestSending::class,
-        ],
+        
     // 'Illuminate\Http\Client\Events\ResponseReceived' => [
     //     'App\Listeners\LogResponseReceived',
     // ],
diff --git a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
index 1245d663ac7a..bc7fb6e45e7b 100644
--- a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
@@ -30,7 +30,7 @@
 
 @push('footer')
 
-<script src="https://www.paypal.com/sdk/js?client-id={!! $client_id !!}&components=buttons,funding-eligibility&intent=capture" data-client-token="{!! $token !!}"></script>
+<script src="https://www.paypal.com/sdk/js?client-id={!! $client_id !!}&merchant-id={!! $merchantId !!}&components=buttons,funding-eligibility&intent=capture" data-client-token="{!! $token !!}" data-partner-attribution-id="invoiceninja_SP_PPCP"></script>
 <div id="paypal-button-container"></div>
 <script>