diff --git a/app/Export/CSV/ExpenseExport.php b/app/Export/CSV/ExpenseExport.php index b139dd43b8af..afa55a7a36ff 100644 --- a/app/Export/CSV/ExpenseExport.php +++ b/app/Export/CSV/ExpenseExport.php @@ -78,7 +78,7 @@ class ExpenseExport extends BaseExport 'expense.net_amount' ]; - $this->input['report_keys'] = array_merge($this->input['report_keys'], $tax_keys); + $this->input['report_keys'] = array_unique(array_merge($this->input['report_keys'], $tax_keys)); $query = Expense::query() ->with('client') diff --git a/app/Export/CSV/InvoiceExport.php b/app/Export/CSV/InvoiceExport.php index 8db6664cd8c1..5ccb2daaaad1 100644 --- a/app/Export/CSV/InvoiceExport.php +++ b/app/Export/CSV/InvoiceExport.php @@ -167,7 +167,7 @@ class InvoiceExport extends BaseExport $entity['invoice.user_id'] = $invoice->user ? $invoice->user->present()->name() : ''; } - +nlog($entity); return $entity; } } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 81acdcd0d711..df5d6241cbe0 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -80,7 +80,7 @@ use Laracasts\Presenter\PresentableTrait; * @property float $amount * @property float $balance * @property float|null $partial - * @property string|null $partial_due_date + * @property string|null|\Carbon\Carbon $partial_due_date * @property string|null $last_viewed * @property int|null $created_at * @property int|null $updated_at @@ -401,7 +401,7 @@ class Invoice extends BaseModel public function getStatusAttribute() { $due_date = $this->due_date ? Carbon::parse($this->due_date) : false; - $partial_due_date = $this->partial_due_Date ? Carbon::parse($this->partial_due_date) : false; + $partial_due_date = $this->partial_due_date ? Carbon::parse($this->partial_due_date) : false; if ($this->status_id == self::STATUS_SENT && $due_date && $due_date->gt(now())) { return self::STATUS_UNPAID; diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php index c732fa945de1..7a50713c262f 100644 --- a/app/Transformers/InvoiceTransformer.php +++ b/app/Transformers/InvoiceTransformer.php @@ -132,7 +132,7 @@ class InvoiceTransformer extends EntityTransformer 'is_amount_discount' => (bool) ($invoice->is_amount_discount ?: false), 'footer' => $invoice->footer ?: '', 'partial' => (float) ($invoice->partial ?: 0.0), - 'partial_due_date' => ($invoice->partial_due_date && $invoice->partial_due_date != "-0001-11-30") ? $invoice->partial_due_date : '', + 'partial_due_date' => ($invoice->partial_due_date && $invoice->partial_due_date != "-0001-11-30") ? $invoice->partial_due_date->format('Y-m-d') : '', 'custom_value1' => (string) $invoice->custom_value1 ?: '', 'custom_value2' => (string) $invoice->custom_value2 ?: '', 'custom_value3' => (string) $invoice->custom_value3 ?: '', diff --git a/tests/Feature/Export/ReportCsvGenerationTest.php b/tests/Feature/Export/ReportCsvGenerationTest.php index 397e00c321de..8dfb638821a7 100644 --- a/tests/Feature/Export/ReportCsvGenerationTest.php +++ b/tests/Feature/Export/ReportCsvGenerationTest.php @@ -2207,6 +2207,8 @@ class ReportCsvGenerationTest extends TestCase $response = $this->poll($hash); $csv = $response->body(); + nlog($csv); + $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Expense Amount')); $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Expense Public Notes')); $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Expense Private Notes'));