Merge branch 'master' of http://git.swisslink.com.my/SwissLink/sipadu_mbip

app/Http/Controllers/Api/CompoundController.php

@@ -1016,12 +1016,11 @@ class CompoundController extends BaseController
                 ->where('dikeluarkan_n',$staff->_id)->whereBetween('created_n', [$start, $end])->orderBy('created_n','DESC')->get();
 
     		foreach($compound as $c){
-                dd($c);
-    			if(!empty($c->Faulty) && !empty($c->Department)){
 
-	    			$akta = DeedLaw::where('_id',$c->akta)->first();
+    			if(!empty($c->FaultyNotis) && !empty($c->Department)){
+
+                    $akta = DeedLaw::where('_id',$c->akta_n)->first();
 
-                    dd('here');
 	    			if($c->jenis_n != 'Parkir'){
 	    				array_push($data, array(
                             'jenis' => $c->jenis_n,
@@ -1034,9 +1033,9 @@ class CompoundController extends BaseController
                             'lokasi_dikompaun' => $c->lokasi_kejadian,
                             'jabatan' => '['.$c->Department->jbkod.'] '.$c->Department->jnama,
 		    				'akta' => '['.$akta->akkod.'] '.$akta->nama,
-		    				'seksyen_kesalahan' => '['.$c->Faulty->sketr.'] '.$c->Faulty->nama,
+		    				'seksyen_kesalahan' => '['.$c->FaultyNotis->sketr.'] '.$c->FaultyNotis->nama,
 		    				'latlong' => $c->latlong,
-		    				'created_at' => $c->created_c->format('d/m/Y h:i:s A'),
+		    				'created_at' => date('d/m/Y h:i:s A', strtotime($c->created_n)),
 		    				'butiran_kesalahan'=> $c->butiran_kesalahan_n,
 		    				'no_lesen' => $c->no_akaun_lesen,
                             'no_cukai_jalan' => $c->no_cukai_jalan,
@@ -1056,14 +1055,12 @@ class CompoundController extends BaseController
 	    					"nama_kawasan" => $c->nama_kawasan,
 	    					"no_parking" => $c->no_parking,
 		    				'akta' => '['.$akta->akkod.'] '.$akta->nama,
-		    				'seksyen_kesalahan' => '['.$c->Faulty->sketr.'] '.$c->Faulty->nama,
+		    				'seksyen_kesalahan' => '['.$c->FaultyNotis->sketr.'] '.$c->FaultyNotis->nama,
 		    				'latlong' => $c->latlong,
-		    				'created_at' => $c->created_c->format('d/m/Y h:i:s A'),
+		    				'created_at' => date('d/m/Y h:i:s A', strtotime($c->created_n)),
 		    				'non' => $c->non,
 		    				'jabatan' => '['.$c->Department->jbkod.'] '.$c->Department->jnama,
-		    				'amount_before_14' => $c->Faulty->amount_before_14,
-		    				'amount_before_30' => $c->Faulty->amount_before_30,
-		    				'amount' => $c->Faulty->amount,
+		    				'amount' => $c->FaultyNotis->amount,
 		    				'jenis' => $c->jenis,
 		    				'keterangan'=> $c->catatan
 		    			));