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

app/Http/Controllers/Api/CompoundController.php

@@ -938,36 +938,30 @@ 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 == 'Pelbagai'){
+	    			if($c->jenis != 'Parkir'){
 	    				array_push($data, array(
-	    					"no_plate" => $c->no_plate,
-		    				'nama' => $c->nama,
-		    				'identity' => $c->identity,
+	    					'jenis' => $c->jenis,
+                            'kpd' => $c->kpd,
+                            'nama' => $c->nama,
+                            'identity' => $c->identity,
+                            'alamat' => $c->alamat,
 		    				'nama_syarikat' => $c->nama_syarikat,
 		    				'no_daftar_syarikat' => $c->no_daftar_syarikat,
-		    				'alamat' => $c->alamat,
-		    				'jumlah' => $tawaran,
+							'lokasi_dikompaun' => $c->lokasi_kejadian,
+							'nama_kawasan' => $c->nama_kawasan,
+							'nama_taman' => $c->nama_taman,
+							'nama_jalan' => $c->nama_jalan,
+                            'jabatan' => '['.$c->Department->jbkod.'] '.$c->Department->jnama,
 		    				'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'),
-		    				'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,
-		    				'no_telefon' => $c->no_telefon,
+		    				'created_at' => date('d/m/Y h:i:s A', strtotime($c->created_c)),
+		    				'butiran_kesalahan'=> $c->butiran_kesalahan,
 		    				'no_lesen' => $c->no_akaun_lesen,
-		    				'lokasi_dikompaun' => $c->lokasi_kejadian,
-		    				'no_cukai_jalan' => $c->no_cukai_jalan,
+                            'no_cukai_jalan' => $c->no_cukai_jalan,
+                            'tempoh' => $c->tempoh,
+                            'tindakan' => $c->tindakan,
+                            'bilangan_anjing' => $c->bil_haiwan ?? '0',
 		    			));
 	    			}else if($c->jenis == 'Parkir'){
 	    				array_push($data, array(
@@ -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,
 		    			));
 	    			}
 	    		}