Move billing more service::class methods into __get(), use of component ribbons for service status

This commit is contained in:
2025-05-21 18:05:27 +10:00
parent 14c0109efa
commit 15a71c9f5b
14 changed files with 63 additions and 134 deletions

View File

@@ -22,7 +22,7 @@
<th>Status</th>
<td><x-button.status :status="$o->status" :substatus="$o->order_status"/></td>
</tr>
@if($o->isPendingCancel())
@if($o->is_pending_cancel)
<tr>
<th>Cancel Date</th>
<td>{{ $o->stop_at->format('Y-m-d') }}</td>
@@ -34,13 +34,13 @@
<td>{{ $o->order_info_reference ?? '' }}</td>
</tr>
@endif
@if($o->start_at && $o->isPending())
@if($o->start_at && $o->is_pending_active)
<tr>
<th>Pending Connection</th>
<td>{{ $o->start_at->format('Y-m-d') }}</td>
</tr>
@endif
@if(($o->active || $o->isPending()) && (! $o->external_billing))
@if(($o->active || $o->is_pending_active) && (! $o->external_billing))
<tr>
<th>Billed</th>
<td>{{ $o->billing_interval_name }}</td>
@@ -53,7 +53,7 @@
<td>${{ number_format($o->billing_charge_taxed,2) }}</td>
@endif
</tr>
@if($o->isActive() && $o->invoiced_to)
@if($o->is_active && $o->invoiced_to)
<tr>
<th>Invoiced To</th>
<td>{{ $o->invoiced_to->format('Y-m-d') }}</td>
@@ -83,7 +83,7 @@
<td>@if($o->billing)Direct Debit @else Invoice @endif</td>
</tr>
@elseif($o->wasCancelled())
@elseif($o->is_cancelled)
<tr>
<th>Cancelled</th>
<td>{{ ($o->stop_at ?: $o->paid_to)?->format('Y-m-d') }}</td>
@@ -92,7 +92,7 @@
</table>
</div>
@if($o->active || $o->isPending())
@if($o->active || $o->is_pending_active)
<div class="card-footer sm">
<strong><sup>*</sup>NOTE:</strong> Estimated Invoice does not include any setup, connection nor all current billing cycle usage charges.
</div>