1 ha cambiato i file con 21 aggiunte e 30 eliminazioni
+ 21
- 30
app/Http/Controllers/Api/CompoundController.php
Vedi File
| @@ -1012,47 +1012,39 @@ class CompoundController extends BaseController | |||
| $start = Carbon::now()->startOfDay()->toDateTimeString(); | |||
| $end = Carbon::now()->endOfDay()->toDateTimeString(); | |||
| $compound = Compound::with('ConfidentialFile','Faulty','Department')->where('modul','02') | |||
| $compound = Compound::with('ConfidentialFile','FaultyNotis','Department')->where('modul','02') | |||
| ->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)){ | |||
| $tawaran = ''; | |||
| $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; | |||
| } | |||
| $akta = DeedLaw::where('_id',$c->akta)->first(); | |||
| if($c->jenis == 'Pelbagai'){ | |||
| dd('here'); | |||
| if($c->jenis_n != 'Parkir'){ | |||
| array_push($data, array( | |||
| "no_plate" => $c->no_plate, | |||
| 'nama' => $c->nama, | |||
| 'identity' => $c->identity, | |||
| 'jenis' => $c->jenis_n, | |||
| 'non' => $c->non, | |||
| '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, | |||
| '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' => $c->created_c->format('d/m/Y h:i:s A'), | |||
| 'butiran_kesalahan'=> $c->butiran_kesalahan_n, | |||
| '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'){ | |||
| }else if($c->jenis_n == 'Parkir'){ | |||
| array_push($data, array( | |||
| "no_plate" => $c->no_plate, | |||
| "no_cukai_jalan" => $c->no_cukai_jalan, | |||
| @@ -1063,12 +1055,11 @@ class CompoundController extends BaseController | |||
| "nama_jalan" => $c->nama_jalan, | |||
| "nama_kawasan" => $c->nama_kawasan, | |||
| "no_parking" => $c->no_parking, | |||
| 'jumlah' => $tawaran, | |||
| '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, | |||
| 'created_at' => $c->created_c->format('d/m/Y h:i:s A'), | |||
| '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, | |||
Loading…