diff --git a/app/Ninja/Presenters/ExpensePresenter.php b/app/Ninja/Presenters/ExpensePresenter.php index 1559e3b5a04a..c9bd71b1fabb 100644 --- a/app/Ninja/Presenters/ExpensePresenter.php +++ b/app/Ninja/Presenters/ExpensePresenter.php @@ -44,6 +44,11 @@ class ExpensePresenter extends EntityPresenter return Utils::formatMoney($this->entity->amountWithTax(), $this->entity->expense_currency_id); } + public function currencyCode() + { + return Utils::getFromCache($this->entity->expense_currency_id, 'currencies')->code; + } + public function taxAmount() { return Utils::formatMoney($this->entity->taxAmount(), $this->entity->expense_currency_id); diff --git a/app/Ninja/Reports/ExpenseReport.php b/app/Ninja/Reports/ExpenseReport.php index 3521d4241bac..b852dcc64f5f 100644 --- a/app/Ninja/Reports/ExpenseReport.php +++ b/app/Ninja/Reports/ExpenseReport.php @@ -27,6 +27,10 @@ class ExpenseReport extends AbstractReport $columns['tax'] = ['columnSelector-false']; } + if ($this->isExport) { + $columns['currency'] = ['columnSelector-false']; + } + return $columns; } @@ -85,6 +89,10 @@ class ExpenseReport extends AbstractReport $row[] = $expense->present()->taxAmount; } + if ($this->isExport) { + $row[] = $expense->present()->currencyCode; + } + $this->data[] = $row; $this->addToTotals($expense->expense_currency_id, 'amount', $amount); diff --git a/resources/views/export/expenses.blade.php b/resources/views/export/expenses.blade.php index d347de007611..6094e0a1b5eb 100644 --- a/resources/views/export/expenses.blade.php +++ b/resources/views/export/expenses.blade.php @@ -7,6 +7,7 @@ {{ trans('texts.expense_date') }} {{ trans('texts.amount') }} {{ trans('texts.tax') }} + {{ trans('texts.currency') }} {{ trans('texts.category') }} {{ trans('texts.status') }} {{ trans('texts.public_notes') }} @@ -25,6 +26,7 @@ {{ $expense->present()->expense_date }} {{ $expense->present()->amount }} {{ $expense->present()->taxAmount }} + {{ $expense->present()->currencyCode }} {{ $expense->present()->category }} {{ $expense->statusLabel() }} {{ $expense->public_notes }}