diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index a176cb7052a1..4ded8324fe62 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -113,6 +113,11 @@ class HtmlEngine $data['$invoice.due_date'] = &$data['$due_date']; $data['$invoice.number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')]; $data['$invoice.po_number'] = ['value' => $this->entity->po_number ?: ' ', 'label' => ctrans('texts.po_number')]; + $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->entity->client->date_format()), 'label' => ctrans('texts.date')]; + $data['$invoice.datetime'] = &$data['$entity.datetime']; + $data['$quote.datetime'] = &$data['$entity.datetime']; + $data['$credit.datetime'] = &$data['$entity.datetime']; + // $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: ' ', 'label' => ctrans('texts.taxes')]; // $data['$invoice.line_taxes'] = &$data['$line_taxes']; diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php index ec8587deefe3..fb47b1c2cf86 100644 --- a/app/Utils/Traits/MakesDates.php +++ b/app/Utils/Traits/MakesDates.php @@ -71,6 +71,17 @@ trait MakesDates return $date->format($format); } + /** + * Formats a datedate. + * @param Carbon|string $date Carbon object or date string + * @param string $format The date display format + * @return string The formatted date + */ + public function formatDatetime($date, string $format) :string + { + return Carbon::createFromTimestamp($date)->format($format . " g:i a"); + } + /** * Formats a date. * @param Carbon/String $date Carbon object or date string