Merge branch 'expense-refactor' of https://gitlab.com/mohit.panjvani/crater-web into expense-refactor

This commit is contained in:
jayvirsinh_gohil
2020-03-18 17:41:15 +05:30
7 changed files with 32 additions and 5 deletions

View File

@ -39,8 +39,13 @@ class ExpensesController extends Controller
->select('expenses.*', 'expense_categories.name', 'users.name as user_name')
->paginate($limit);
$customers = User::customer()
->whereCompany($request->header('company'))
->get();
return response()->json([
'expenses' => $expenses,
'customers' => $customers,
'currency' => Currency::findOrFail(
CompanySetting::getSetting('currency', $request->header('company'))
)