From a2f1ea2a54b30713378ce3b1ba7f459ed1212dc8 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 3 May 2023 00:47:55 +0800
Subject: [PATCH]  fix khazanah noic with kplama, ordering for norujukan and
 aliran tunai will show who working in that days.

---
 app/Http/Controllers/KhazanahController.php | 6 +++++-
 resources/views/customers/info.blade.php    | 3 ++-
 resources/views/khazanah/info.blade.php     | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 05b803a..13638e4 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -323,7 +323,11 @@ class KhazanahController extends Controller
         $arrayaddtunai = [];
 
 
-        $teller = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json();
+        // $teller = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json();
+
+        $teller = User::select('name as kodlaluan')->where('cawangan',$auth_user['cawangan'])
+        ->whereIn('roles',['teller','ppc','pc','khazanah'])
+        ->get()->toArray();
 
         foreach($teller as $index1 => $ls)
         {
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index fbb0577..16b9e3d 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -489,7 +489,8 @@
     });
 
     var tablegadai = $('#myTable').DataTable({
-        "scrollX": false
+        "scrollX": false,
+        order: [[1,'desc']]
     });
 
     var xtawarruq = $('#xtawarruq').DataTable({
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index 29b6431..a57efff 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -246,7 +246,7 @@
                                     No KP
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] }}" class='form-control'>
+                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -447,7 +447,8 @@
 
 
     var tablegadai = $('#myTable').DataTable({
-        "scrollX": true
+        "scrollX": true,
+        order: [[1,'desc']]
     });
 
     var xtawarruq = $('#xtawarruq').DataTable({