More Product Model optimisation

resources/views/theme/backend/adminlte/a/product/report.blade.php

@@ -29,13 +29,14 @@
 			</thead>
 
 			<tbody>
-			@foreach (\App\Models\Service::active()->get() as $o)
+			{{-- @todo This query is expensive still --}}
+			@foreach (\App\Models\Service::active()->with(['type','product.type.supplied.supplier_detail.supplier','product.translate'])->get() as $o)
 				<tr>
 					<td><a href="{{ url('u/service',[$o->id]) }}">{{ $o->id }}</a></td>
 					<td>{{ $o->name }}</td>
 					<td>{{ $o->product->name }}</td>
 					<td class="text-right">{{ number_format($o->billing_monthly_price,2) }}</td>
-					<td class="text-right">{{ number_format(\App\Models\Tax::tax_calc(($s=$o->supplied)->base_cost*\App\Models\Invoice::billing_change($s->billing_interval,1),$o->account->taxes),2) }}</td>
+					<td class="text-right">{{ number_format($o->product->cost_normalized(),2) }}</td>
 					<td class="text-right">{{ $o->category == 'broadband' ? number_format($o->type->usage_summary(0)->sum()/1000,1) : '-' }}</td>
 					<td>{{ $o->product->supplier->name }}</td>
 				</tr>