TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor and merge backend

Browse Source
This commit is contained in:
Jay Makwana
2020-03-18 18:21:53 +05:30
parent 4d1b267688
commit 82d85af672
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/ExpensesController.php
View File

@ -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();

3
resources/assets/js/views/expenses/Create.vue
View File

@ -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 () {

5
resources/assets/js/views/expenses/Index.vue
View File

@ -173,6 +173,11 @@
sort-as="name"
show="category.name"
/>
<table-column
:label="$t('expenses.customer')"
sort-as="user_name"
show="user_name"
/>
<table-column
:label="$t('expenses.date')"
sort-as="expense_date"