shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more eager loading

Browse Source
This commit is contained in:
Denis Duliçi 2020-06-06 22:57:29 +03:00
parent 657c86a29c
commit a16406ea1e
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/Users.php
View File

@ -23,7 +23,7 @@ class Users extends Controller
*/ */
public function index() public function index()
{ {
$users = User::with('roles')->collect(); $users = User::with(['media', 'roles'])->collect();
return view('auth.users.index', compact('users')); return view('auth.users.index', compact('users'));
} }

2
app/Http/Controllers/Common/Items.php
View File

@ -28,7 +28,7 @@ class Items extends Controller
*/ */
public function index() public function index()
{ {
$items = Item::with('category')->collect(); $items = Item::with(['category', 'media'])->collect();
return view('common.items.index', compact('items')); return view('common.items.index', compact('items'));
} }

2
app/Http/Controllers/Purchases/Bills.php
View File

@ -37,7 +37,7 @@ class Bills extends Controller
*/ */
public function index() public function index()
{ {
$bills = Bill::with('contact')->collect(['billed_at'=> 'desc']); $bills = Bill::with(['contact', 'transactions'])->collect(['billed_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');

2
app/Http/Controllers/Purchases/Payments.php
View File

@ -30,7 +30,7 @@ class Payments extends Controller
*/ */
public function index() public function index()
{ {
$payments = Transaction::with(['account', 'category', 'contact'])->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']); $payments = Transaction::with(['account', 'bill', 'category', 'contact'])->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');

2
app/Http/Controllers/Sales/Invoices.php
View File

@ -38,7 +38,7 @@ class Invoices extends Controller
*/ */
public function index() public function index()
{ {
$invoices = Invoice::with('contact')->collect(['invoice_number'=> 'desc']); $invoices = Invoice::with(['contact', 'transactions'])->collect(['invoice_number'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');

2
app/Http/Controllers/Sales/Revenues.php
View File

@ -30,7 +30,7 @@ class Revenues extends Controller
*/ */
public function index() public function index()
{ {
$revenues = Transaction::with(['account', 'category', 'contact'])->income()->isNotTransfer()->collect(['paid_at'=> 'desc']); $revenues = Transaction::with(['account', 'category', 'contact', 'invoice'])->income()->isNotTransfer()->collect(['paid_at'=> 'desc']);
$customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');

2
app/Widgets/AccountBalance.php
View File

@ -11,7 +11,7 @@ class AccountBalance extends Widget
public function show() public function show()
{ {
$accounts = Account::enabled()->take(5)->get(); $accounts = Account::with(['income_transactions', 'expense_transactions'])->enabled()->take(5)->get();
return $this->view('widgets.account_balance', [ return $this->view('widgets.account_balance', [
'accounts' => $accounts, 'accounts' => $accounts,

2
app/Widgets/TotalExpenses.php
View File

@ -22,7 +22,7 @@ class TotalExpenses extends Widget
$current += $transaction->getAmountConvertedToDefault(); $current += $transaction->getAmountConvertedToDefault();
}); });
$this->applyFilters(Bill::accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($bill) use (&$open, &$overdue) { $this->applyFilters(Bill::with('transactions')->accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($bill) use (&$open, &$overdue) {
list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($bill); list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($bill);
$open += $open_tmp; $open += $open_tmp;

2
app/Widgets/TotalIncome.php
View File

@ -22,7 +22,7 @@ class TotalIncome extends Widget
$current += $transaction->getAmountConvertedToDefault(); $current += $transaction->getAmountConvertedToDefault();
}); });
$this->applyFilters(Invoice::accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($invoice) use (&$open, &$overdue) { $this->applyFilters(Invoice::with('transactions')->accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($invoice) use (&$open, &$overdue) {
list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($invoice); list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($invoice);
$open += $open_tmp; $open += $open_tmp;

4
app/Widgets/TotalProfit.php
View File

@ -30,14 +30,14 @@ class TotalProfit extends Widget
} }
}); });
$this->applyFilters(Invoice::accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($invoice) use (&$open_invoice, &$overdue_invoice) { $this->applyFilters(Invoice::with('transactions')->accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($invoice) use (&$open_invoice, &$overdue_invoice) {
list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($invoice); list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($invoice);
$open_invoice += $open_tmp; $open_invoice += $open_tmp;
$overdue_invoice += $overdue_tmp; $overdue_invoice += $overdue_tmp;
}); });
$this->applyFilters(Bill::accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($bill) use (&$open_bill, &$overdue_bill) { $this->applyFilters(Bill::with('transactions')->accrued()->notPaid(), ['date_field' => 'created_at'])->each(function ($bill) use (&$open_bill, &$overdue_bill) {
list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($bill); list($open_tmp, $overdue_tmp) = $this->calculateDocumentTotals($bill);
$open_bill += $open_tmp; $open_bill += $open_tmp;