From 255643d7dc1aca70e765bb192faf47a9065ccd75 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 14 Mar 2021 21:32:09 +1100 Subject: [PATCH] Fixes for connected account --- app/Http/Controllers/ConnectedAccountController.php | 3 ++- app/Utils/HtmlEngine.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php index d83cf9de4ba1..80acf01133ee 100644 --- a/app/Http/Controllers/ConnectedAccountController.php +++ b/app/Http/Controllers/ConnectedAccountController.php @@ -136,7 +136,8 @@ class ConnectedAccountController extends BaseController //$ct = CompanyUser::whereUserId(auth()->user()->id); //return $this->listResponse($ct); - return $this->listResponse(auth()->user()); + return $this->itemResponse(auth()->user()); + // return $this->listResponse(auth()->user()); } return response() diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index adbe57eb1ff7..19514aa33b73 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -285,6 +285,8 @@ class HtmlEngine $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['$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' => '']; $logo = $this->company->present()->logo($this->settings);