diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 5cdd222c6cef..a539ad4365e1 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -303,7 +303,9 @@ class Design extends BaseDesign $elements = []; // Some of column can be aliased. This is simple workaround for these. - $aliases = []; + $aliases = [ + '$product.product_key' => '$product.item', + ]; foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) { if (array_key_exists($column, $aliases)) { diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index ab8ab6ae0f49..08356c076822 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -624,6 +624,7 @@ trait MakesInvoiceValues $_table_type = ltrim($table_type, '$'); // From $product -> product. + $data[$key][$table_type.'.product_key'] = is_null(optional($item)->product_key) ? $item->item : $item->product_key; $data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item; $data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service; $data[$key][$table_type.'.notes'] = $item->notes;