From 756f550b43f1d017573a0cf8a4d0756e03957b06 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 25 Jul 2024 14:44:09 +1000
Subject: [PATCH] Cosmetic code changes, no functional changes

---
 .../adminlte/account/widget/admin/list.blade.php |  1 -
 .../account/widget/invoice_due.blade.php         |  2 +-
 .../account/widget/invoice_past.blade.php        |  5 ++---
 .../account/widget/service_active.blade.php      |  5 ++---
 .../account/widget/summary_boxes.blade.php       | 11 ++++++-----
 .../backend/adminlte/charge/pending.blade.php    |  4 +++-
 .../backend/adminlte/invoice/view.blade.php      |  7 +++----
 .../invoice/widget/admin/credit.blade.php        |  1 -
 .../adminlte/invoice/widget/due.blade.php        |  3 +--
 .../adminlte/invoice/widget/next.blade.php       |  2 +-
 .../service/widget/admin/movement.blade.php      |  8 ++------
 .../service/widget/billinghistory.blade.php      |  1 -
 .../service/widget/information.blade.php         | 12 ++++++------
 .../adminlte/service/widget/internal.blade.php   | 16 ++++++++--------
 .../theme/frontend/metronic/order/home.blade.php |  8 ++++----
 .../layouts/partials/mainheader.blade.php        |  2 +-
 16 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/resources/views/theme/backend/adminlte/account/widget/admin/list.blade.php b/resources/views/theme/backend/adminlte/account/widget/admin/list.blade.php
index 76f1237..235253b 100644
--- a/resources/views/theme/backend/adminlte/account/widget/admin/list.blade.php
+++ b/resources/views/theme/backend/adminlte/account/widget/admin/list.blade.php
@@ -43,7 +43,6 @@
 @section('page-styles')
 	@css(datatables,bootstrap4)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4)
 
diff --git a/resources/views/theme/backend/adminlte/account/widget/invoice_due.blade.php b/resources/views/theme/backend/adminlte/account/widget/invoice_due.blade.php
index 14aa456..58d457c 100644
--- a/resources/views/theme/backend/adminlte/account/widget/invoice_due.blade.php
+++ b/resources/views/theme/backend/adminlte/account/widget/invoice_due.blade.php
@@ -1,4 +1,4 @@
-<!-- $o = Account::class -->
+<!-- $o=Account::class -->
 <!-- Show outstanding invoices -->
 <div class="card card-warning">
 	<div class="card-header">
diff --git a/resources/views/theme/backend/adminlte/account/widget/invoice_past.blade.php b/resources/views/theme/backend/adminlte/account/widget/invoice_past.blade.php
index 348d7bf..b3fade5 100644
--- a/resources/views/theme/backend/adminlte/account/widget/invoice_past.blade.php
+++ b/resources/views/theme/backend/adminlte/account/widget/invoice_past.blade.php
@@ -1,4 +1,4 @@
-<!-- $o = Account::class -->
+<!-- $o=Account::class -->
 <!-- Show past 12 months invoices -->
 <div class="card card-success">
 	<div class="card-header">
@@ -40,12 +40,11 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 
 	<script type="text/javascript">
