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

User optimisation and code cleanup

Browse Source
This commit is contained in:
Deon George
2024-07-05 22:56:02 +10:00
parent b6b036e06d
commit 326b1dcfc5
12 changed files with 80 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php
View File

@@ -1,27 +1,25 @@
@if(Auth::user()->isReseller() && $o->my_accounts->count() <= 2 && $o->my_accounts->pluck('providers')->flatten()->count())
@if($user->isReseller() && ($o->accounts->count() <= 2) && ($x=$o->accounts->pluck('providers')->flatten())->count())
<div class="col-12 col-sm-4 col-md-2">
<div class="info-box">
<span class="info-box-icon bg-dark elevation-1"><i class="fas fa-file-invoice"></i></span>
<div class="info-box-content">
<span class="info-box-text">Accounting</span>
@foreach ($o->my_accounts as $ao)
@foreach($ao->providers as $po)
<span class="info-box-number"><a href="{{ url(($po->api_class())::url().'/customerdetail?nameId='.$po->pivot->ref) }}" target="{{ $po->name }}">{{ ucfirst($po->name) }}</a></span>
@endforeach
@foreach($x as $po)
<span class="info-box-number"><a href="{{ url(($po->api_class())::url().'/customerdetail?nameId='.$po->pivot->ref) }}" target="{{ $po->name }}">{{ ucfirst($po->name) }}</a></span>
@endforeach
</div>
</div>
</div>
@endif
@if ($o->accounts->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>
<div class="info-box-content">
<span class="info-box-text">Linked Accounts</span>
<span class="info-box-number">{{ number_format($o->my_accounts->count()) }}</span>
<span class="info-box-number">{{ number_format($o->accounts_all->count()) }}</span>
</div>
</div>
</div>
@@ -33,8 +31,7 @@
<div class="info-box-content">
<span class="info-box-text">Active Services</span>
<!-- @todo This should count of inactive services too -->
<span class="info-box-number">{{ $o->services->count() }} <small>/{{ $o->services->count() }}</small></span>
<span class="info-box-number">{{ $o->accounts_all->map(fn($item)=>$item->services->where('active',TRUE)->count())->sum() }} <small>/{{ $o->accounts_all->map(fn($item)=>$item->services->count())->sum() }}</small></span>
</div>
</div>
</div>
@@ -45,7 +42,7 @@
<div class="info-box-content">
<span class="info-box-text">Account Balance</span>
<span class="info-box-number"><small>$</small> {{ number_format(($x=$o->accounts->map(fn($item)=>$item->invoiceSummaryDue()->get()->pluck('_balance'))->flatten())->sum(),2) }}</span>
<span class="info-box-number"><small>$</small> {{ number_format(($x=$o->accounts_all->map(fn($item)=>$item->invoiceSummaryDue()->get()->pluck('_balance'))->flatten())->sum(),2) }}</span>
</div>
</div>
</div>

6
resources/views/theme/backend/adminlte/home.blade.php
View File

@@ -24,7 +24,7 @@
<div class="card-header p-0 pt-1">
<ul class="nav nav-tabs" id="accounts-tab" role="tablist">
<li class="pt-2 px-3"><h3 class="card-title">Accounts</h3></li>
@foreach($o->my_accounts as $ao)
@foreach($o->accounts as $ao)
<li class="nav-item">
<a class="nav-link @if(! $loop->index)active @endif" href="#account_{{ $ao->id }}" data-toggle="tab" aria-controls="account_{{ $ao->id }}" aria-selected="true">{{ $ao->name }}</a>
</li>
@@ -42,7 +42,7 @@
<div class="card-body">
<div class="tab-content" id="accounts-tab-content">
@foreach($o->my_accounts as $ao)
@foreach($o->accounts as $ao)
<div class="tab-pane fade @if(! $loop->index)show active @endif" id="account_{{ $ao->id }}" role="tabpanel" aria-labelledby="account_{{ $ao->id }}">
<div class="row">
<div class="col-12">
@@ -93,7 +93,7 @@
</div>
@endforeach
@if ($o == $user)
@if($o==$user)
@canany('reseller','wholesaler')
<div class="tab-pane" id="tab-reseller" role="tabpanel">
@include('theme.backend.adminlte.r.home.widget.home')

6
resources/views/theme/backend/adminlte/r/account/widgets/list.blade.php
View File

@@ -4,7 +4,7 @@
</div>
<div class="card-body">
@if ($user->accounts->count())
@if ($x=$user->accounts_all->count())
<table class="table table-striped table-hover" id="accounts">
<thead>
<tr>
@@ -14,7 +14,7 @@
</tr>
</thead>
<tbody>
@foreach ($user->accounts as $ao)
@foreach ($user->accounts_all as $ao)
<tr>
<td><a href="{{ url('r/switch/start',$ao->user_id) }}"><i class="fas fa-external-link-alt"></i></a></td>
<td>{{ $ao->name }}</td>
@@ -25,7 +25,7 @@
<tfoot>
<tr>
<th>Count {{ $user->accounts->count() }}</th>
<th>Count {{ $x }}</th>
<th colspan="2">&nbsp;</th>
</tr>
</tfoot>

6
resources/views/theme/backend/adminlte/r/service/widget/movement.blade.php
View File

@@ -1,3 +1,7 @@
@php
use App\Models\Service;
@endphp
<!-- Show client movements -->
<div class="card card-dark">
<div class="card-header">
@@ -5,7 +9,7 @@
</div>
<div class="card-body">
@if (($x=$user->client_service_movements())->count())
@if (($x=Service::movements($user))->count())
<table class="table table-striped table-hover" id="service_movements">
<thead>
<tr>