Skip to content

various admin UI enhancements to workspaces and SIP routers page #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nadirhamid merged 1 commit into from
Jun 9, 2026
Merged

various admin UI enhancements to workspaces and SIP routers page #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/app/Http/Controllers/Admin/SIPRouterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use App\User;
use App\SIPRouter;
use App\RTPProxy;
use App\RTPEngine;
use App\Workspace;
use App\PortNumber;
use App\MediaServer;
Expand Down Expand Up @@ -130,8 +131,8 @@ public function edit(SIPRouter $router)
$servers->where('sip_routers_media_servers.router_id', '=', $router->id);
$servers = $servers->get();
$rtpproxies = RTPProxy::where('router_id', $router->id)->get();

return view('admin.siprouter.create_edit', compact('router', 'servers', 'ranges', 'regions', 'rtpproxies', 'digitMappings'));
$rtpengines = RTPEngine::where('router_id', $router->id)->get();
return view('admin.siprouter.create_edit', compact('router', 'servers', 'ranges', 'regions', 'rtpproxies', 'rtpengines', 'digitMappings'));
}

/**
Expand Down
6 changes: 5 additions & 1 deletion app/app/Http/Controllers/Admin/WorkspaceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use App\UsageTrigger;
use App\PlanUsagePeriod;
use App\UserInvoice;
use App\WorkspaceSuspension;
use App\Http\Requests\Admin\WorkspaceRequest;
use App\Enums\WorkspaceSuspensionStatus;
use App\Helpers\MainHelper;
Expand Down Expand Up @@ -88,12 +89,15 @@ public function edit(Workspace $workspace)
$routingACLs = WorkspaceHelper::getACLs($workspace);
$planHistory = PlanUsagePeriod::where("workspace_id", $workspace->id)->get();
$gracePeriodExtension = WorkspaceSuspensionHelper::getGracePeriodExtension($workspace->id);
$suspensions = WorkspaceSuspension::where('workspace_id', $workspace->id)
->orderBy('suspension_initiated_at', 'DESC')
->get();
$isSuspended = NULL;
if (MainHelper::isWorkspaceSuspended($workspace->id)) {
$isSuspended = TRUE;
}

return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'planHistory', 'invoices', 'gracePeriodExtension', 'isSuspended'));
return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'suspensions', 'planHistory', 'invoices', 'gracePeriodExtension', 'isSuspended'));
}

/**
Expand Down
1 change: 0 additions & 1 deletion app/app/WorkspaceSuspension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class WorkspaceSuspension extends Model
protected $guarded = array('id');
protected $table = 'workspaces_suspensions';
protected $casts = array(
'status' => 'boolean',
'grace_period_extension' => 'integer',
);
}
1 change: 1 addition & 0 deletions app/resources/lang/en/admin/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'termination' => 'Termination',
'did_numbers' => 'DID Numbers',
'rtpproxies' => 'RTP proxies',
'rtpengines' => 'RTP engines',
'digitmapping' => 'Digit Mapping',
'plandetails' => 'Plan Details',
'users' => 'Users',
Expand Down
33 changes: 33 additions & 0 deletions app/resources/views/admin/siprouter/create_edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
<li><a href="#tab-rtpproxies" data-toggle="tab"> {{
trans("admin/modal.rtpproxies") }}</a></li>
@endif
@if (!empty($rtpengines))
<li><a href="#tab-rtpengines" data-toggle="tab"> {{
trans("admin/modal.rtpengines") }}</a></li>
@endif



</ul>
<!-- ./ tabs -->
Expand Down Expand Up @@ -316,6 +322,33 @@
</div>
@endif

@if (isset($router))
<div class="tab-pane" id="tab-rtpengines">
<div class="row">
<div class="col-md-12">
<table class="table stripped">
<thead>
<th>Socket address</th>
<th>Set ID</th>
<th>Priority</th>
</thead>
<tbody>
@foreach ($rtpengines as $engine)
<tr>
<td>{{$engine->socket}}</td>
<td>{{$engine->set_id}}</td>
<td>{{$engine->priority}}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endif



{!! Form::close() !!}
@endsection @section('scripts')
<script type="text/javascript">
Expand Down
46 changes: 37 additions & 9 deletions app/resources/views/admin/workspace/create_edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,35 +118,63 @@
</div>
</div>


<div class="row">
<div class="col-md-12">
<h3>Suspensions</h3>
<table class="table stripped">
<thead>
<th>Suspended At</th>
<th>Suspension Initiated At</th>
<th>Reason</th>
<th>Status</th>
</thead>
<tbody>
@foreach ($suspensions as $record)
<tr>
<td>{{$record['suspended_at']}}</td>
<td>{{$record['suspension_initiated_at']}}</td>
<td>{{$record['reason']}}</td>
<td>
@if ($record['status'] == 'LIFTED')
<i class="fa fa-check" style="color:green"></i> Lifted
@elseif ($record['status'] == 'SUSPENDED')
<i class="fa fa-times" style="color:red"></i> Suspended
@elseif ($record['status'] == 'INITIATED')
<i class="fa fa-clock-o" style="color:orange"></i> Initiated
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="col-md-12">
<h3>Invoices</h3>
<table class="table stripped">
<thead>
<th>Amount</th>
<th>Status</th>
<th>Date/time</th>
<th>Actions</th>
</thead>
<tbody>
@foreach ($invoices as $record)
<tr>
<td>{{$record['dollars']}}</td>
<td>
@if ($record['status'] == 'COMPLETE')
@if ($record['status'] == 'PAID')
<i class="fa fa-check" style="color:green"></i> Paid
@elseif ($record['status'] == 'INCOMPLETE')
<i class="fa fa-times" style="color:red"></i> Unpaid
@elseif ($record['status'] == 'FAILED')
<i class="fa fa-times" style="color:red"></i> Charge Failed
@elseif ($record['status'] == 'REFUNDED')
<i class="fa fa-undo" style="color:orange"></i> Refunded
@elseif ($record['status'] == 'PENDING')
<i class="fa fa-clock-o" style="color:orange"></i> Pending
@else
{{$record['status']}}
@endif
</td>
<td>{{$record['created_at']}}</td>
<td>
@if ($record['status'] == 'COMPLETE')
<button type="button" data-invoice-id="{{$record['id']}}" class="btn btn-sm btn-danger refund-trigger">Refund</button>
@endif
</td>
</tr>
@endforeach
</tbody>
Expand Down
Loading