Cosmetic code changes, no functional changes

This commit is contained in:
2024-07-25 14:44:09 +10:00
parent 9277d42196
commit 756f550b43
16 changed files with 40 additions and 48 deletions

View File

@@ -1,4 +1,4 @@
<!-- $o = Service::class, $p = Product::class -->
<!-- $o=Service::class, $p=Product::class -->
@php($c=$o->product)
<table class="table table-sm">
<thead>
@@ -28,7 +28,7 @@
<tr>
<th>Product</th>
<td class="text-center" colspan="2"><a href="{{ url('a/product/details',$c->id) }}">#{{ $c->supplied->id }}: {{ $c->supplied->name_long }}</a></td>
@if ($p->exists)
@if($p->exists)
<th>&nbsp;</th>
<td class="text-center" colspan="2">#{{ $p->supplied->id }}: {{ $p->supplied->name_long }}</td>
@endif
@@ -40,7 +40,7 @@
<td>${{ number_format($b=$o->account->taxed($c->setup_charge),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($c->setup_cost),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@if ($p->exists)
@if($p->exists)
<td>${{ number_format($b=$o->account->taxed($p->setup_charge),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($p->setup_cost),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@@ -52,7 +52,7 @@
<td>{{ $o->billing_interval_string }}</td>
<td>{{ $c->type->billing_interval_string }}</td>
<td>&nbsp;</td>
@if ($p->exists)
@if($p->exists)
<td>{{ $o->billing_interval_string }}</td>
<td>{{ $p->type->billing_interval_string }}</td>
<td>&nbsp;</td>
@@ -64,7 +64,7 @@
<td @if($o->isChargeOverridden())class="text-danger"@endif>${{ number_format($b=$o->billing_charge,2) }}</td>
<td>${{ number_format($a=$o->account->taxed($c->base_cost),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@if ($p->exists)
@if($p->exists)
<td @if($o->isChargeOverridden())class="text-danger"@endif>${{ number_format($b=$o->account->taxed($p->base_charge),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($p->base_cost),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@@ -82,7 +82,7 @@
</td>
<td>${{ number_format($a=$o->account->taxed($c->base_cost)*\App\Models\Invoice::billing_change($o->billing_interval,\App\Models\Invoice::BILL_MONTHLY),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@if ($p->exists)
@if($p->exists)
<td @if($x=$o->isChargeOverridden()) class="text-danger" @endif>${{ number_format($b=$o->account->taxed($p->base_charge)*\App\Models\Invoice::billing_change($o->billing_interval,\App\Models\Invoice::BILL_MONTHLY),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($p->base_cost)*\App\Models\Invoice::billing_change($o->billing_interval,\App\Models\Invoice::BILL_MONTHLY),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@@ -94,7 +94,7 @@
<td>{{ $o->contract_term }} months</td>
<td>{{ $c->supplied->contract_term }} months</td>
<td>&nbsp;</td>
@if ($p->exists)
@if($p->exists)
<td>{{ $p->contract_term }} months</td>
<td>{{ $p->supplied->contract_term }} months</td>
<td>&nbsp;</td>
@@ -107,7 +107,7 @@
<td>${{ number_format($b=$o->account->taxed($o->product->min_charge),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($c->supplied->min_cost),2) }}</td>
<td>{!! markup($a,$b) !!}</td>
@if ($p->exists)
@if($p->exists)
<td>${{ number_format($a=$o->account->taxed($p->min_charge),2) }}</td>
<td>${{ number_format($a=$o->account->taxed($p->supplied->min_cost ?? 0),2) }}</td>
<td>{!! markup($a,$b) !!}</td>