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 invoice exports

Browse Source
This commit is contained in:
David Bomba 2022-05-10 14:51:39 +10:00
parent e0e53af87f
commit 434b7d77e7
2 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Export/CSV/CreditExport.php
View File

@ -146,8 +146,8 @@ class CreditExport extends BaseExport
if(in_array('country_id', $this->input['report_keys'])) if(in_array('country_id', $this->input['report_keys']))
$entity['country'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : ""; $entity['country'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : "";
if(in_array('currency', $this->input['report_keys'])) if(in_array('currency_id', $this->input['report_keys']))
$entity['currency'] = $credit->client->currency()->code; $entity['currency_id'] = $credit->client->currency() ? $credit->client->currency()->code : $invoice->company->currency()->code;;
if(in_array('invoice_id', $this->input['report_keys'])) if(in_array('invoice_id', $this->input['report_keys']))
$entity['invoice'] = $credit->invoice ? $credit->invoice->number : ""; $entity['invoice'] = $credit->invoice ? $credit->invoice->number : "";

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

@ -66,43 +66,6 @@ class InvoiceExport extends BaseExport
'currency_id' => 'currency_id' 'currency_id' => 'currency_id'
]; ];
protected array $all_keys = [
'amount',
'balance',
'client_id',
'custom_surcharge1',
'custom_surcharge2',
'custom_surcharge3',
'custom_surcharge4',
'custom_value1',
'custom_value2',
'custom_value3',
'custom_value4',
'date',
'discount',
'due_date',
'exchange_rate',
'footer',
'number',
'paid_to_date',
'partial',
'partial_due_date',
'po_number',
'private_notes',
'public_notes',
'status_id',
'tax_name1',
'tax_name2',
'tax_name3',
'tax_rate1',
'tax_rate2',
'tax_rate3',
'terms',
'total_taxes',
'currency_id',
];
private array $decorate_keys = [ private array $decorate_keys = [
'country', 'country',
'client', 'client',
@ -130,7 +93,7 @@ class InvoiceExport extends BaseExport
$this->csv = Writer::createFromString(); $this->csv = Writer::createFromString();
if(count($this->input['report_keys']) == 0) if(count($this->input['report_keys']) == 0)
$this->input['report_keys'] = $this->all_keys; $this->input['report_keys'] = array_values($this->entity_keys);
//insert the header //insert the header
$this->csv->insertOne($this->buildHeader()); $this->csv->insertOne($this->buildHeader());
@ -162,8 +125,12 @@ class InvoiceExport extends BaseExport
foreach(array_values($this->input['report_keys']) as $key){ foreach(array_values($this->input['report_keys']) as $key){
$keyval = array_search($key, $this->entity_keys);
if(array_key_exists($key, $transformed_invoice)) if(array_key_exists($key, $transformed_invoice))
$entity[$key] = $transformed_invoice[$key]; $entity[$keyval] = $transformed_invoice[$key];
else
$entity[$keyval] = '';
} }
return $this->decorateAdvancedFields($invoice, $entity); return $this->decorateAdvancedFields($invoice, $entity);
@ -172,14 +139,17 @@ class InvoiceExport extends BaseExport
private function decorateAdvancedFields(Invoice $invoice, array $entity) :array private function decorateAdvancedFields(Invoice $invoice, array $entity) :array
{ {
if(in_array('currency_id',$this->input['report_keys'])) if(in_array('country_id', $this->input['report_keys']))
$entity['currency_id'] = $invoice->client->currency()->code ?: $invoice->company->currency()->code; $entity['country'] = $invoice->client->country ? ctrans("texts.country_{$invoice->client->country->name}") : "";
if(in_array('client_id',$this->input['report_keys'])) if(in_array('currency_id', $this->input['report_keys']))
$entity['client_id'] = $invoice->client->present()->name(); $entity['currency_id'] = $invoice->client->currency() ? $invoice->client->currency()->code : $invoice->company->currency()->code;
if(in_array('client_id', $this->input['report_keys']))
$entity['client'] = $invoice->client->present()->name();
if(in_array('status_id',$this->input['report_keys'])) if(in_array('status_id',$this->input['report_keys']))
$entity['status_id'] = $invoice->stringStatus($invoice->status_id); $entity['status'] = $invoice->stringStatus($invoice->status_id);
return $entity; return $entity;
} }