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

Home screen improvements, testing for role, work on user/account models

Browse Source
This commit is contained in:
Deon George
2022-04-21 14:41:26 +10:00
parent 40d12b906b
commit 796c72dd09
18 changed files with 528 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/theme/backend/adminlte/common/account/widget/summary.blade.php
View File

@@ -1,17 +1,17 @@
@if ($o->accounts->count() > 1)
<div class="col-sm-2">
<div class="col-12 col-sm-4 col-md-3">
<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->accounts->count()) }}</span>
<span class="info-box-number">{{ number_format($o->my_accounts->count()) }}</span>
</div>
</div>
</div>
@endif
<div class="col-sm-2">
<div class="col-12 col-sm-4 col-md-3">
<div class="info-box">
<span class="info-box-icon bg-info"><i class="fas fa-clone"></i></span>
@@ -23,7 +23,7 @@
</div>
</div>
<div class="col-sm-2">
<div class="col-12 col-sm-4 col-md-3">
<div class="info-box">
<span class="info-box-icon bg-danger"><i class="fas fa-dollar-sign"></i></span>
@@ -34,7 +34,7 @@
</div>
</div>
<div class="col-sm-2">
<div class="col-12 col-sm-4 col-md-3">
<div class="info-box">
<span class="info-box-icon bg-dark"><i class="fas fa-hashtag"></i></span>

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

