muadzmi02
/
sipadu_mbip
forked from SwissLink/sipadu_mbip
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

modul 02

master
Siti Rahayu 5 years ago
parent
119ba4f7ff
commit
10daf9c0f7
2 changed files with 255 additions and 7 deletions
Split View Show Diff Stats
  1. 254
    7
      app/Http/Controllers/Api/CompoundResourceController.php
  2. 1
    0
      routes/api.php

+ 254
- 7
app/Http/Controllers/Api/CompoundResourceController.php View File

@@ -58,14 +58,20 @@ class CompoundResourceController extends BaseController
}

$compound = Compound::where('jenis', $jenis)->whereBetween('created_at', array($start, $end));
if($modul == 'All'){
$compound = $compound;
}else if($modul == '06-07'){
$compound = $compound->where(function($q){
$q->where(function($query){
$query->where('modul', '06')->orWhere('modul','07');
});
// $q->where(function($query){
$q->where('modul', '06')->orWhere('modul','07');
// });
});
}else if(($modul == '03') || ($modul == '02')){
$compound = $compound->where(function($q){
// $q->where(function($query){
$q->where('modul', '02')->orWhere('modul', '03');
// });
});
}else {
$compound = $compound->where('modul', $modul);
@@ -92,6 +98,10 @@ class CompoundResourceController extends BaseController
$query->where('modul', '06')->orWhere('modul','07');
});
});
}else if($modul == '03'){
$compound = $compound->where(function($q){
$q->where('modul', '02')->orWhere('modul', '03');
});
}else {
$compound = $compound->where('modul', $modul);
}
@@ -106,6 +116,7 @@ class CompoundResourceController extends BaseController
}

private function filterCompoundByEnforcer($enforcer,$jenis,$modul,$status,$start_date,$end_date){

if(!empty($start_date)){
$compound = $this->searchCompoundAll($jenis,$modul,$status,$start_date,$end_date);
}else{
@@ -208,7 +219,7 @@ class CompoundResourceController extends BaseController
// $per_page = '';
// $kpd = '';

// $modul = 'All';
// $modul = '02';
// $status = 'All';
// $jenis = 'Pelbagai_JPB';
// if(!empty($request->department)){
@@ -216,8 +227,8 @@ class CompoundResourceController extends BaseController
// }else {
// $department = [];
// }
// $start_date = '2020-07-18';
// $end_date = '2020-08-14';
// $start_date = '2020-08-18';
// $end_date = '2020-09-20';

// $enforcer = 'All';
// $faulty = 'All';
@@ -779,6 +790,242 @@ class CompoundResourceController extends BaseController
}
}

