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

Start work on updating services

Browse Source
This commit is contained in:
Deon George
2022-04-19 17:07:39 +10:00
parent ebf08ea414
commit 621a132e35
63 changed files with 1038 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,17 +9,16 @@ Please order the following...
| Service ID | {!! $service->service_id_url !!} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('ADSL')
@case('BROADBAND')
| Address | {{ $service->type->service_address }} |
@break;
@case('VOIP')
@case('PHONE')
| Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} |
@break;
@endswitch
@endcomponent
**NOTES:** {{ $notes }}
Thanks,<br>

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

@@ -4,21 +4,20 @@
@component('mail::panel')
@component('mail::table')
| Service | Details |
| :---------- | :---------------- |
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Product | {{ $service->product_name }} |
@switch($service->category)
@case('ADSL')
| Address | {{ is_object($service->service_voip) ? $service->service_voip->service_address : 'Not Supplied' }} |
@break;
@case('VOIP')
| Address | {{ is_object($service->service_voip) ? $service->service_voip->service_address : 'Not Supplied' }} |
| Supplier Details | {{ join(':',$service->order_info) }} |
@break;
@endswitch
| Service | Details |
| :---------- | :---------------- |
| Account | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
| Service ID | {!! $service->service_id_url !!} |
| Product | {{ $service->product_name }} |
@switch($service->category)
@case('BROADBAND')
| Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} |
@break;
@case('PHONE')
| Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} |
| Supplier Details | {{ join(':',$service->order_info) }} |
@break;
@endswitch
@endcomponent
**REASON:** {{ $reason }}

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

@@ -9,17 +9,16 @@ Please cancel the following...
| Service ID | {!! $service->service_id_url !!} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('ADSL')
@case('BROADBAND')
| Address | {{ $service->type->service_address }} |
@break;
@case('VOIP')
@case('PHONE')
| Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} |
@break;
@endswitch
@endcomponent
**NOTES:** {{ $notes }}
Thanks,<br>

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

@@ -9,17 +9,16 @@ Please change the following...
| Service ID | {!! $service->service_id_url !!} |
| Product | {{ $service->product_name }} |
@switch($service->product_category)
@case('ADSL')
@case('BROADBAND')
| Address | {{ $service->type->service_address }} |
@break;
@case('VOIP')
@case('PHONE')
| Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} |
@break;
@endswitch
@endcomponent
**NOTES:** {{ $notes }}
Thanks,<br>

72
resources/views/theme/backend/adminlte/a/service/widgets/phone/update.blade.php Normal file
View File

