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-08 22:42:38 +03:00
parent f47ae3b636
commit 1441a56908
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Purchases/Vendors.php
View File

@ -28,7 +28,7 @@ class Vendors extends Controller
*/ */
public function index() public function index()
{ {
$vendors = Contact::vendor()->collect(); $vendors = Contact::with('bills.transactions')->vendor()->collect();
return view('purchases.vendors.index', compact('vendors')); return view('purchases.vendors.index', compact('vendors'));
} }
@ -51,7 +51,7 @@ class Vendors extends Controller
$counts = []; $counts = [];
// Handle bills // Handle bills
$bills = Bill::where('contact_id', $vendor->id)->get(); $bills = Bill::with('transactions')->where('contact_id', $vendor->id)->get();
$counts['bills'] = $bills->count(); $counts['bills'] = $bills->count();
@ -78,7 +78,7 @@ class Vendors extends Controller
} }
// Handle payments // Handle payments
$transactions = Transaction::where('contact_id', $vendor->id)->expense()->get(); $transactions = Transaction::with('category')->where('contact_id', $vendor->id)->expense()->get();
$counts['transactions'] = $transactions->count(); $counts['transactions'] = $transactions->count();

6
app/Http/Controllers/Sales/Customers.php
View File

@ -26,7 +26,7 @@ class Customers extends Controller
*/ */
public function index() public function index()
{ {
$customers = Contact::customer()->collect(); $customers = Contact::with('invoices.transactions')->customer()->collect();
return view('sales.customers.index', compact('customers')); return view('sales.customers.index', compact('customers'));
} }
@ -49,7 +49,7 @@ class Customers extends Controller
$counts = []; $counts = [];
// Handle invoices // Handle invoices
$invoices = Invoice::where('contact_id', $customer->id)->get(); $invoices = Invoice::with('transactions')->where('contact_id', $customer->id)->get();
$counts['invoices'] = $invoices->count(); $counts['invoices'] = $invoices->count();
@ -76,7 +76,7 @@ class Customers extends Controller
} }
// Handle transactions // Handle transactions
$transactions = Transaction::where('contact_id', $customer->id)->income()->get(); $transactions = Transaction::with('category')->where('contact_id', $customer->id)->income()->get();
$counts['transactions'] = $transactions->count(); $counts['transactions'] = $transactions->count();

2
app/Models/Common/Contact.php
View File

@ -135,7 +135,7 @@ class Contact extends Model
$collection = in_array($this->type, $this->getCustomerTypes()) ? 'invoices' : 'bills'; $collection = in_array($this->type, $this->getCustomerTypes()) ? 'invoices' : 'bills';
$this->$collection()->accrued()->notPaid()->each(function ($item) use (&$amount) { $this->$collection->whereNotIn('status', ['draft', 'cancelled', 'paid'])->each(function ($item) use (&$amount) {
$unpaid = $item->amount - $item->paid; $unpaid = $item->amount - $item->paid;
$amount += $this->convertToDefault($unpaid, $item->currency_code, $item->currency_rate); $amount += $this->convertToDefault($unpaid, $item->currency_code, $item->currency_rate);