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 import

Browse Source
This commit is contained in:
David Bomba 2022-05-09 13:31:19 +10:00
parent 3c4894c806
commit f06ba2644d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Export/CSV/InvoiceExport.php
View File

@ -63,7 +63,7 @@ class InvoiceExport extends BaseExport
'tax_rate3' => 'tax_rate3', 'tax_rate3' => 'tax_rate3',
'terms' => 'terms', 'terms' => 'terms',
'total_taxes' => 'total_taxes', 'total_taxes' => 'total_taxes',
'currency' => 'client_id' 'currency_id' => 'currency_id'
]; ];
@ -100,13 +100,13 @@ class InvoiceExport extends BaseExport
'tax_rate3', 'tax_rate3',
'terms', 'terms',
'total_taxes', 'total_taxes',
'client_id' 'currency_id',
]; ];
private array $decorate_keys = [ private array $decorate_keys = [
'country', 'country',
'client', 'client',
'currency', 'currency_id',
'status', 'status',
]; ];
@ -162,7 +162,8 @@ class InvoiceExport extends BaseExport
foreach(array_values($this->input['report_keys']) as $key){ foreach(array_values($this->input['report_keys']) as $key){
$entity[$key] = $transformed_invoice[$key]; if(array_key_exists($key, $transformed_invoice))
$entity[$key] = $transformed_invoice[$key];
} }
return $this->decorateAdvancedFields($invoice, $entity); return $this->decorateAdvancedFields($invoice, $entity);
@ -171,13 +172,13 @@ class InvoiceExport extends BaseExport
private function decorateAdvancedFields(Invoice $invoice, array $entity) :array private function decorateAdvancedFields(Invoice $invoice, array $entity) :array
{ {
if(array_key_exists('currency', $entity)) if(in_array('currency_id',$this->input['report_keys']))
$entity['currency'] = $invoice->client->currency()->code; $entity['currency_id'] = $invoice->client->currency()->code ?: $invoice->company->currency()->code;
if(array_key_exists('client_id', $entity)) if(in_array('client_id',$this->input['report_keys']))
$entity['client_id'] = $invoice->client->present()->name(); $entity['client_id'] = $invoice->client->present()->name();
if(array_key_exists('status_id', $entity)) if(in_array('status_id',$this->input['report_keys']))
$entity['status_id'] = $invoice->stringStatus($invoice->status_id); $entity['status_id'] = $invoice->stringStatus($invoice->status_id);
return $entity; return $entity;