@@ -0,0 +1,72 @@
<!-- $o = App\Models\Service\Phone::class -->
<div class="form-group row">
<label for="service_number" class="col-sm-3 col-form-label text-right">Service Number</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
</div>
<input type="text" class="form-control" name="phone[service_number]" value="{{ $o->service_number ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="service_username" class="col-sm-3 col-form-label text-right">Service Username</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<input type="text" class="form-control" name="phone[service_username]" value="{{ $o->service_username ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="service_password" class="col-sm-3 col-form-label text-right">Service Password</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
</div>
<input type="text" class="form-control" name="phone[service_password]" value="{{ $o->service_password ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="connect_at" class="col-sm-3 col-form-label text-right">Service Connect Date</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="phone[connect_at]" value="{{ $o->connect_at ? $o->connect_at->format('Y-m-d') : '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="expire_at" class="col-sm-3 col-form-label text-right">Service Expires (Contracted Till)</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="phone[expire_at]" value="{{ $o->expire_at ? $o->expire_at->format('Y-m-d') : '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="start_at" class="col-sm-3 col-form-label text-right">Service Billing Start Date</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="start_at" value="{{ $o->service->start_at ? $o->service->start_at->format('Y-m-d') : '' }}">
</div>
</div>
</div>

72
resources/views/theme/backend/adminlte/a/service/widgets/voip/update.blade.php
View File

@@ -1,72 +0,0 @@
<!-- $o = App\Models\Service\Voip::class -->
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Number</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
</div>
<input type="text" class="form-control" name="voip[service_number]" value="{{ $o->service_number ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Username</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<input type="text" class="form-control" name="voip[service_username]" value="{{ $o->service_username ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Password</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
</div>
<input type="text" class="form-control" name="voip[service_password]" value="{{ $o->service_password ?? '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Connect Date</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="voip[service_connect_date]" value="{{ $o->service_connect_date ? $o->service_connect_date->format('Y-m-d') : '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Contract Date</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="voip[service_contract_date]" value="{{ $o->service_contract_date ? $o->service_contract_date->format('Y-m-d') : '' }}">
</div>
</div>
</div>
<div class="form-group row">
<label for="reference" class="col-sm-3 col-form-label text-right">Service Billing Start Date</label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="date_start" value="{{ $o->service->date_start ? $o->service->date_start->format('Y-m-d') : '' }}">
</div>
</div>
</div>

16
resources/views/theme/backend/adminlte/r/service/domain/list.blade.php
View File

@@ -19,11 +19,12 @@
<div class="col-12">
<div class="card card-dark">
<div class="card-body">
<table class="table table-hover" id="service_domain">
<table class="table table-hover" id="services">
<thead>
<tr>
<th>Service ID</tH>
<th>Account</th>
<th>Product</th>
<th>Domain</th>
<th>Expires</th>
<th>Registrar</th>
@@ -36,11 +37,12 @@
<tbody>
@foreach ($o as $oo)
<tr @if ($oo->service_expire->isPast()) class="table-danger" @endif>
<tr @if ($oo->hasExpired()) class="table-danger" @endif>
<td><a href="{{ url('u/service',[$oo->service_id]) }}">{{ $oo->service->sid }}</td>
<td>{{ $oo->service->account->name }}</td>
<td>{{ $oo->service->product->name }}</td>
<td>{{ $oo->service_name }}</td>
<td>{{ $oo->service_expire->format('Y-m-d') }}</td>
<td>{{ $oo->service_expire ? $oo->service_expire->format('Y-m-d') : '-' }}</td>
<td>{{ $oo->registrar->name }}</td>
<td>{{ $oo->registrar_ns }}</td>
<td>@if ($oo->service->isBilled()) <span class="@if($oo->service->suspend_billing)strike @endif">{{ $oo->service->invoice_next->format('Y-m-d') }}</span> @else - @endif</td>
@@ -67,14 +69,14 @@
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#service_domain').DataTable({
order: [[4,'asc'],[1,'asc'],[2,'desc']],
$('#services').DataTable({
order: [[5,'asc'],[1,'asc'],[2,'desc']],
rowGroup: {
dataSrc: 4,
dataSrc: 5,
},
columnDefs: [
{
targets: [4],
targets: [5],
visible: false,
}
],

16
resources/views/theme/backend/adminlte/r/service/email/list.blade.php
View File

@@ -19,11 +19,12 @@
<div class="col-12">
<div class="card card-dark">
<div class="card-body">
<table class="table table-hover" id="service_email">
<table class="table table-hover" id="services">
<thead>
<tr>
<th>Service ID</tH>
<th>Account</th>
<th>Product</th>
<th>Domain</th>
<th>Expires</th>
<th>Supplier</th>
@@ -38,11 +39,12 @@
<tbody>
@foreach ($o as $oo)
<tr @if ($oo->service_expire->isPast()) class="table-danger" @endif>
<tr @if ($oo->hasExpired()) class="table-danger" @endif>
<td><a href="{{ url('u/service',[$oo->service_id]) }}">{{ $oo->service->sid }}</td>
<td>{{ $oo->service->account->name }}</td>
<td>{{ $oo->service->product->name }}</td>
<td>{{ $oo->service_name }}</td>
<td>{{ $oo->service_expire->format('Y-m-d') }}</td>
<td>{{ $oo->service_expire ? $oo->service_expire->format('Y-m-d') : '-' }}</td>
<td>{{ $oo->service->product->supplier->name }}</td>
<td>{{ $oo->admin_url }}</td>
<td>@if($oo->admin_user){{ $oo->admin_user }}/{{ $oo->admin_pass }}@else &nbsp; @endif</td>
@@ -71,14 +73,14 @@
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#service_email').DataTable({
order: [[4,'asc'],[1,'asc'],[2,'desc']],
$('#services').DataTable({
order: [[5,'asc'],[1,'asc'],[2,'desc']],
rowGroup: {
dataSrc: 4,
dataSrc: 5,
},
columnDefs: [
{
targets: [4],
targets: [5],
visible: false,
}
],

18
resources/views/theme/backend/adminlte/r/service/host/list.blade.php
View File

@@ -1,17 +1,17 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Email Hosting
Web Hosting
@endsection
@section('page_title')
Email Hosting
Web Hosting
@endsection
@section('contentheader_title')
Email Hosting
Web Hosting
@endsection
@section('contentheader_description')
Email Hosting currently managed.
Web Hosting currently managed.
@endsection
@section('main-content')
@@ -19,7 +19,7 @@
<div class="col-12">
<div class="card card-dark">
<div class="card-body">
<table class="table table-hover" id="service_host">
<table class="table table-hover" id="services">
<thead>
<tr>
<th>Service ID</tH>
@@ -36,13 +36,13 @@
<tbody>
@foreach ($o as $oo)
<tr @if ($oo->service_expire->isPast()) class="table-danger" @endif>
<tr @if ($oo->hasExpired()) class="table-danger" @endif>
<td><a href="{{ url('u/service',[$oo->service_id]) }}">{{ $oo->service->sid }}</td>
<td>{{ $oo->service->account->name }}</td>
<td>{{ $oo->service->product->name }}</td>
<td>{{ $oo->service_name }}</td>
<td>{{ $oo->service_expire->format('Y-m-d') }}</td>
<td>{{ ($x=$oo->service->product->supplier) ? $x->name : 'Unknown' }}</td>
<td>{{ $oo->service_expire ? $oo->service_expire->format('Y-m-d') : '-' }}</td>
<td>{{ $oo->service->product->supplier->name }}</td>
<td>@if ($oo->service->isBilled()) <span class="@if($oo->service->suspend_billing)strike @endif">{{ $oo->service->invoice_next->format('Y-m-d') }}</span> @else - @endif</td>
<td>@if (! $oo->service->external_billing)${{ number_format($oo->service->next_invoice_items(TRUE)->sum('total'),2) }}@else - @endif</td>
<td>{{ $oo->service->billing_interval_string }}</td>
@@ -67,7 +67,7 @@
</style>
<script type="text/javascript">
$(document).ready(function() {
$('#service_host').DataTable({
$('#services').DataTable({
order: [[5,'asc'],[1,'asc'],[2,'desc']],
rowGroup: {
dataSrc: 5,

4
resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php
View File

@@ -30,10 +30,10 @@
<br>(#{{ $o->order_info_reference }})
@break;
@case ('PROVISION-PLANNED')
<br>({{ ($xx=$o->date_start) ? $xx->format('Y-m-d') : 'No Date' }})
<br>({{ ($xx=$o->start_at) ? $xx->format('Y-m-d') : 'No Date' }})
@break;
@case ('CANCEL-PENDING')
<br>({{ ($xx=$o->date_end) ? $xx->format('Y-m-d') : 'No Date' }})
<br>({{ ($xx=$o->stop_at) ? $xx->format('Y-m-d') : 'No Date' }})
@break;
@endswitch
</td>

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

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

33
resources/views/theme/backend/adminlte/u/service/widgets/broadband/details.blade.php
View File

@@ -1,4 +1,4 @@
<!-- $o = Service\Broadband::class -->
<!-- $o = App\Models\Service\Broadband::class -->
<div class="card">
@if($o->service->isPending())
<div class="ribbon-wrapper ribbon-lg">
@@ -30,18 +30,17 @@
<th>Service Password</th>
<td>{{ $o->service_password }}</td>
</tr>
@if($o->service_connect_date)
@if($o->connect_at)
<tr>
<th>Connected</th>
<td>{{ $o->service_connect_date->format('Y-m-d') }}</td>
<td>{{ $o->connect_at->format('Y-m-d') }}</td>
</tr>
@endif
<!-- @todo -->
@if($o->technology)
<tr>
<th>Technology</th>
<td>{{ $o->technology }}</td>
</tr>
@if($x=$o->technology)
<tr>
<th>Technology</th>
<td>{{ $x }}</td>
</tr>
@endif
<tr>
<th>Speed</th>
@@ -50,26 +49,30 @@
<!-- @todo -->
<tr>
<th>Traffic</th>
<td>{{ $o->service->product->type->allowance_string() }} GB @if(FALSE)(YY GB used month)@endif</td>
<td>{{ $o->service->offering->allowance_string() }} GB @if(FALSE)(YY GB used month)@endif</td>
</tr>
<tr>
<th>IP Address</th>
<th>IP4 Address</th>
<td>{{ $o->ipaddress ?: 'Dynamic' }}</td>
</tr>
<tr>
<th>IP6 Address</th>
<td>{{ $o->ip6address ?: '-' }}</td>
</tr>
@if ($o->inContract())
<tr>
<th>Contract</th>
<td>{{ $o->contract_term }} months <small>({{ ($x=$o->service_contract_date->addMonths($o->contract_term))->diffForHumans() }})</small></td>
<td>{{ $o->contract_term }} months</td>
</tr>
<tr>
<th>Contract End</th>
<td>{{ $x->format('Y-m-d') }}</td>
<td>{{ $o->service_expire->format('Y-m-d') }} <small>({{ $o->service_expire->diffForHumans() }})</small></td>
</tr>
@endif
<tr>
<th>Cancel Notice</th>
<td>1 month @if($o->inContract())<small>(after {{ $o->service_contract_date->addMonths($o->contract_term-1)->format('Y-m-d') }})</small>@endif</td>
<td>1 month @if($o->inContract())<small>(after {{ $o->service_expire->subMonth()->format('Y-m-d') }})</small>@endif</td>
</tr>
</table>
</div>
</div>
</div>

17
resources/views/theme/backend/adminlte/u/service/widgets/domain/details.blade.php
View File

@@ -1,3 +1,4 @@
<!-- $o = App\Models\Service\Domain::class -->
<div class="card">
@if($o->service->isPending())
<div class="ribbon-wrapper ribbon-lg">
@@ -39,20 +40,10 @@
<td>{{ $o->service_connect_date->format('Y-m-d') }}</td>
</tr>
@endif
@if ($o->inContract())
<tr>
<th>Contract</th>
<!-- @todo -->
<td>12 months <small>({{ ($x=$o->domain_expire)->diffForHumans() }})</small></td>
</tr>
<tr>
<th>Contract End</th>
<td>{{ $x->format('Y-m-d') }}</td>
</tr>
@endif
<tr>
<th>Cancel Notice</th>
<td>Before renewal</td>
<th>Expires</th>
<td>{{ $o->expire_at->format('Y-m-d') }} <small>({{ $o->expire_at->diffInMonths() }} months) </small></td>
</tr>
</table>
</div>

10
resources/views/theme/backend/adminlte/u/service/widgets/email/details.blade.php
View File

@@ -1,5 +1,4 @@
<!-- $o = App\Models\Service\Host::class -->
{{-- @todo Change this to App\Models\Service\Email --}}
<!-- $o = App\Models\Service\Email::class -->
<div class="card">
@if($o->service->isPending())
<div class="ribbon-wrapper ribbon-lg">
@@ -27,13 +26,12 @@
@endif
@if ($o->inContract())
<tr>
<th>Contract</th>
<!-- @todo -->
<td>12 months <small>({{ ($x=$o->domain_expire)->diffForHumans() }})</small></td>
<th>Contract Term</th>
<td>{{ $o->service->contract_term }} months</td>
</tr>
<tr>
<th>Contract End</th>
<td>{{ $x->format('Y-m-d') }}</td>
<td>{{ $o->service->contract_end->format('Y-m-d') }} <small>({{ $o->service->contract_end->diffForHumans() }})</small></td>
</tr>
@endif
<tr>

8
resources/views/theme/backend/adminlte/u/service/widgets/host/details.blade.php
View File

@@ -1,3 +1,4 @@
<!-- $o = App\Models\Service\Host::class -->
<div class="card">
@if($o->service->isPending())
<div class="ribbon-wrapper ribbon-lg">
@@ -39,13 +40,12 @@
@endif
@if ($o->inContract())
<tr>
<th>Contract</th>
<!-- @todo -->
<td>12 months <small>({{ ($x=$o->domain_expire)->diffForHumans() }})</small></td>
<th>Contract Term</th>
<td>{{ $o->service->contract_term }} months</td>
</tr>
<tr>
<th>Contract End</th>
<td>{{ $x->format('Y-m-d') }}</td>
<td>{{ $o->service->contract_end->format('Y-m-d') }} <small>({{ $o->service->contract_end->diffForHumans() }})</small></td>
</tr>
@endif
<tr>

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

@@ -1,3 +1,4 @@
<!-- $o = App\Models\Service -->
<div class="card">
@if($o->external_billing)
<div class="ribbon-wrapper ribbon-lg">
@@ -15,7 +16,7 @@
<table class="table table-sm">
<tr>
<th>Account</th>
<td><a href="{{url('u/home/',$o->account_id)}}">{{ $o->account->aid }}</a></td>
<td><a href="{{url('u/home/',$o->account->user_id)}}">{{ $o->account->aid }}</a></td>
</tr>
<tr>
<th>Status</th>

7
resources/views/theme/backend/adminlte/u/service/widgets/voip/details.blade.php → resources/views/theme/backend/adminlte/u/service/widgets/phone/details.blade.php
View File

@@ -1,3 +1,4 @@
<!-- $o = App\Models\Service\Phone::class -->
<div class="card">
@if($o->service->isPending())
<div class="ribbon-wrapper ribbon-lg">
@@ -8,7 +9,7 @@
@endif
<div class="card-header bg-gray-dark">
<h3 class="card-title">VOIP Details</h3>
<h3 class="card-title">Phone Details</h3>
</div>
<div class="card-body bg-gray-dark">
@@ -29,10 +30,10 @@
<th>Service Password</th>
<td>{{ $o->service_password }}</td>
</tr>
@if($o->service_connect_date)
@if($o->connect_at)
<tr>
<th>Connected</th>
<td>{{ $o->service_connect_date->format('Y-m-d') }}</td>
<td>{{ $o->connect_at->format('Y-m-d') }}</td>
</tr>
@endif
<!-- @todo -->

0
resources/views/theme/frontend/metronic/order/widget/info/voip.blade.php → resources/views/theme/frontend/metronic/order/widget/info/phone.blade.php
View File

2
resources/views/theme/frontend/metronic/order/widget/order/voip.blade.php → resources/views/theme/frontend/metronic/order/widget/order/phone.blade.php
View File

@@ -1,5 +1,5 @@
<fieldset class="form-group">
<label class="col-md-12">VOIP</label>
<label class="col-md-12">PHONE</label>
<div class="form-group col-sm-6 {{ $errors->has('options.phonenumber') ? 'has-error' : '' }}">
<label for="options.phonenumber">Phone Number</label>