/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function storeCompound(Request $request)
{

$staff = Staff::with('StaffDetail')->where('api_token',$request->api_token)->first();
if(empty($staff)){
return $this->sendError('Invalid', 'Staff not existed');
}else {

$data = array();

$faulty = Faulty::where('_id',$request->get('seksyen'))->first();
if(!empty($faulty)){
$countKPD = $this->compound->withTrashed()->count();

do {
$countKPD = $countKPD + 1;
} while (Compound::where("kpd", "=", 'KP'.$countKPD)->first() instanceof Compound);

$kpd = $countKPD;
$no_siri = date('yn').'-'.$countKPD;

$fileData = [
'no_siri' => $no_siri,
];

if($request->jenis == 'Parkir')
{

//only for compound parkir
$compoundData = [
'jenis' => 'Parkir',
'kpd' => $kpd,
'nama' => '-',
'identity' => '-',
'alamat' => '-',
"no_plate" => strtolower($request->no_plate),
"no_cukai_jalan" => $request->noCukaijalan,
"jenis_kenderaan" => $request->jenisKenderaan,
"model_kenderaan" => $request->modelKenderaan,
"warna_kenderaan" => $request->warnakenderaan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"no_parking" => $request->noParking,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
'jbkod' => $request->jabatan,
'akta' => $faulty->deed_law_id,
'seksyen_kesalahan' => $faulty->_id,
'jumlah_asal_kompaun' => $faulty->amount,
'jumlah_kemaskini_kompaun' => '',
'dikeluarkan' => $staff->_id,
"status" => 'Belum Bayar',
"amount_payment" => '',
"receipt" => '',
"modul" => '03',
"penguatkuasa" => '',
"cpn_created" => Carbon::now()->toDateTimeString(),
];
}
if ($request->jenis == 'Pelbagai_KT') {
$compoundData = [
'jenis' => $request->jenis,
'kpd' => $kpd,
'nama' => $request->namaP,
'identity' => $request->noIc,
'nama_syarikat' => $request->namaS,
'no_daftar_syarikat' => strtolower($request->daftarNo),
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
'jbkod' => $request->jabatan,
'akta' => $faulty->deed_law_id,
'seksyen_kesalahan' => $faulty->_id,
'jumlah_asal_kompaun' => $faulty->amount,
'jumlah_kemaskini_kompaun' => '',
'dikeluarkan' => $staff->_id,
"status" => 'Belum Bayar',
"amount_payment" => '',
"receipt" => '',
"modul" => $request->modul,
"penguatkuasa" => '',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"notis_created" => Carbon::now()->toDateTimeString(),
];
}
elseif ($request->jenis == 'Pelbagai_JPB') {
$compoundData = [
'jenis' => $request->jenis,
'kpd' => $kpd,
'nama' => $request->namaP,
'identity' => $request->noIc,
'nama_syarikat' => $request->namaS,
'no_daftar_syarikat' => strtolower($request->daftarNo),
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
'jbkod' => $request->jabatan,
'akta' => $faulty->deed_law_id,
'seksyen_kesalahan' => $faulty->_id,
'jumlah_asal_kompaun' => $faulty->amount,
'jumlah_kemaskini_kompaun' => '',
'dikeluarkan' => $staff->_id,
"status" => 'Belum Bayar',
"amount_payment" => '',
"receipt" => '',
"modul" => $request->modul,
"penguatkuasa" => '',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"notis_created" => Carbon::now()->toDateTimeString(),
];
}
elseif ($request->jenis == 'Pelbagai_LESEN') {
$compoundData = [
'jenis' => $request->jenis,
'kpd' => $kpd,
'nama' => $request->namaP,
'identity' => $request->noIc,
'nama_syarikat' => $request->namaS,
'no_daftar_syarikat' => strtolower($request->daftarNo),
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
'jbkod' => $request->jabatan,
'akta' => $faulty->deed_law_id,
'seksyen_kesalahan' => $faulty->_id,
'jumlah_asal_kompaun' => $faulty->amount,
'jumlah_kemaskini_kompaun' => '',
'dikeluarkan' => $staff->_id,
"status" => 'Belum Bayar',
"amount_payment" => '',
"receipt" => '',
"modul" => $request->modul,
"penguatkuasa" => '',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"notis_created" => Carbon::now()->toDateTimeString(),
];
}
else if($request->jenis == 'Pelbagai_PA'){
$compoundData = [
'jenis' => $request->jenis,
'kpd' => $kpd,
'nama' => $request->namaP,
'identity' => $request->noIc,
'nama_syarikat' => $request->namaS,
'no_daftar_syarikat' => strtolower($request->daftarNo),
'alamat' => $request->alamat,
"no_plate" => $request->no_plate,
"no_cukai_jalan" => $request->no_cukai_jalan,
"nama_kawasan" => $request->namaKawasan,
"nama_taman" => $request->namaTaman,
"nama_jalan" => $request->namaJalan,
"catatan" => $request->catatan,
"lokasi_kejadian" => '-',
'latlong' => $request->Latlong,
'jbkod' => $request->jabatan,
'akta' => $faulty->deed_law_id,
'seksyen_kesalahan' => $faulty->_id,
'jumlah_asal_kompaun' => $faulty->amount,
'jumlah_kemaskini_kompaun' => '',
'dikeluarkan' => $staff->_id,
"status" => 'Belum Bayar',
"amount_payment" => '',
"receipt" => '',
"modul" => $request->modul,
"penguatkuasa" => '',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"bil_haiwan" => $request->bil_haiwan,
"notis_created" => Carbon::now()->toDateTimeString(),
];
}
$file = ConfidentialFile::create($fileData);
$saved = $file->compound()->create($compoundData);
}

if($saved){
// $compound = Compound::with('ConfidentialFile')->where('kpd',$kpd)->first();
// if(!empty($compound)){
dispatch(new UpdateCompoundPrice($kpd));
// $tawaran = '';
// if($compound->jumlah_kemaskini_kompaun != ''){
// $tawaran = $compound->jumlah_kemaskini_kompaun;
// }else{
// $tawaran = $compound->jumlah_asal_kompaun;
// }
$this->dispatch(new StoreCompound($request->all(), $kpd, $staff->_id, $no_siri));
array_push($data, array('kpd' => $kpd));
// $this->dispatch(new StoreCompoundEPBT($request->all(), $kpd, $staff->StaffDetail->full_name, $staff->StaffDetail->no_badan, $faulty->nama));

return $this->sendResponse($data, 'Berjaya simpan rekod kompaun!');
// }
}
}
}


/**
* Display the specified resource.

+ 1
- 0
routes/api.php View File

@@ -27,6 +27,7 @@ Route::group(['middleware' => 'mobileapps'], function() {
Route::post('/mobile/staff/notice/today/list', 'Api\CompoundController@viewNoticeToday');
Route::post('/mobile/store/compound', 'Api\CompoundResourceController@store');
Route::post('/mobile/store/notice', 'Api\CompoundResourceController@storeNotice');
Route::post('/mobile/store', 'Api\CompoundResourceController@storeCompound');
Route::post('/mobile/store/compound/picture', 'Api\CompoundController@storeCompoundAttachment');
Route::post('/mobile/store/acceptance/compound', 'Api\CompoundController@storeAcceptanceCompound');
/*-------------------------------------------------------------------------

Write Preview
Loading…
Cancel
Save