Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2023-09-14 16:00:41 +10:00
parent 11496e34eb
commit a6945fea11
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Export/CSV/BaseExport.php
View File

@ -1026,10 +1026,13 @@ class BaseExport
} }
} }
elseif(count($parts) == 2 && stripos($parts[0], 'contact') !== false) { elseif(count($parts) == 2 && (stripos($parts[0], 'vendor_contact') !== false || stripos($parts[0], 'contact') !== false)) {
$parts[0] = str_replace('vendor_contact', 'contact', $parts[0]);
$entity = "contact".substr($parts[1], -1); $entity = "contact".substr($parts[1], -1);
$custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, $entity)) > 1 ? $helper->makeCustomField($this->company->custom_fields, $entity) : ctrans("texts.{$parts[1]}"); $custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, $entity)) > 1 ? $helper->makeCustomField($this->company->custom_fields, $entity) : ctrans("texts.{$parts[1]}");
$header[] = ctrans("texts.{$parts[0]}") . " " . $custom_field_string; $header[] = ctrans("texts.{$parts[0]}") . " " . $custom_field_string;
} }
elseif(count($parts) == 2 && in_array(substr($original_key, 0, -1), ['credit','quote','invoice','purchase_order','recurring_invoice','task'])){ elseif(count($parts) == 2 && in_array(substr($original_key, 0, -1), ['credit','quote','invoice','purchase_order','recurring_invoice','task'])){
$custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1))) > 1 ? $helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1)) : ctrans("texts.{$parts[1]}"); $custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1))) > 1 ? $helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1)) : ctrans("texts.{$parts[1]}");
@ -1058,7 +1061,6 @@ class BaseExport
$entity = ''; $entity = '';
match ($class) { match ($class) {
Activity::class => $entity = 'activity',
Invoice::class => $entity = 'invoice', Invoice::class => $entity = 'invoice',
RecurringInvoice::class => $entity = 'recurring_invoice', RecurringInvoice::class => $entity = 'recurring_invoice',
Quote::class => $entity = 'quote', Quote::class => $entity = 'quote',
@ -1081,9 +1083,7 @@ class BaseExport
$report_keys = explode(".", $value); $report_keys = explode(".", $value);
$column_key = $value; $column_key = $value;
nlog($value);
nlog($report_keys);
nlog($row);
if($value == 'product_image') { if($value == 'product_image') {
$column_key = 'image'; $column_key = 'image';
$value = 'image'; $value = 'image';