From 90190bb3018f3e9316d0807c3569c90c36a195d5 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 2 Jul 2021 15:10:22 +1000
Subject: [PATCH] Performance workarounds as a result of 1bba21 - need to work
 on with()

---
 app/Http/Controllers/HomeController.php                    | 4 +++-
 .../adminlte/common/account/widget/summary.blade.php       | 7 ++++---
 .../theme/backend/adminlte/u/invoice/widgets/due.blade.php | 4 ++--
 .../backend/adminlte/u/invoice/widgets/list.blade.php      | 4 ++--
 .../backend/adminlte/u/payment/widgets/list.blade.php      | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 9f9d300..8ff4d5f 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -35,8 +35,10 @@ class HomeController extends Controller
 	public function home(User $o): View
 	{
 		// If we are passed a user to view, we'll open up their home page.
-		if ($o->exists)
+		if ($o->exists) {
+			$o->load(['accounts','services']);
 			return View('u.home',['o'=>$o]);
+		}
 
 		// If User was null, then test and see what type of logged on user we have
 		$o = Auth::user();
diff --git a/resources/views/theme/backend/adminlte/common/account/widget/summary.blade.php b/resources/views/theme/backend/adminlte/common/account/widget/summary.blade.php
index 980619d..b0b8304 100644
--- a/resources/views/theme/backend/adminlte/common/account/widget/summary.blade.php
+++ b/resources/views/theme/backend/adminlte/common/account/widget/summary.blade.php
@@ -17,6 +17,7 @@
 
 		<div class="info-box-content">
 			<span class="info-box-text">Active Services</span>
+			<!-- @todo This should count of inactive services too -->
 			<span class="info-box-number">{{ $o->services->count() }} <small>/{{ $o->services->count() }}</small></span>
 		</div>
 	</div>
@@ -28,7 +29,7 @@
 
 		<div class="info-box-content">
 			<span class="info-box-text">Account Balance</span>
-			<span class="info-box-number"><small>$</small> {{ number_format($o->invoices_due->sum('due'),2) }}</span>
+			<span class="info-box-number"><small>$</small> {{ number_format(($x=$o->invoices()->with(['items.taxes','paymentitems.payment','account'])->get()->where('due','>',0))->sum('due'),2) }}</span>
 		</div>
 	</div>
 </div>
@@ -39,7 +40,7 @@
 
 		<div class="info-box-content">
 			<span class="info-box-text">Invoices Due</span>
-			<span class="info-box-number">{{ $o->invoices_due->count() }}</span>
+			<span class="info-box-number">{{ $x->count() }}</span>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/theme/backend/adminlte/u/invoice/widgets/due.blade.php b/resources/views/theme/backend/adminlte/u/invoice/widgets/due.blade.php
index da51d69..b09c725 100644
--- a/resources/views/theme/backend/adminlte/u/invoice/widgets/due.blade.php
+++ b/resources/views/theme/backend/adminlte/u/invoice/widgets/due.blade.php
@@ -5,7 +5,7 @@
 	</div>
 
 	<div class="card-body">
-		@if($o->invoices->where('due','>',0)->count())
+		@if(($x=$o->invoices()->with(['items.taxes','paymentitems.payment','account'])->get()->where('due','>',0))->count())
 			<table class="table table-bordered w-100" id="invoices_due">
 				<thead>
 				<tr>
@@ -20,7 +20,7 @@
 				</thead>
 
 				<tbody>
-				@foreach ($o->invoices->where('due','>',0) as $oo)
+				@foreach ($x as $oo)
 					<tr @if ($oo->due_date->isPast()) class="table-danger" @endif>
 						<td>{{ $oo->account->name }}</td>
 						<td><a href="{{ url('u/invoice',$oo->id) }}">{{ $oo->sid }}</a></td>
diff --git a/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php b/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
index c0f6ba9..d87dec5 100644
--- a/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
+++ b/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
@@ -5,7 +5,7 @@
 	</div>
 
 	<div class="card-body">
-		@if($o->invoices->where('date_orig','>',($x=\Carbon\Carbon::now()->subMonths(12)))->where('due','=',0)->count())
+		@if(($x=$o->invoices()->where('ab_invoice.date_orig','>',\Carbon\Carbon::now()->subMonths(12)->unix())->with(['items.taxes','paymentitems.payment','account.country.currency'])->get()->where('due','<=',0))->count())
 			<table class="table table-bordered w-100" id="invoices_past">
 				<thead>
 				<tr>
@@ -19,7 +19,7 @@
 				</thead>
 
 				<tbody>
-				@foreach ($o->invoices->where('date_orig','>',$x)->where('due','=',0) as $oo)
+				@foreach ($x as $oo)
 					<tr>
 						<td>{{ $oo->account->name }}</td>
 						<td><a href="{{ url('u/invoice',$oo->id) }}">{{ $oo->sid }}</a></td>
diff --git a/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php b/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
index 4fdbb3a..2fe0567 100644
--- a/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
+++ b/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
@@ -5,7 +5,7 @@
 	</div>
 
 	<div class="card-body">
-		@if($o->payments->where('date_orig','>',($x=\Carbon\Carbon::now()->subMonths(12)))->count())
+		@if(($x=$o->payments()->where('ab_payment.date_orig','>',\Carbon\Carbon::now()->subMonths(12)->unix())->with(['items','account'])->get())->count())
 			<table class="table table-bordered w-100" id="payments_past">
 				<thead>
 				<tr>
@@ -19,7 +19,7 @@
 				</thead>
 
 				<tbody>
-				@foreach ($o->payments->where('date_orig','>',($x=\Carbon\Carbon::now()->subMonths(12))) as $oo)
+				@foreach ($x as $oo)
 					<tr>
 						<td>{{ $oo->account->name }}</td>
 						<td>{{ $oo->sid }}</td>