compound today

app/Http/Controllers/Api/CompoundController.php

@@ -938,12 +938,6 @@ class CompoundController extends BaseController
 	    			$akta = DeedLaw::where('_id',$c->akta)->first();
 	    			$faulty = Faulty::where('_id',$c->seksyen_kesalahan)->first();
 
-	    			if($c->jumlah_kemaskini_kompaun == ''){
-	    				$tawaran = $c->jumlah_asal_kompaun;
-	    			}else{
-	    				$tawaran = $c->jumlah_kemaskini_kompaun;
-	    			}
-
 	    			if($c->jenis != 'Parkir'){
 	    				array_push($data, array(
 	    					'jenis' => $c->jenis,
@@ -980,18 +974,15 @@ class CompoundController extends BaseController
 	    					"nama_jalan" => $c->nama_jalan,
 	    					"nama_kawasan" => $c->nama_kawasan,
 	    					"no_parking" => $c->no_parking,
-		    				'jumlah' => $tawaran,
+		    				'jumlah' => $c->jumlah_asal_kompaun,
 		    				'akta' => '['.$akta->akkod.'] '.$akta->nama,
 		    				'seksyen_kesalahan' => '['.$c->Faulty->sketr.'] '.$c->Faulty->nama,
 		    				'latlong' => $c->latlong,
-		    				'created_at' => $c->created_at->format('d/m/Y h:i:s A'),
+		    				'created_at' => $c->created_c->format('d/m/Y h:i:s A'),
 		    				'kpd' => $c->kpd,
 		    				'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,
 		    				'jenis' => $c->jenis,
-		    				'keterangan'=> $c->catatan
+		    				'keterangan'=> $c->catatan,
 		    			));
 	    			}
 	    		}