diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 3f840bb5bb62..5df871824be4 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -13,6 +13,7 @@ use App\Models\Credit; use App\Models\Task; use App\Models\Invoice; use App\Models\Payment; +use App\Models\Expense; use App\Models\Vendor; use App\Models\VendorContact; @@ -212,6 +213,13 @@ class ExportController extends BaseController ->get(); } + if ($request->input('include') === 'all' || $request->input('expenses')) { + $data['expenses'] = Expense::scope() + ->with('user', 'vendor.vendor_contacts', 'client.contacts', 'expense_category') + ->withArchived() + ->get(); + } + if ($request->input('include') === 'all' || $request->input('vendors')) { $data['vendors'] = Vendor::scope() ->with('user', 'vendor_contacts', 'country') diff --git a/app/Ninja/Presenters/ExpensePresenter.php b/app/Ninja/Presenters/ExpensePresenter.php index 4760515720bb..018ca273e76e 100644 --- a/app/Ninja/Presenters/ExpensePresenter.php +++ b/app/Ninja/Presenters/ExpensePresenter.php @@ -24,4 +24,14 @@ class ExpensePresenter extends EntityPresenter return Utils::fromSqlDate($this->entity->expense_date); } + public function amount() + { + return Utils::formatMoney($this->entity->amount, $this->entity->expense_currency_id); + } + + public function category() + { + return $this->entity->expense_category ? $this->entity->expense_category->name : ''; + } + } diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php index 36c8da0e4733..193214d7d333 100644 --- a/resources/views/accounts/import_export.blade.php +++ b/resources/views/accounts/import_export.blade.php @@ -68,17 +68,20 @@