From 6e5e9bdb12a21668439c54289866baedd7e6e710 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 25 Jun 2024 08:49:25 +1000 Subject: [PATCH 1/2] Adjustments for signatures --- app/Utils/HtmlEngine.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 05880f5bcee9..3fc822813938 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -663,15 +663,19 @@ class HtmlEngine if ($this->settings->signature_on_pdf) { $data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')]; - $data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; - $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip ?? '', 'label' => ctrans('texts.address')]; + // $data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; + // $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip ?? '', 'label' => ctrans('texts.address')]; } else { $data['$contact.signature'] = ['value' => '', 'label' => '']; - $data['$contact.signature_date'] = ['value' => '', 'label' => ctrans('texts.date')]; - $data['$contact.signature_ip'] = ['value' => '', 'label' => ctrans('texts.address')]; + // $data['$contact.signature_date'] = ['value' => '', 'label' => ctrans('texts.date')]; + // $data['$contact.signature_ip'] = ['value' => '', 'label' => ctrans('texts.address')]; } + $data['$contact.signature_raw'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')]; + $data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; + $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip, 'label' => ctrans('texts.address')]; + $data['$thanks'] = ['value' => '', 'label' => ctrans('texts.thanks')]; $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')]; $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')]; From 85b306c8ea9a02a9a3dced645416615b6a1f5d07 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 25 Jun 2024 08:56:07 +1000 Subject: [PATCH 2/2] Additional props for contact.signaturew --- app/Utils/HtmlEngine.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 3fc822813938..b58f7a8b5175 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -663,18 +663,13 @@ class HtmlEngine if ($this->settings->signature_on_pdf) { $data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')]; - // $data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; - // $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip ?? '', 'label' => ctrans('texts.address')]; - } else { $data['$contact.signature'] = ['value' => '', 'label' => '']; - // $data['$contact.signature_date'] = ['value' => '', 'label' => ctrans('texts.date')]; - // $data['$contact.signature_ip'] = ['value' => '', 'label' => ctrans('texts.address')]; } $data['$contact.signature_raw'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')]; $data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; - $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip, 'label' => ctrans('texts.address')]; + $data['$contact.signature_ip'] = ['value' => $this->invitation->signature_ip ?? '', 'label' => ctrans('texts.address')]; $data['$thanks'] = ['value' => '', 'label' => ctrans('texts.thanks')]; $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];