@@ -4,21 +4,29 @@
</div>
<div class="card-body">
@if ($user->all_accounts()->count())
<table class="table table-striped table-hover" id="accounts" style="width: 100%;">
@if ($user->accounts->count())
<table class="table table-striped table-hover" id="accounts">
<thead>
<tr>
<th>Profile</th>
<th>Name</th>
<th>Active</th>
<th>Services</th>
<th class="text-right">Services</th>
</tr>
</thead>
<tbody>
@foreach ($user->accounts 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>
<td class="text-right">{{ $ao->services->where('active',TRUE)->count() }} <small>/{{ $ao->services->count() }}</small></td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<th>Count {{ $user->all_accounts()->count() }}</th>
<th colspan="3">&nbsp;</th>
<th>Count {{ $user->accounts->count() }}</th>
<th colspan="2">&nbsp;</th>
</tr>
</tfoot>
</table>
@@ -35,21 +43,12 @@
<script type="text/javascript">
$(document).ready(function() {
$('#accounts').DataTable( {
ajax: {
url: "/api/r/accounts"
},
columns: [
{ data: "switch_url" },
{ data: "name" },
{ data: "active_display" },
{ data: "services_count_html" }
],
$('#accounts').DataTable({
language: {
emptyTable: "No Active Clients"
},
order: [1, 'asc'],
pageLength: 25
order: [1,'asc'],
pageLength: 10
});
$('#accounts tbody').on('click','tr', function () {

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

@@ -1,77 +0,0 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Reseller Home
@endsection
@section('page_title')
{{ $o->full_name }}
@endsection
@section('contentheader_title')
{{ $o->full_name }}
@endsection
@section('contentheader_description')
Reseller Home
@endsection
@section('main-content')
<div class="row">
@include('common.account.widget.summary')
</div>
<div class="row">
<div class="col-md-12">
<div class="card-header bg-white">
<div class="card-header p-2">
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link active" href="#tab-services" data-toggle="tab">Services</a></li>
<li class="nav-item"><a class="nav-link" href="#tab-clients" data-toggle="tab">Clients</a></li>
</ul>
</div>
</div>
<div class="card-body pl-0 pr-0">
<div class="tab-content">
<div class="active tab-pane" id="tab-services">
<div class="row">
<div class="col-7">
@include('u.service.widgets.active')
</div>
<div class="col-5">
@include('u.invoice.widgets.due')
@include('u.invoice.widgets.list')
@include('u.payment.widgets.list')
</div>
</div>
</div>
<div class="tab-pane" id="tab-clients">
<div class="row">
<div class="col-4">
@include('r.account.widgets.list')
</div>
<div class="col-8">
@include('r.service.widgets.movement')
@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>
</div>
</div>
</div>
</div>
</div>
@endsection

18
resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php Normal file
View File

@@ -0,0 +1,18 @@
<div class="row">
<div class="col-4">
@include('r.account.widgets.list')
</div>
<div class="col-8">
@include('r.service.widgets.movement')
@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>

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

@@ -1,7 +1,7 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Client Home
{{ $o->role }} Home
@endsection
@section('page_title')
{{ $o->full_name }}
@@ -11,10 +11,11 @@
{{ $o->full_name }}
@endsection
@section('contentheader_description')
Client Home
{{ $o->role }}
@endsection
@section('main-content')
<!-- Our Summary Home Page Boxes -->
<div class="row">
@include('common.account.widget.summary')
</div>
@@ -24,8 +25,17 @@
<div class="card-header bg-white">
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link active" href="#tab-services" data-toggle="tab">Services</a></li>
{{--
<!-- @todo this is not working -->
<li class="nav-item"><a class="nav-link" href="#tab-nextinvoice" data-toggle="tab">Next Invoice</a></li>
--}}
<li class="nav-item"><a class="nav-link" href="#tab-futureinvoice" data-toggle="tab">Future Invoice</a></li>
@if ($o == $user)
@canany('reseller','wholesaler')
<li class="nav-item ml-auto"><a class="nav-link" href="#tab-reseller" data-toggle="tab">Reseller</a></li>
@endcanany
@endif
</ul>
</div>
@@ -33,11 +43,11 @@
<div class="tab-content">
<div class="active tab-pane" id="tab-services">
<div class="row">
<div class="col-7">
<div class="col-12 col-xl-7">
@include('u.service.widgets.active')
</div>
<div class="col-5">
<div class="col-12 col-xl-5">
@include('u.invoice.widgets.due')
@include('u.invoice.widgets.list')
@@ -47,6 +57,8 @@
</div>
</div>
{{--
<!-- @todo this is not working -->
<div class="tab-pane" id="tab-nextinvoice">
<div class="row">
<div class="col-12">
@@ -54,16 +66,39 @@
</div>
</div>
</div>
--}}
<div class="tab-pane" id="tab-futureinvoice">
<div class="row">
<div class="col-12">
<div class="col-12 col-xl-9">
@include('u.invoice.widgets.next',['future'=>TRUE])
</div>
</div>
</div>
@if ($o == $user)
@canany('reseller','wholesaler')
<div class="tab-pane" id="tab-reseller">
@include('r.home.widgets.home')
</div>
@endcanany
@endif
</div>
</div>
</div>
</div>
@endsection
@endsection
@section('page-scripts')
<script>
$(document).ready(function() {
$('body')
.addClass('sidebar-collapse')
.delay(500)
.queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
});
</script>
@append

10
resources/views/theme/backend/adminlte/u/invoice/widgets/next.blade.php
View File

@@ -10,11 +10,11 @@
<th class="text-right">${{ number_format($oo->sum('total'),2) }}</th>
</tr>
@foreach ($oo->groupBy('service_id') as $ooo)
<tr>
<td class="pt-0 pb-1" style="width: 8em;"><a href="{{ url('u/service',$ooo->first()->service_id) }}">{{ $ooo->first()->service->sid }}</a></td>
<td class="pt-0 pb-1" colspan="3">{{ $ooo->first()->service->sname }}: {{ $ooo->first()->service->sdesc }}</td>
</tr>
@foreach ($oo->groupBy('service_id') as $ooo)
<tr>
<td class="pt-0 pb-1" style="width: 12em;"><a href="{{ url('u/service',$ooo->first()->service_id) }}">{{ $ooo->first()->service->sid }}</a></td>
<td class="pt-0 pb-1" colspan="3">{{ $ooo->first()->service->sname }}: {{ $ooo->first()->service->sdesc }}</td>
</tr>
@foreach ($ooo as $io)
<tr>

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

@@ -59,7 +59,7 @@
<script type="text/javascript">
$(document).ready(function() {
$('#services_active').DataTable( {
$('#services_active').DataTable({
order: [[1,'asc'],[2,'asc']],
rowGroup: {
dataSrc: 1,