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

Fix display of Billing Start Date and other minor items
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 30s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-07-24 15:31:57 +10:00
parent 1bae121481
commit 14609fb377
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,11 @@
<div class="card"> <div class="card">
<div class="card-header bg-dark d-flex p-0"> <div class="card-header bg-dark d-flex p-0">
<ul class="nav nav-pills w-100 p-2"> <ul class="nav nav-pills w-100 p-2">
@if ($x=! ($o->suspend_billing || $o->external_billing)) @if($x=! ($o->suspend_billing || $o->external_billing))
<li class="nav-item"><a @class(['nav-link','active'=>! session()->has('service_update')]) href="#pending_items" data-toggle="tab">Pending Items</a></li> <li class="nav-item"><a @class(['nav-link','active'=>! session()->has('service_update')]) href="#pending_items" data-toggle="tab">Pending Items</a></li>
@endif @endif
@if ($o->product->hasUsage()) @if($o->product->hasUsage())
<li class="nav-item"><a @class(['nav-link','active'=>! ($x || session()->has('service_update'))]) href="#traffic" data-toggle="tab">Traffic</a></li> <li class="nav-item"><a @class(['nav-link','active'=>! ($x || session()->has('service_update'))]) href="#traffic" data-toggle="tab">Traffic</a></li>
@endif @endif
@ -61,15 +61,15 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
@if ($x=! ($o->suspend_billing || $o->external_billing)) @if($x=! ($o->suspend_billing || $o->external_billing))
<div @class(['tab-pane','fade','show active'=>! session()->has('service_update')]) id="pending_items"> <div @class(['tab-pane','fade','show active'=>! session()->has('service_update')]) id="pending_items">
@include('theme.backend.adminlte.service.widget.invoice') @include('theme.backend.adminlte.service.widget.invoice')
</div> </div>
@endif @endif
@if ($o->product->hasUsage()) @if($o->product->hasUsage())
<div @class(['tab-pane','fade','show active'=>! ($x || session()->has('service_update'))]) id="traffic"> <div @class(['tab-pane','fade','show active'=>! ($x || session()->has('service_update'))]) id="traffic">
@if ($o->type->usage(30)->count()) @if($o->type->usage(30)->count())
@include('theme.backend.adminlte.service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type]) @include('theme.backend.adminlte.service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type])
@endif @endif
</div> </div>
@ -88,7 +88,7 @@
@endif @endif
</div> </div>
<div @class(['tab-pane','fade','show active'=>session()->has('service_update')]) id="update"> <div @class(['tab-pane','fade','show active'=>session()->pull('service_update')]) id="update">
@include('theme.backend.adminlte.service.widget.update') @include('theme.backend.adminlte.service.widget.update')
</div> </div>
@endcan @endcan

7
resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php
View File

@ -22,6 +22,7 @@
<th>Service Number</th> <th>Service Number</th>
<td>{{ $o->service_number }}</td> <td>{{ $o->service_number }}</td>
</tr> </tr>
@if($o->pppoe)
<tr> <tr>
<th>Service Username</th> <th>Service Username</th>
<td>{{ $o->service_username }}</td> <td>{{ $o->service_username }}</td>
@ -30,6 +31,12 @@
<th>Service Password</th> <th>Service Password</th>
<td>{{ $o->service_password }}</td> <td>{{ $o->service_password }}</td>
</tr> </tr>
@else
<tr>
<th>Service Type</th>
<td>Layer 2</td>
</tr>
@endif
@if($o->connect_at) @if($o->connect_at)
<tr> <tr>
<th>Connected</th> <th>Connected</th>

2
resources/views/theme/backend/adminlte/service/widget/update.blade.php
View File

@ -19,7 +19,7 @@
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-12 col-sm-9 col-md-6 col-xl-5"> <div class="col-12 col-sm-9 col-md-6 col-xl-5">
<x-leenooks::form.date id="invoice_next_at" name="invoice_next_at" icon="fa-calendar" label="Billing Start Date" :value="($o->invoice_next_at ?: $o->connect_at)?->format('Y-m-d')"/> <x-leenooks::form.date id="invoice_next_at" name="invoice_next_at" icon="fa-calendar" label="Billing Start Date" :value="($o->getRawOriginal('invoice_next_at') ?: $o->getRawOriginal('connect_at'))"/>
</div> </div>
<!-- Price --> <!-- Price -->