From 18dc6d9bd88cf73343c38f8fd5a977986b43db95 Mon Sep 17 00:00:00 2001
From: aiman <aiman.mazlan@pkb.net.my>
Date: Thu, 8 May 2025 16:32:25 +0800
Subject: [PATCH 1/2] Adjust putatan lama interface

---
 resources/views/layouts/app.blade.php | 96 +++++++++++++++++++++++----
 1 file changed, 83 insertions(+), 13 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index cfdcc62..f432ae1 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -8,7 +8,15 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>SISTEM AR-RAHN</title>
+    <title>
+        @if (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227')
+            v2 Putatan Lama
+        @elseif (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238')
+            v2 Putatan Baru
+        @else
+            SISTEM AR-RAHN
+        @endif
+    </title>
 
     <!-- Scripts -->
     <script src="{{ asset('js/app.js') }}" defer></script>
@@ -114,6 +122,10 @@
             border-bottom:none;
         }
 
+        .text-gold {
+            color: gold !important;
+        }
+
     </style>
 
 </head>
@@ -131,21 +143,49 @@
     @endphp
     <div id="app">
         <div id="page_loader" class="not-loading"></div>
-        <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
+        <nav class="navbar navbar-expand-md navbar-light shadow-sm" 
+             style="height:100px; 
+                    background-color: 
+                        {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'red' : 
+                           (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? '#FF6961' : 'white') }};">
             <div class="container">
                 <a class="navbar-brand" href="#" style="cursor:not-allowed;">
-                <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
+                    <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
+                    <span style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : 'white' }}; font-weight: bold;">
+                        @if (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227')
+                            arOS v2
+                        @elseif (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238')
+                            arOS v2
+                        @endif
+                    </span>
                 </a>
+                <!-- Display Time -->
                 <div class="col-2">
-                    <div style="color:#eb2f06;font-weight:bold;" id="displaytime"></div>
+                    <div 
+                        id="displaytime" 
+                        style="color: {{ isset($cawangan_info['kodcaw']) && ($cawangan_info['kodcaw'] == '011227' || $cawangan_info['kodcaw'] == '011238') ? 'gold' : '#eb2f06' }}; font-weight:bold;">
+                    </div>
                 </div>
                 <div class="navbar-brand ml-3">
-                    <b class="text-secondary">Cawangan : </b><span style="color:#1abc9c;font-weight:bold;">{{ $cawangan_info["details_caw"] }}</span>
-                </div>
-                <div class="navbar-brand ml-md-3">
-                    <b class="text-secondary">Kod Cawangan : </b><span style="color:#1abc9c;font-weight:bold;">{{ $cawangan_info['kodcaw'] }}</span>
-                    <input type="text" hidden name="kodcaw" id="kodcaw" value="{{ $cawangan_info['kodcaw'] }}">
+                    <b class="{{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'text-black' : 
+                                (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'text-gold' : 'text-secondary') }}">
+                        Cawangan :
+                    </b>
+                    <span style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : 
+                                       (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : '#1abc9c') }}; font-weight:bold;">
+                        {{ $cawangan_info["details_caw"] }}
+                    </span>
+                    @if (isset($cawangan_info['kodcaw']) && ($cawangan_info['kodcaw'] == '011227' || $cawangan_info['kodcaw'] == '011238'))
+                        <span class="badge badge-info">
+                            @if ($cawangan_info['kodcaw'] == '011227')
+                                Lama
+                            @elseif ($cawangan_info['kodcaw'] == '011238')
+                                Baru
+                            @endif
+                        </span>
+                    @endif
                 </div>
+                
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                     <span class="navbar-toggler-icon"></span>
                 </button>
@@ -164,7 +204,15 @@
                         @php $auth_user = Auth::user(); @endphp
                         @if ($auth_user['roles'] == 'ppc' || $auth_user['roles'] == 'pc')
                             <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
+                                <a id="navbarDropdown" 
+                                   class="nav-link" 
+                                   href="#" 
+                                   role="button" 
+                                   data-toggle="dropdown" 
+                                   aria-haspopup="true" 
+                                   aria-expanded="false" 
+                                   v-pre 
+                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c' }};">
                                     <i id="bell" class="fa fa-bell"></i>
                                 </a>
 
@@ -235,7 +283,15 @@
                             </script>
                         @elseif($auth_user['role_harian'] == 'teller')
                             <li class="nav-item dropdown" style="margin-right:10px;">
-                                <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
+                                <a id="navbarDropdown" 
+                                   class="nav-link" 
+                                   href="#" 
+                                   role="button" 
+                                   data-toggle="dropdown" 
+                                   aria-haspopup="true" 
+                                   aria-expanded="false" 
+                                   v-pre 
+                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c') }};">
                                     <i id="bell" class="fa fa-bell"></i>
                                 </a>
 
@@ -307,7 +363,17 @@
                             @endif
                         @else
                             <li class="nav-item dropdown">
