diff --git a/app/Http/Controllers/ExpensesController.php b/app/Http/Controllers/ExpensesController.php
index 1ce86664..9b0d97d5 100644
--- a/app/Http/Controllers/ExpensesController.php
+++ b/app/Http/Controllers/ExpensesController.php
@@ -24,7 +24,7 @@ class ExpensesController extends Controller
$limit = $request->has('limit') ? $request->limit : 10;
$expenses = Expense::with('category')
- ->join('users', 'users.id', '=', 'expenses.user_id')
+ ->leftJoin('users', 'users.id', '=', 'expenses.user_id')
->join('expense_categories', 'expense_categories.id', '=', 'expenses.expense_category_id')
->applyFilters($request->only([
'expense_category_id',
@@ -83,11 +83,7 @@ class ExpensesController extends Controller
$expense = new Expense();
$expense->notes = $request->notes;
$expense->expense_category_id = $request->expense_category_id;
-
- if ($request->has('user_id') && $request->user_id != null) {
- $expense->user_id = $request->user_id;
- }
-
+ $expense->user_id = $request->user_id;
$expense->amount = $request->amount;
$expense->company_id = $request->header('company');
$expense->expense_date = $expense_date;
@@ -150,11 +146,7 @@ class ExpensesController extends Controller
$expense->notes = $request->notes;
$expense->expense_category_id = $request->expense_category_id;
$expense->amount = $request->amount;
-
- if ($request->has('user_id') && $request->user_id != null) {
- $expense->user_id = $request->user_id;
- }
-
+ $expense->user_id = $request->user_id;
$expense->expense_date = $expense_date;
$expense->save();
diff --git a/resources/assets/js/views/expenses/Create.vue b/resources/assets/js/views/expenses/Create.vue
index 47c34d41..9a26df11 100644
--- a/resources/assets/js/views/expenses/Create.vue
+++ b/resources/assets/js/views/expenses/Create.vue
@@ -322,6 +322,9 @@ export default {
this.formData.expense_date = moment(this.formData.expense_date).toString()
this.formData.amount = (response.data.expense.amount)
this.fileSendUrl = `/api/expenses/${this.$route.params.id}`
+ if (response.data.expense.user_id) {
+ this.customer = this.customerList.find(customer => customer.id === response.data.expense.user_id)
+ }
}
},
async sendData () {
diff --git a/resources/assets/js/views/expenses/Index.vue b/resources/assets/js/views/expenses/Index.vue
index 98f98e4d..c39f0659 100644
--- a/resources/assets/js/views/expenses/Index.vue
+++ b/resources/assets/js/views/expenses/Index.vue
@@ -173,6 +173,11 @@
sort-as="name"
show="category.name"
/>
+