add laporan audit

app/Http/Controllers/LaporanController.php

@@ -22,6 +22,8 @@ use App\GlDetail;
 use App\Audit;
 use Carbon\Carbon;
 
+use DateTime;
+
 class LaporanController extends Controller
 {
     public function laporanHarian(Request $request){
@@ -809,6 +811,9 @@ class LaporanController extends Controller
     public function LaporanAuditTrail(Request $request)
     {
         $atarray = array();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
         $audittrail = Audit::on('mysql7')
                         ->where('kodcaw','=',$request->kodcaw)
                         ->whereDate('created_at','=',$request->tarikh)
@@ -816,12 +821,35 @@ class LaporanController extends Controller
 
         foreach($audittrail as $index=>$at)
         {
-            $atz = json_decode($at['new_data']);
+            $datetime = new DateTime($at['created_at']);
             
-            dd($atz);
+            $tarikh = $datetime->format('n/j/Y');
+            $masa = $datetime->format('H:i');
+
+            $atnewdata = json_decode($at['new_data'],true);
+            $atolddata = json_decode($at['old_data'],true);
+
+            $nokp = Gadai::on($cawangan['mysql'])->where('norujukan',$at['norujukan'])->pluck('nokp');
+
+            array_push($atarray,[
+                'tarikh' => $tarikh,
+                'masa' => $masa,
+                'users' => $at['users'],
+                'pelulus' => isset($atnewdata['namapelulus']) ? $atnewdata['namapelulus'] : '-',
+                'actions' => $at['actions'],
+                'norujukan' => $at['norujukan'],
+                'kodcaw' => $at['kodcaw'],
+                'oldpinjaman' => isset($atolddata['pinjaman']) ? $atolddata['pinjaman'] : 0,
+                'oldupah' => isset($atolddata['bakiupah']) ? $atolddata['bakiupah'] : 0,
+                'newpinjaman' => isset($atnewdata['pinjaman']) ? $atnewdata['pinjaman'] : 0,
+                'newupah' => isset($atnewdata['bakiupah']) ? $atnewdata['bakiupah'] : 0,
+                'nota' => isset($atnewdata['nota']) ? $atnewdata['nota'] : '-',
+                'nokp' => isset($nokp[0]) ? $nokp[0] : '-',
+                'norujukanasal' => isset($atnewdata['norujukan']) ? $atnewdata['norujukan'] : '-' 
+            ]);
         }
 
-        return response()->json($audittrail);
+        return response()->json($atarray);
     }
 
 }