diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 9d704574d990..2d4d2a5a82a3 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -298,9 +298,6 @@ class BaseExport $transformed_invoices = $transformed_invoices['App\\Models\\Invoice']; - nlog(count($transformed_invoices)); - nlog(array_key_exists($column, $transformed_invoices[0])); - if(count($transformed_invoices) == 1 && array_key_exists($column, $transformed_invoices[0])) return $transformed_invoices[0][$column]; diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php index be3b9e7376f4..b8188ba051d9 100644 --- a/app/Export/CSV/InvoiceItemExport.php +++ b/app/Export/CSV/InvoiceItemExport.php @@ -145,12 +145,18 @@ class InvoiceItemExport extends BaseExport $transformed_items = []; foreach ($invoice->line_items as $item) { - $item_array = []; + $item_array = []; + nlog($this->input['report_keys']); + foreach (array_values($this->input['report_keys']) as $key) { //items iterator produces item array if (str_contains($key, "item.")) { $key = str_replace("item.", "", $key); + + $keyval = $key; + + $keyval = str_replace("custom_value", "invoice", $key); if($key == 'type_id') $keyval = 'type'; @@ -177,8 +183,6 @@ class InvoiceItemExport extends BaseExport $entity[$keyval] = ""; } } - // nlog("entity"); - // nlog($entity); $transformed_items = array_merge($transformed_invoice, $item_array); $entity = $this->decorateAdvancedFields($invoice, $transformed_items);