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

Removed many redundant functions from User::class

Browse Source
This commit is contained in:
Deon George
2022-04-21 16:25:29 +10:00
parent 796c72dd09
commit d53643ef55
25 changed files with 87 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/email/admin/order/approve.blade.php
View File

@@ -5,8 +5,8 @@ Please order the following...
| Service | Details |
| :---------- | :---------------- |
| Logged User | {{ Auth::user()->id }} |
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Account | {{ $service->account_name }} |
| Service ID | {{ $service->sid }} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('BROADBAND')

4
resources/views/email/admin/order/reject.blade.php
View File

@@ -6,8 +6,8 @@
@component('mail::table')
| Service | Details |
| :---------- | :---------------- |
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Account | {{ $service->account_name }} |
| Service ID | {{ $service->sid }} |
| Product | {{ $service->product_name }} |
@switch($service->category)
@case('BROADBAND')

4
resources/views/email/admin/service/cancel.blade.php
View File

@@ -5,8 +5,8 @@ Please cancel the following...
| Service | Details |
| :---------- | :---------------- |
| Logged User | {{ Auth::user()->id }} |
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Account | {{ $service->account_name }} |
| Service ID | {{ $service->sid }} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('BROADBAND')

4
resources/views/email/admin/service/change.blade.php
View File

@@ -5,8 +5,8 @@ Please change the following...
| Service | Details |
| :---------- | :---------------- |
| Logged User | {{ Auth::user()->id }}
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Account | {{ $service->account_name }} |
| Service ID | {{ $service->sid }} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('BROADBAND')

2
resources/views/email/system/broadband_traffic_mismatch.blade.php
View File

@@ -1,5 +1,5 @@
@component('mail::message',['site'=>$site,'heading'=>'Traffic Mismatch: '.$date])
Hi {{ isset($user) ? $user->name.',' : '' }}
Hi {{ isset($user) ? $user->full_name.',' : '' }}
The traffic import today, had mismatching records. A request to have those login removed has been generated.

2
resources/views/email/system/social_link.blade.php
View File

@@ -1,5 +1,5 @@
@component('mail::message',['site'=>$site,'heading'=>'Link Your Account'])
Hi {{ isset($user) ? $user->name.',' : '' }}
Hi {{ isset($user) ? $user->full_name.',' : '' }}
A request was made to link your account to a social login.
If you didnt make this request, you can ignore this, and the request will be ignored.

2
resources/views/email/system/test_email.blade.php
View File

@@ -1,5 +1,5 @@
@component('mail::message',['site'=>$site,'heading'=>'System Test Email'])
Hi {{ isset($user) ? $user->name.',' : '' }}
Hi {{ isset($user) ? $user->full_name.',' : '' }}
This is just a test email to validate that you can receive emails from us.

2
resources/views/email/user/invoice.blade.php
View File

@@ -1,5 +1,5 @@
@component('mail::message',['site'=>$site,'heading'=>'Invoice: '.$invoice->id])
Hi {{ isset($user) ? $user->name.',' : '' }}
Hi {{ isset($user) ? $user->full_name.',' : '' }}
A new invoice has been generated on your account. A summary of that invoice is below.

2
resources/views/email/user/passwordreset.blade.php
View File

@@ -1,5 +1,5 @@
@component('mail::message',['site'=>$site,'heading'=>'Password Reset'])
Hi {{ isset($user) ? $user->name.',' : '' }}
Hi {{ isset($user) ? $user->full_name.',' : '' }}
You are receiving this email because we received a password reset request for your account.

67
resources/views/theme/backend/adminlte/r/agents.blade.php
View File

@@ -1,67 +0,0 @@
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title">Agents</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
</div>
</div>
<div class="box-body">
@if ($user->all_agents()->count())
<table class="table table-bordered table-striped table-hover" id="agents" style="width: 100%;">
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Level</th>
</tr>
</thead>
<tfoot>
<tr>
<th>Count {{ $user->all_agents()->count() }}</th>
<th colspan="2">&nbsp;</th>
</tr>
</tfoot>
</table>
@else
<p>No Agents Active</p>
@endif
</div>
</div>
@section('page-scripts')
@css(datatables,bootstrap4|rowgroup)
@js(datatables,bootstrap4|rowgroup)
<style>
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#agents').DataTable( {
responsive: true,
ajax: {
url: "/api/r/agents"
},
columns: [
{ data: "user_id_url" },
{ data: "surfirstname" },
{ data: "level" }
],
language: {
emptyTable: "No Active Agents"
},
order: [1, 'asc']
});
$('#agents tbody').on('click','tr', function () {
$(this).toggleClass('selected');
});
});
</script>
@append

73
resources/views/theme/backend/adminlte/r/clients.blade.php
View File

@@ -1,73 +0,0 @@
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title">Clients</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
<i class="fa fa-minus"></i></button>
<button type="button" class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove">
<i class="fa fa-times"></i></button>
</div>
</div>
<div class="box-body">
@if ($user->all_clients()->count())
<table class="table table-bordered table-striped table-hover" id="clients" style="width: 100%;">
<thead>
<tr>
<th>Profile</th>
<th>ID</th>
<th>Name</th>
<th>Active</th>
<th>Services</th>
<th>Level</th>
</tr>
</thead>
<tfoot>
<tr>
<th>Count {{ $user->all_clients()->count() }}</th>
<th colspan="5">&nbsp;</th>
</tr>
</tfoot>
</table>
@else
<p>No Clients Active</p>
@endif
</div>
</div>
@section('page-scripts')
@css(datatables,bootstrap4|rowgroup)
@js(datatables,bootstrap4|rowgroup)
<style>
table.dataTable td {
outline: none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#clients').DataTable( {
responsive: true,
ajax: {
url: "/api/r/clients"
},
columns: [
{ data: "switch_url" },
{ data: "user_id_url" },
{ data: "surfirstname" },
{ data: "active_display" },
{ data: "services_count_html" },
{ data: "level" }
],
language: {
emptyTable: "No Active Clients"
},
order: [2, 'asc']
});
$('#clients tbody').on('click','tr', function () {
$(this).toggleClass('selected');
});
});
</script>
@append

8
resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php
View File

@@ -7,12 +7,4 @@
@include('r.invoice.widgets.due')
</div>
{{--
<div class="col-xs-6">
@include('r.agents')
</div>
<div class="col-xs-6">
@include('r.clients')
</div>
--}}
</div>

2
resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php
View File

@@ -16,7 +16,7 @@
<table class="table table-sm">
<tr>
<th>Account</th>
<td><a href="{{url('u/home/',$o->account->user_id)}}">{{ $o->account->aid }}</a></td>
<td><a href="{{url('u/home/',$o->account->user_id)}}">{{ $o->account->sid }}</a></td>
</tr>
<tr>
<th>Status</th>

2
resources/views/theme/frontend/metronic/order/home.blade.php
View File

@@ -51,7 +51,7 @@
<label for="account_id">Client Account</label>
<select class="form-control" id="account_id" name="account_id">
<option value="">&nbsp;</option>
@foreach ($user->all_accounts()->sortBy('name') as $o)
@foreach ($user->accounts->sortBy('name') as $o)
<option value="{{ $o->id }}" @if($o->id == old('account_id')) selected @endif>{{ $o->name }}</option>
@endforeach
</select>