Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 00:44:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Expense module

Browse Source
This commit is contained in:
steenrabol 2016-01-11 20:20:42 +01:00
parent 3e9e28f06f
commit f90c759078
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/DashboardController.php
View File

@ -13,6 +13,7 @@ class DashboardController extends BaseController
{ {
public function index() public function index()
{ {
// total_income, billed_clients, invoice_sent and active_clients // total_income, billed_clients, invoice_sent and active_clients
$select = DB::raw('COUNT(DISTINCT CASE WHEN invoices.id IS NOT NULL THEN clients.id ELSE null END) billed_clients, $select = DB::raw('COUNT(DISTINCT CASE WHEN invoices.id IS NOT NULL THEN clients.id ELSE null END) billed_clients,
SUM(CASE WHEN invoices.invoice_status_id >= '.INVOICE_STATUS_SENT.' THEN 1 ELSE 0 END) invoices_sent, SUM(CASE WHEN invoices.invoice_status_id >= '.INVOICE_STATUS_SENT.' THEN 1 ELSE 0 END) invoices_sent,
@ -76,13 +77,13 @@ class DashboardController extends BaseController
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->take(50) ->take(50)
->get(); ->get();
$expenseactivities = ExpenseActivity::where('expense_activities.account_id', '=', Auth::user()->account_id) $expenseactivities = ExpenseActivity::where('expense_activities.account_id', '=', Auth::user()->account_id)
->where('activity_type_id', '>', 0) ->where('activity_type_id', '>', 0)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->take(50) ->take(50)
->get(); ->get();
$pastDue = DB::table('invoices') $pastDue = DB::table('invoices')
->leftJoin('clients', 'clients.id', '=', 'invoices.client_id') ->leftJoin('clients', 'clients.id', '=', 'invoices.client_id')
->leftJoin('contacts', 'contacts.client_id', '=', 'clients.id') ->leftJoin('contacts', 'contacts.client_id', '=', 'clients.id')

2
resources/lang/en/texts.php
View File

@ -896,7 +896,7 @@ return array(
'activity_31' => ':user created :vendor', 'activity_31' => ':user created :vendor',
'activity_32' => ':user created :vendor', 'activity_32' => ':user created :vendor',
'activity_33' => ':user created :vendor', 'activity_33' => ':user created :vendor',
'activity_34' => ':user created :expense', 'activity_34' => ':user created expense :expense',
'activity_35' => ':user created :vendor', 'activity_35' => ':user created :vendor',
'activity_36' => ':user created :vendor', 'activity_36' => ':user created :vendor',
'activity_37' => ':user created :vendor', 'activity_37' => ':user created :vendor',