diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 6468cbe7b549..ca501eb69b3a 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -310,11 +310,12 @@ class Design extends BaseDesign $aliases = [ '$product.product_key' => '$product.item', '$task.product_key' => '$task.service', + '$task.rate' => '$task.cost', ]; foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) { if (array_key_exists($column, $aliases)) { - $elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label', 'properties' => ['hidden' => $this->client->getSetting('hide_empty_columns_on_pdf')]]; + $elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label', 'properties' => ['data-ref' => "{$type}_table-" . substr($aliases[$column], 1) . '-th', 'hidden' => $this->client->getSetting('hide_empty_columns_on_pdf')]]; } elseif ($column == '$product.discount' && !$this->client->company->enable_product_discount) { $elements[] = ['element' => 'th', 'content' => $column . '_label', 'properties' => ['data-ref' => "{$type}_table-" . substr($column, 1) . '-th', 'style' => 'display: none;']]; } elseif ($column == '$product.quantity' && !$this->client->company->enable_product_quantity) { diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 23a37b03cc8a..6c0cb23fc113 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -329,6 +329,7 @@ class HtmlEngine $data['$task.service'] = ['value' => '', 'label' => ctrans('texts.service')]; $data['$task.description'] = ['value' => '', 'label' => ctrans('texts.description')]; $data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')]; + $data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.rate')]; $data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')]; $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];