Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:37:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7581 from turbo124/v5-develop

Browse Source 
checks for access token property
This commit is contained in:
David Bomba 2022-06-22 18:55:04 +10:00 committed by GitHub
commit 77cdae7907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

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

1
app/Services/Client/Statement.php
View File

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