-                                <a id="navbarDropdown" style="color:#1abc9c;font-weight:bold;" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
+                                <!-- User Name at Top Right Corner -->
+                                <a id="navbarDropdown" 
+                                   class="nav-link dropdown-toggle" 
+                                   href="#" 
+                                   role="button" 
+                                   data-toggle="dropdown" 
+                                   aria-haspopup="true" 
+                                   aria-expanded="false" 
+                                   v-pre 
+                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : 
+                                                   (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c') }}; font-weight:bold;">
                                     {{ Auth::user()->name }}
                                 </a>
 
@@ -342,7 +408,11 @@
                                 <div class="col-12 pl-5">
                                     <div class="row">
                                         <h5 class="pr-3">G : <span class="text-success">' .$gadaiNumber. '</span></h5>
-                                        <h5>T : <span class="text-danger">' .$listSerahNumber. '</span></h5>
+                                        <h5>T : 
+                                            <span style="color: '.(isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : 'red').';">
+                                                '.$listSerahNumber.'
+                                            </span>
+                                        </h5>
                                     </div>
                                 </div>
                         </div>';

From f0fa763e819509d9ab77d5294ef060a65d29b8ea Mon Sep 17 00:00:00 2001
From: aiman <aiman.mazlan@pkb.net.my>
Date: Sun, 11 May 2025 09:29:54 +0800
Subject: [PATCH 2/2] Re-adjust the kodcaw to details_caw

---
 resources/views/layouts/app.blade.php | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f432ae1..777e5ed 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -9,9 +9,9 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <title>
-        @if (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227')
+        @if (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan')
             v2 Putatan Lama
-        @elseif (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238')
+        @elseif (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2')
             v2 Putatan Baru
         @else
             SISTEM AR-RAHN
@@ -146,15 +146,15 @@
         <nav class="navbar navbar-expand-md navbar-light shadow-sm" 
              style="height:100px; 
                     background-color: 
-                        {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'red' : 
-                           (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? '#FF6961' : 'white') }};">
+                        {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'red' : 
+                           (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? '#FF6961' : 'white') }};">
             <div class="container">
                 <a class="navbar-brand" href="#" style="cursor:not-allowed;">
                     <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
-                    <span style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : 'white' }}; font-weight: bold;">
-                        @if (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227')
+                    <span style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : 'white' }}; font-weight: bold;">
+                        @if (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan')
                             arOS v2
-                        @elseif (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238')
+                        @elseif (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2')
                             arOS v2
                         @endif
                     </span>
@@ -163,23 +163,23 @@
                 <div class="col-2">
                     <div 
                         id="displaytime" 
-                        style="color: {{ isset($cawangan_info['kodcaw']) && ($cawangan_info['kodcaw'] == '011227' || $cawangan_info['kodcaw'] == '011238') ? 'gold' : '#eb2f06' }}; font-weight:bold;">
+                        style="color: {{ isset($cawangan_info['details_caw']) && ($cawangan_info['details_caw'] == 'Putatan' || $cawangan_info['details_caw'] == 'Putatan 2') ? 'gold' : '#eb2f06' }}; font-weight:bold;">
                     </div>
                 </div>
                 <div class="navbar-brand ml-3">
-                    <b class="{{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'text-black' : 
-                                (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'text-gold' : 'text-secondary') }}">
+                    <b class="{{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'text-black' : 
+                                (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'text-gold' : 'text-secondary') }}">
                         Cawangan :
                     </b>
-                    <span style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : 
-                                       (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : '#1abc9c') }}; font-weight:bold;">
+                    <span style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : 
+                                       (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : '#1abc9c') }}; font-weight:bold;">
                         {{ $cawangan_info["details_caw"] }}
                     </span>
-                    @if (isset($cawangan_info['kodcaw']) && ($cawangan_info['kodcaw'] == '011227' || $cawangan_info['kodcaw'] == '011238'))
+                    @if (isset($cawangan_info['details_caw']) && ($cawangan_info['details_caw'] == 'Putatan' || $cawangan_info['details_caw'] == 'Putatan 2'))
                         <span class="badge badge-info">
-                            @if ($cawangan_info['kodcaw'] == '011227')
+                            @if ($cawangan_info['details_caw'] == 'Putatan')
                                 Lama
-                            @elseif ($cawangan_info['kodcaw'] == '011238')
+                            @elseif ($cawangan_info['details_caw'] == 'Putatan 2')
                                 Baru
                             @endif
                         </span>
@@ -212,7 +212,7 @@
                                    aria-haspopup="true" 
                                    aria-expanded="false" 
                                    v-pre 
-                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c' }};">
+                                   style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c' }};">
                                     <i id="bell" class="fa fa-bell"></i>
                                 </a>
 
@@ -291,7 +291,7 @@
                                    aria-haspopup="true" 
                                    aria-expanded="false" 
                                    v-pre 
-                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c') }};">
+                                   style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c') }};">
                                     <i id="bell" class="fa fa-bell"></i>
                                 </a>
 
@@ -372,8 +372,8 @@
                                    aria-haspopup="true" 
                                    aria-expanded="false" 
                                    v-pre 
-                                   style="color: {{ isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : 
-                                                   (isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011238' ? 'black' : '#1abc9c') }}; font-weight:bold;">
+                                   style="color: {{ isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : 
+                                                   (isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan 2' ? 'black' : '#1abc9c') }}; font-weight:bold;">
                                     {{ Auth::user()->name }}
                                 </a>
 
@@ -409,7 +409,7 @@
                                     <div class="row">
                                         <h5 class="pr-3">G : <span class="text-success">' .$gadaiNumber. '</span></h5>
                                         <h5>T : 
-                                            <span style="color: '.(isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] == '011227' ? 'white' : 'red').';">
+                                            <span style="color: '.(isset($cawangan_info['details_caw']) && $cawangan_info['details_caw'] == 'Putatan' ? 'white' : 'red').';">
                                                 '.$listSerahNumber.'
                                             </span>
                                         </h5>