Move billing more service::class methods into __get(), use of component ribbons for service status
This commit is contained in:
@@ -1,13 +1,8 @@
|
||||
<!-- $o=Service\Broadband::class -->
|
||||
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">Broadband Details</h3>
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
<!-- $o=Service\Domain::class -->
|
||||
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">Domain Details</h3>
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
<!-- $o=Service\Email::class -->
|
||||
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">Email Hosting Details</h3>
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
<!-- $o=Service\Host::class -->
|
||||
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">Hosting Details</h3>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
|
||||
<tr>
|
||||
<th>Contract Left</th>
|
||||
@if($o->isContract())
|
||||
@if($o->is_contracted)
|
||||
<td>${{ number_format($o->billing_charge_to($o->contract_end),2) }} (<small>{{ $o->paid_to?->format('Y-m-d') }}</small>)</td>
|
||||
<td>${{ number_format($o->billing_cost_to($o->contract_end),2) }} (<small>{{ $o->invoiced_to?->format('Y-m-d') }}</small>)</td>
|
||||
<td>{{ $o->contract_end->format('Y-m-d') }}<br><small>({{ $o->contract_end->diffForHumans(now(),CarbonInterface::DIFF_RELATIVE_TO_OTHER,FALSE,2) }} today)</small></td>
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
<!-- $o=Service\Phone::class -->
|
||||
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">Phone Details</h3>
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
<div class="card">
|
||||
@if($o->service->isPending())
|
||||
<div class="ribbon-wrapper ribbon-lg">
|
||||
<div class="ribbon bg-warning">
|
||||
Pending
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<x-ribbons.change :change="$o->service->is_pending_change"/>
|
||||
<x-ribbons.pending :pending="$o->service->is_pending_active"/>
|
||||
|
||||
<div class="card-header bg-gray-dark">
|
||||
<h3 class="card-title">SSL Details</h3>
|
||||
|
||||
Reference in New Issue
Block a user