-		@if ($list->count())
+		@if($list->count())
 			$(document).ready(function() {
 				$('#invoices_past_{{ $o->id }}').DataTable({
 					order: [[2,'desc'],[0,'asc']],
diff --git a/resources/views/theme/backend/adminlte/account/widget/service_active.blade.php b/resources/views/theme/backend/adminlte/account/widget/service_active.blade.php
index a1d1d19..2e65efd 100644
--- a/resources/views/theme/backend/adminlte/account/widget/service_active.blade.php
+++ b/resources/views/theme/backend/adminlte/account/widget/service_active.blade.php
@@ -1,4 +1,4 @@
-<!-- $o = Account::class -->
+<!-- $o=Account::class -->
 @php
 	$o->load(['services_active.invoiced_service_items_active_recent']);
 @endphp
@@ -10,7 +10,7 @@
 	</div>
 
 	<div class="card-body">
-		@if (($x=$o->services_active)->count())
+		@if(($x=$o->services_active)->count())
 			<table class="table table-striped table-hover w-100" id="services_active_{{ $ao->id }}">
 				<thead>
 				<tr>
@@ -50,7 +50,6 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 
diff --git a/resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php b/resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php
index 83b18e0..60ea198 100644
--- a/resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php
+++ b/resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php
@@ -1,7 +1,8 @@
-@php
-	use App\Models\{Account,Service};
-	$acts = $o->accounts_all->pluck('id');
-@endphp
+<!-- $o=User::class -->
+@php($acts=$o->accounts_all->pluck('id'))
+
+@use(App\Models\Account)
+@use(App\Models\Service)
 
 @if($user->isReseller() && ($o->accounts->count() <= 2) && ($x=$o->accounts->pluck('providers')->flatten())->count())
 	<div class="col-12 col-sm-4 col-md-2">
@@ -17,7 +18,7 @@
 	</div>
 @endif
 
-@if ($o->accounts_all->count() > 1)
+@if($o->accounts_all->count() > 1)
 	<div class="col-12 col-sm-4 col-md-2">
 		<div class="info-box">
 			<span class="info-box-icon bg-primary elevation-1"><i class="fas fa-user"></i></span>
diff --git a/resources/views/theme/backend/adminlte/charge/pending.blade.php b/resources/views/theme/backend/adminlte/charge/pending.blade.php
index 1306b71..bec70ba 100644
--- a/resources/views/theme/backend/adminlte/charge/pending.blade.php
+++ b/resources/views/theme/backend/adminlte/charge/pending.blade.php
@@ -57,8 +57,10 @@
 	</div>
 @endsection
 
-@section('page-scripts')
+@section('page-styles')
 	@css(datatables,bootstrap4)
+@append
+@section('page-scripts')
 	@js(datatables,bootstrap4)
 
 	<script type="text/javascript">
diff --git a/resources/views/theme/backend/adminlte/invoice/view.blade.php b/resources/views/theme/backend/adminlte/invoice/view.blade.php
index 82e5270..caffa71 100644
--- a/resources/views/theme/backend/adminlte/invoice/view.blade.php
+++ b/resources/views/theme/backend/adminlte/invoice/view.blade.php
@@ -1,8 +1,7 @@
-@php
-	use App\Models\{Checkout,Service};
-@endphp
+<!-- $o=Invoice::class -->
+@use(App\Models\Checkout)
+@use(App\Models\Service)
 
-<!-- $o = Invoice::class -->
 @extends('adminlte::layouts.app')
 
 @section('htmlheader_title')
diff --git a/resources/views/theme/backend/adminlte/invoice/widget/admin/credit.blade.php b/resources/views/theme/backend/adminlte/invoice/widget/admin/credit.blade.php
index 1fc1fb0..6425aad 100644
--- a/resources/views/theme/backend/adminlte/invoice/widget/admin/credit.blade.php
+++ b/resources/views/theme/backend/adminlte/invoice/widget/admin/credit.blade.php
@@ -32,7 +32,6 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 
diff --git a/resources/views/theme/backend/adminlte/invoice/widget/due.blade.php b/resources/views/theme/backend/adminlte/invoice/widget/due.blade.php
index c91d863..7c29429 100644
--- a/resources/views/theme/backend/adminlte/invoice/widget/due.blade.php
+++ b/resources/views/theme/backend/adminlte/invoice/widget/due.blade.php
@@ -1,4 +1,4 @@
-<!-- $list = Collection[Invoice::class] -->
+<!-- $list=Collection[Invoice::class] -->
 <!-- Show outstanding invoices -->
 <table class="table table-bordered w-100" id="invoices_due_{{$type}}">
 	<thead>
@@ -27,7 +27,6 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 
diff --git a/resources/views/theme/backend/adminlte/invoice/widget/next.blade.php b/resources/views/theme/backend/adminlte/invoice/widget/next.blade.php
index 3622afa..c33cd34 100644
--- a/resources/views/theme/backend/adminlte/invoice/widget/next.blade.php
+++ b/resources/views/theme/backend/adminlte/invoice/widget/next.blade.php
@@ -1,6 +1,6 @@
 <!-- @todo These needs to be optimised, and change for $o = Account::class -->
 <!-- Show next items for an invoice -->
-@if (($x=$o->next_invoice_items($future))->count())
+@if(($x=$o->next_invoice_items($future))->count())
 	<div class="card">
 		<div class="card-body">
 			<table class="table">
diff --git a/resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php b/resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php
index 7bdfebf..afde230 100644
--- a/resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php
@@ -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)
 
diff --git a/resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php b/resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php
index 71df992..4545cc5 100644
--- a/resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php
@@ -28,7 +28,6 @@
 @section('page-styles')
 	@css(datatables,bootstrap4)
 @append
-
 @section('page-scripts')
 	@js(datatables,bootstrap4)
 
diff --git a/resources/views/theme/backend/adminlte/service/widget/information.blade.php b/resources/views/theme/backend/adminlte/service/widget/information.blade.php
index 2bfe85c..4a1e72a 100644
--- a/resources/views/theme/backend/adminlte/service/widget/information.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/information.blade.php
@@ -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())
diff --git a/resources/views/theme/backend/adminlte/service/widget/internal.blade.php b/resources/views/theme/backend/adminlte/service/widget/internal.blade.php
index e2e3114..f3bae91 100644
--- a/resources/views/theme/backend/adminlte/service/widget/internal.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/internal.blade.php
@@ -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>
diff --git a/resources/views/theme/frontend/metronic/order/home.blade.php b/resources/views/theme/frontend/metronic/order/home.blade.php
index c027bbd..53393de 100644
--- a/resources/views/theme/frontend/metronic/order/home.blade.php
+++ b/resources/views/theme/frontend/metronic/order/home.blade.php
@@ -9,7 +9,7 @@
 		<div class="container">
 			<div class="col-12">
 				<h1>Order Service</h1>
-				@if ($errors->count())<h4><span class="note-danger">There were errors with your order, please try again.</span></h4>@endif
+				@if($errors->count())<h4><span class="note-danger">There were errors with your order, please try again.</span></h4>@endif
 				<div class="order-page" id="order-page">
 					<div class="row">
 						<div class="col-3">
@@ -29,7 +29,7 @@
 
 											<div id="accordion">
 												<!-- Reseller Choose Client -->
-												@if ($user && $user->exists && $user->isReseller())
+												@if($user && $user->exists && $user->isReseller())
 													<div class="panel panel-default">
 														<div class="panel-heading">
 															<h4 class="panel-title">Account</h4>
@@ -201,7 +201,7 @@
 																</div>
 
 																<div class="col-sm-6" id="product_info">
-																	@if (old('product_id'))
+																	@if(old('product_id'))
 																		@include('theme.frontend.metronic.order.widget.info',['o'=>$po])
 																	@endif
 																</div>
@@ -209,7 +209,7 @@
 
 															<div class="row">
 																<div class="col-sm-12" id="product_order">
-																	@if (old('product_id'))
+																	@if(old('product_id'))
 																		@include('theme.frontend.metronic.order.widget.order',['o'=>$po])
 																	@endif
 																</div>
diff --git a/resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php b/resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php
index b29358b..898ce5a 100644
--- a/resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php
+++ b/resources/views/vendor/adminlte/layouts/partials/mainheader.blade.php
@@ -45,7 +45,7 @@
 					</a>
 
 					<div class="dropdown-divider"></div>
-					@if ($user->switched)
+					@if($user->switched)
 						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
 							<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
 						</a>