Merge pull request #7581 from turbo124/v5-develop

checks for access token property

app/Http/Controllers/Auth/LoginController.php

@@ -498,6 +498,8 @@ class LoginController extends BaseController
     {
         if(request()->has('accessToken'))
             $accessToken = request()->input('accessToken');
+        elseif(request()->has('access_token'))
+            $accessToken = request()->input('access_token');
         else
             return response()->json(['message' => 'Invalid response from oauth server'], 400);
 

app/Services/Client/Statement.php

@@ -220,6 +220,7 @@ class Statement
     protected function getInvoices(): \Illuminate\Support\LazyCollection
     {
         return Invoice::withTrashed()
+            ->with('payments.type')
             ->where('is_deleted', false)
             ->where('company_id', $this->client->company_id)
             ->where('client_id', $this->client->id)