From d8cb1b436d60eef01daf5ef22c3e31740c548384 Mon Sep 17 00:00:00 2001 From: steenrabol Date: Sat, 9 Jan 2016 09:08:24 +0100 Subject: [PATCH] Expense module --- app/Http/Controllers/ExpenseController.php | 3 ++- app/Ninja/Repositories/ExpenseRepository.php | 24 ++++++++++++++++++++ app/Services/ExpenseService.php | 6 +++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 2e59dbecd208..abfffc24f607 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -100,7 +100,8 @@ class ExpenseController extends BaseController 'title' => 'Edit Expense', 'vendors' => Vendor::scope()->with('vendorcontacts')->orderBy('name')->get(), 'vendorPublicId' => $expense->vendor_id, - 'clients' => Client::scope()->with('contacts')->orderBy('name')->get() + 'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), + 'clientPublicId' => $expense->invoice_client_id, ); $data = array_merge($data, self::getViewModel()); diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php index 12133947b510..80ce74ee3694 100644 --- a/app/Ninja/Repositories/ExpenseRepository.php +++ b/app/Ninja/Repositories/ExpenseRepository.php @@ -125,4 +125,28 @@ class ExpenseRepository extends BaseRepository return $expense; } + + public function bulk($ids, $action) + { + $expenses = Expense::withTrashed()->scope($ids)->get(); + + foreach ($expenses as $expense) { + if ($action == 'restore') { + $expense->restore(); + + $expense->is_deleted = false; + $expense->save(); + } else { + if ($action == 'delete') { + $expense->is_deleted = true; + $expense->save(); + } + + $expense->delete(); + } + } + + return count($tasks); + } + } diff --git a/app/Services/ExpenseService.php b/app/Services/ExpenseService.php index 46cbc2bb6e29..07a02445d655 100644 --- a/app/Services/ExpenseService.php +++ b/app/Services/ExpenseService.php @@ -104,6 +104,12 @@ class ExpenseService extends BaseService return URL::to("expenses/{$model->public_id}") ; } ], + [ + trans('texts.edit'), + function ($model) { + return URL::to("expenses/{$model->public_id}/edit") ; + } + ], ]; }