From 14609fb377c3f4cd463573966f9ef841056f6d68 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 24 Jul 2024 15:31:57 +1000
Subject: [PATCH] Fix display of Billing Start Date and other minor items

---
 .../backend/adminlte/service/home.blade.php   | 12 +++++-----
 .../widget/broadband/details.blade.php        | 23 ++++++++++++-------
 .../adminlte/service/widget/update.blade.php  |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/resources/views/theme/backend/adminlte/service/home.blade.php b/resources/views/theme/backend/adminlte/service/home.blade.php
index ad8ed20..771a3d7 100644
--- a/resources/views/theme/backend/adminlte/service/home.blade.php
+++ b/resources/views/theme/backend/adminlte/service/home.blade.php
@@ -28,11 +28,11 @@
 			<div class="card">
 				<div class="card-header bg-dark d-flex p-0">
 					<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>
 						@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>
 						@endif
 
@@ -61,15 +61,15 @@
 
 				<div class="card-body">
 					<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">
 								@include('theme.backend.adminlte.service.widget.invoice')
 							</div>
 						@endif
 
-						@if ($o->product->hasUsage())
+						@if($o->product->hasUsage())
 							<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])
 								@endif
 							</div>
@@ -88,7 +88,7 @@
 								@endif
 							</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')
 							</div>
 						@endcan
diff --git a/resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php
index c8dfc5f..886e716 100644
--- a/resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php
@@ -22,14 +22,21 @@
 				<th>Service Number</th>
 				<td>{{ $o->service_number }}</td>
 			</tr>
-			<tr>
-				<th>Service Username</th>
-				<td>{{ $o->service_username }}</td>
-			</tr>
-			<tr>
-				<th>Service Password</th>
-				<td>{{ $o->service_password }}</td>
-			</tr>
+			@if($o->pppoe)
+				<tr>
+					<th>Service Username</th>
+					<td>{{ $o->service_username }}</td>
+				</tr>
+				<tr>
+					<th>Service Password</th>
+					<td>{{ $o->service_password }}</td>
+				</tr>
+			@else
+				<tr>
+					<th>Service Type</th>
+					<td>Layer 2</td>
+				</tr>
+			@endif
 			@if($o->connect_at)
 				<tr>
 					<th>Connected</th>
diff --git a/resources/views/theme/backend/adminlte/service/widget/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/update.blade.php
index f1aadd1..925ee01 100644
--- a/resources/views/theme/backend/adminlte/service/widget/update.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/update.blade.php
@@ -19,7 +19,7 @@
 				<div class="col-1"></div>
 
 				<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>
 
 				<!-- Price -->