Optimising product category and category names

This commit is contained in:
Deon George
2022-06-12 11:21:20 +10:00
parent 360c1e46a1
commit cc94426902
36 changed files with 269 additions and 156 deletions

View File

@@ -44,7 +44,7 @@
</div>
{{--
@includeIf('u.service.widgets.'.$o->type->type.'.order',['o'=>$o->type])
@includeIf('u.service.widgets.'.$o->product->category.'.order',['o'=>$o->type])
--}}
<div class="form-group row">

View File

@@ -43,7 +43,7 @@
</div>
</div>
@includeIf('u.service.widgets.'.$o->type->type.'.change',['o'=>$o->type])
@includeIf('u.service.widgets.'.$o->product->category.'.change',['o'=>$o->type])
<div class="form-group row">
<label for="notes" class="col-2 col-form-label text-right">Notes</label>

View File

@@ -19,7 +19,7 @@
<!-- Service Details -->
<div class="col-5">
@includeIf('u.service.widgets.'.$o->type->type.'.details',['o'=>$o->type])
@includeIf('u.service.widgets.'.$o->product->category.'.details',['o'=>$o->type])
@include('u.service.widgets.information')
</div>
@@ -78,7 +78,7 @@
@if ($o->hasUsage())
<div class="tab-pane fade {{ (! $o->isBilled() && (! session()->has('service_update'))) ? 'active show' : '' }}" id="traffic" role="tabpanel">
@if ($o->type->usage(30)->count())
@include('u.service.widgets.'.$o->type->type.'.usagegraph',['o'=>$o->type])
@include('u.service.widgets.'.$o->product->category.'.usagegraph',['o'=>$o->type])
@endif
</div>
@endif

View File

@@ -11,7 +11,7 @@
<thead>
<tr>
<th>ID</th>
<th>Type</th>
<th>Category</th>
<th>Service</th>
<th>Product</th>
<th>Next Invoice</th>
@@ -22,7 +22,7 @@
@foreach ($o->services as $oo)
<tr>
<td><a href="{{ url('u/service',[$oo->id]) }}">{{ $oo->sid }}</a></td>
<td>{{ $oo->category }}</td>
<td>{{ $oo->product->category_name }}</td>
<td>{{ $oo->name_short }}</td>
<td>{{ $oo->product->name }}</td>
<td>{{ $oo->external_billing ? '-' : $oo->invoice_next->format('Y-m-d') }}</td>