From 23e48c0fdc57d605190bb7def8fcaf27f5fb0e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 14 Apr 2020 00:19:48 +0200 Subject: [PATCH] Remove present() from client array (#3626) * Remove optional * Added more client properties * Remove blank space --- .../ClientPortal/CustomMessage/CustomMessage.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php index a417cd699e06..649370b62f0f 100644 --- a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php +++ b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php @@ -82,18 +82,22 @@ class CustomMessage '$company.name' => optional($this->company)->getSetting('name'), '$company.website' => optional($this->company)->getSetting('website'), - '$client.id' => optional(optional($this->client)->present())->id, - '$client.name' => optional(optional($this->client)->present())->name, - '$client.website' => optional(optional($this->client)->present())->website, - '$client.public_notes' => optional(optional($this->client)->present())->public_notes, - '$client.phone' => optional(optional($this->client)->present())->phone, - '$client.balance' => optional(optional($this->client)->present())->balance, + '$client.id' => optional($this->client)->id, + '$client.name' => optional($this->client)->name, + '$client.website' => optional($this->client)->website, + '$client.public_notes' => optional($this->client)->public_notes, + '$client.phone' => optional($this->client)->phone, + '$client.balance' => optional($this->client)->balance, '$client.address1' => optional(optional($this->client)->present())->address1, '$client.address2' => optional(optional($this->client)->present())->address2, '$client.city' => optional(optional($this->client)->present())->city, '$client.state' => optional(optional($this->client)->present())->state, '$client.postal_code' => optional(optional($this->client)->present())->postal_code, '$client.country' => optional(optional(optional($this->client)->present())->country)->full_name, + '$client.address' => optional(optional($this->client)->present())->address(), + '$client.shipping_address' => optional(optional($this->client)->present())->shipping_address(), + '$client.primary_contact_name' => optional(optional($this->client)->present())->primary_contact_name(), + '$client.city_state' => optional(optional($this->client)->present())->getCityState(), '$contact.first_name' => optional($this->contact)->first_name, '$contact.last_name' => optional($this->contact)->last_name,