Merge branch 'branch-jagad' into 'main'

Branch jagad

See merge request fiqhpratama1/xpendify!38
This commit is contained in:
Jagad Raya
2025-01-19 11:58:22 +00:00
+5 -5
View File
@@ -35,7 +35,7 @@
</ul>
<div class="navbar-center text-white m-auto">
<span id="date-time" class="font-weight-bold"></span>
{{-- <span id="date-time" class="font-weight-bold"></span> --}}
</div>
<ul class="navbar-nav">
@@ -117,13 +117,14 @@
{{ auth()->user()->getMyCabangAndRegion()['cabang'] }}
</span>
</a>
@elseif(Auth::guard('admin')->user()->getRoleNames()[0] != 'superadmin')
@elseif(Auth::guard('admin')->user()->getRoleNames()[0] != 'Superadmin')
<a class="d-block" style="font-size: 14px;">
<span class="badge badge-primary">
Head Office
</span>
</a>
@endif
<span id="date-time" class="font-weight-bold" style="font-size: 12px;"></span>
</div>
</div>
@include('layouts.partials.sidebar')
@@ -163,16 +164,15 @@
const options = {
timeZone: 'Asia/Jakarta',
weekday: 'long',
year: 'numeric',
month: 'long',
month: 'short',
day: 'numeric',
hour: '2-digit',
minute: '2-digit',
hour12: false // Use 24-hour format
};
dateTimeElement.textContent = new Intl.DateTimeFormat('id-ID', options).format(now) + ' WIB';
dateTimeElement.textContent = new Intl.DateTimeFormat('en-US', options).format(now) + ' WIB';
}
// Update the clock every second