Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 15:34:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5124 from turbo124/v5-develop

Browse Source 
Fixes for connected account
This commit is contained in:
David Bomba 2021-03-14 21:32:58 +11:00 committed by GitHub
commit f64d206f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ConnectedAccountController.php
View File

@ -136,7 +136,8 @@ class ConnectedAccountController extends BaseController
//$ct = CompanyUser::whereUserId(auth()->user()->id); //$ct = CompanyUser::whereUserId(auth()->user()->id);
//return $this->listResponse($ct); //return $this->listResponse($ct);
return $this->listResponse(auth()->user()); return $this->itemResponse(auth()->user());
// return $this->listResponse(auth()->user());
} }
return response() return response()

2
app/Utils/HtmlEngine.php
View File

@ -285,6 +285,8 @@ class HtmlEngine
$data['$company.website'] = ['value' => $this->settings->website ?: ' ', 'label' => ctrans('texts.website')]; $data['$company.website'] = ['value' => $this->settings->website ?: ' ', 'label' => ctrans('texts.website')];
$data['$company.address'] = ['value' => $this->company->present()->address($this->settings) ?: ' ', 'label' => ctrans('texts.address')]; $data['$company.address'] = ['value' => $this->company->present()->address($this->settings) ?: ' ', 'label' => ctrans('texts.address')];
$data['$signature'] = ['value' => $this->settings->email_signature ?: ' ', 'label' => ''];
$data['$spc_qr_code'] = ['value' => $this->company->present()->getSpcQrCode($this->client->currency()->code, $this->entity->number, $this->entity->balance), 'label' => '']; $data['$spc_qr_code'] = ['value' => $this->company->present()->getSpcQrCode($this->client->currency()->code, $this->entity->number, $this->entity->balance), 'label' => ''];
$logo = $this->company->present()->logo($this->settings); $logo = $this->company->present()->logo($this->settings);