deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic code changes, no functional changes

Browse Source
This commit is contained in:
Deon George
2024-07-25 14:44:09 +10:00
parent 9277d42196
commit 756f550b43
16 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php
View File

@@ -1,7 +1,4 @@
@php
use App\Models\Service;
@endphp
@use(App\Models\Service)
<!-- Show client movements -->
<div class="card card-dark">
<div class="card-header">
@@ -9,7 +6,7 @@ use App\Models\Service;
</div>
<div class="card-body">
@if (($x=Service::movements($user))->count())
@if(($x=Service::movements($user))->count())
<table class="table table-striped table-hover" id="service_movements">
<thead>
<tr>
@@ -62,7 +59,6 @@ use App\Models\Service;
@section('page-styles')
@css(datatables,bootstrap4|rowgroup)
@append
@section('page-scripts')
@js(datatables,bootstrap4|rowgroup)

1
resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php
View File

@@ -28,7 +28,6 @@
@section('page-styles')
@css(datatables,bootstrap4)
@append
@section('page-scripts')
@js(datatables,bootstrap4)

12
resources/views/theme/backend/adminlte/service/widget/information.blade.php
View File

@@ -22,19 +22,19 @@
<th>Status</th>
<td><x-button.status :status="$o->status" :substatus="$o->order_status"/></td>
</tr>
@if ($o->order_status == 'ORDER-SENT')
@if($o->order_status == 'ORDER-SENT')
<tr>
<th>Order Reference</th>
<td>{{ $o->order_info_reference ?? '' }}</td>
</tr>
@endif
@if ($o->start_at AND $o->isPending())
@if($o->start_at AND $o->isPending())
<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->isPending()) && (! $o->external_billing))
<tr>
<th>Billed</th>
<td>{{ $o->billing_interval_string }}</td>
@@ -42,7 +42,7 @@
<tr>
<th>Amount</th>
@if($o->isChargeOverridden())
<td>@if ($o->billing_charge < $o->charge_orig)<del>${{ number_format($o->charge_orig,2) }}</del> @endif${{ number_format($o->billing_charge,2) }}</td>
<td>@if($o->billing_charge < $o->charge_orig)<del>${{ number_format($o->charge_orig,2) }}</del> @endif${{ number_format($o->billing_charge,2) }}</td>
@else
<td>${{ number_format($o->billing_charge,2) }}</td>
@endif
@@ -61,7 +61,7 @@
@endif
<tr>
<th>Next Invoice</th>
<td>@if ($o->suspend_billing)<del>@endif{{ $o->invoice_next->format('Y-m-d') }}@if ($o->suspend_billing)</del> <strong>SUSPENDED</strong>@endif</td>
<td>@if($o->suspend_billing)<del>@endif{{ $o->invoice_next->format('Y-m-d') }}@if($o->suspend_billing)</del> <strong>SUSPENDED</strong>@endif</td>
</tr>
<tr>
<th>Next Estimated Invoice</th>
@@ -69,7 +69,7 @@
</tr>
<tr>
<th>Payment Method</th>
<td>@if ($o->billing)Direct Debit @else Invoice @endif</td>
<td>@if($o->billing)Direct Debit @else Invoice @endif</td>
</tr>
@elseif($o->wasCancelled())

16
resources/views/theme/backend/adminlte/service/widget/internal.blade.php
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>