diff --git a/app/Ninja/Reports/ClientReport.php b/app/Ninja/Reports/ClientReport.php index ca199b046341..f8d4c93a9f1e 100644 --- a/app/Ninja/Reports/ClientReport.php +++ b/app/Ninja/Reports/ClientReport.php @@ -14,6 +14,8 @@ class ClientReport extends AbstractReport 'amount' => [], 'paid' => [], 'balance' => [], + 'id_number' => ['columnSelector-false'], + 'vat_number' => ['columnSelector-false'], 'public_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'], 'user' => ['columnSelector-false'], @@ -70,6 +72,8 @@ class ClientReport extends AbstractReport $account->formatMoney($amount, $client), $account->formatMoney($paid, $client), $account->formatMoney($amount - $paid, $client), + $client->id_number, + $client->vat_number, $client->public_notes, $client->private_notes, $client->user->getDisplayName(), diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php index 5c20eaea2733..9c192be544ed 100644 --- a/app/Ninja/Reports/InvoiceReport.php +++ b/app/Ninja/Reports/InvoiceReport.php @@ -20,6 +20,7 @@ class InvoiceReport extends AbstractReport 'payment_date' => [], 'paid' => [], 'method' => [], + 'due_date' => ['columnSelector-false'], 'po_number' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'], 'user' => ['columnSelector-false'], @@ -99,6 +100,7 @@ class InvoiceReport extends AbstractReport $payment ? $payment->present()->payment_date : '', $payment ? $account->formatMoney($payment->getCompletedAmount(), $client) : '', $payment ? $payment->present()->method : '', + $invoice->present()->due_date, $invoice->po_number, $invoice->private_notes, $invoice->user->getDisplayName(), diff --git a/app/Ninja/Reports/ProfitAndLossReport.php b/app/Ninja/Reports/ProfitAndLossReport.php index 7f11081e86dc..02fc9058c378 100644 --- a/app/Ninja/Reports/ProfitAndLossReport.php +++ b/app/Ninja/Reports/ProfitAndLossReport.php @@ -13,6 +13,7 @@ class ProfitAndLossReport extends AbstractReport return [ 'type' => [], 'client' => [], + 'vendor' => [], 'amount' => [], 'date' => [], 'notes' => [], @@ -41,6 +42,7 @@ class ProfitAndLossReport extends AbstractReport $this->data[] = [ trans('texts.payment'), $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '', + '', $account->formatMoney($payment->getCompletedAmount(), $client), $payment->present()->payment_date, $payment->present()->method, @@ -60,16 +62,18 @@ class ProfitAndLossReport extends AbstractReport $expenses = Expense::scope() ->orderBy('expense_date', 'desc') - ->with('client.contacts') + ->with('client.contacts', 'vendor') ->withArchived() ->where('expense_date', '>=', $this->startDate) ->where('expense_date', '<=', $this->endDate); foreach ($expenses->get() as $expense) { $client = $expense->client; + $vendor = $expense->vendor; $this->data[] = [ trans('texts.expense'), $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '', + $vendor ? ($this->isExport ? $vendor->name : $vendor->present()->link) : '', '-' . $expense->present()->amount, $expense->present()->expense_date, $expense->present()->category,