From a2373d86def7eeff4b372a60da6324fb39bdbe39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 20 Oct 2021 14:35:20 +0200
Subject: [PATCH 1/2] Fixes for SystemLogger

---
 app/PaymentDrivers/Braintree/PayPal.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/PaymentDrivers/Braintree/PayPal.php b/app/PaymentDrivers/Braintree/PayPal.php
index 94aa0fffd0..6849ebf2f9 100644
--- a/app/PaymentDrivers/Braintree/PayPal.php
+++ b/app/PaymentDrivers/Braintree/PayPal.php
@@ -140,7 +140,8 @@ class PayPal
             SystemLog::CATEGORY_GATEWAY_RESPONSE,
             SystemLog::EVENT_GATEWAY_SUCCESS,
             SystemLog::TYPE_BRAINTREE,
-            $this->braintree->client
+            $this->braintree->client,
+            $this->braintree->client->company,
         );
 
         return redirect()->route('client.payments.show', ['payment' => $this->braintree->encodePrimaryKey($payment->id)]);

From baea9e34c2a95bb10d989ea4e76c3dd7c3ba5cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 20 Oct 2021 14:35:27 +0200
Subject: [PATCH 2/2] Fixes for PayPal email

---
 .../portal/ninja2020/gateways/braintree/paypal/pay.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php b/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
index daaf294d1b..140ba32973 100644
--- a/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
@@ -39,7 +39,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">{{ $token->meta->email }}</span>
+                    <span class="ml-1 cursor-pointer">{{ optional($token->meta)->email }}</span>
                 </label>
             @endforeach
         @endisset