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

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

master^2
root 4 years ago
parent
d7fdf22e56 6b86cc26a3
commit
25d0dfbc16
2 changed files with 49 additions and 186 deletions
Split View Show Diff Stats
  1. 48
    185
      app/Http/Controllers/Api/CompoundResourceController.php
  2. 1
    1
      app/Http/Controllers/Api/LoginController.php

+ 48
- 185
app/Http/Controllers/Api/CompoundResourceController.php View File

@@ -548,7 +548,7 @@ class CompoundResourceController extends BaseController
"receipt" => '-',
"modul" => '03',
"penguatkuasa" => '-',
"cpn_created" => Carbon::now()->toDateTimeString(),
"cpn_created" => Carbon::now(),
];

$file = ConfidentialFile::create($fileData);
@@ -559,7 +559,7 @@ class CompoundResourceController extends BaseController

$compound = Compound::where('jenis_n', $request->jenis)->orWhere('non', $request->non)->first();

info($compound);

if(!empty($compound)) {

@@ -576,6 +576,7 @@ class CompoundResourceController extends BaseController
$compound->nama_syarikat = $request->namaS;
$compound->no_daftar_syarikat = strtolower($request->daftarNo);
$compound->alamat = $request->alamat;
$compound->lokasi_kejadian = $request->alamat_tempat_kesalahan;
// $compound->no_plate = $request->no_plate;
// $compound->no_cukai_jalan = $request->no_cukai_jalan;
// $compound->nama_kawasan = $request->namaKawasan;
@@ -589,9 +590,8 @@ class CompoundResourceController extends BaseController
$compound->dikeluarkan = $staff->_id;
$compound->status = 'Belum Bayar';
$compound->modul = '03';
$compound->no_telefon = $request->tel;
$compound->no_akaun_lesen = $request->lesen;
$compound->created_c = Carbon::now()->toDateTimeString();
$compound->created_c = Carbon::now();


}elseif($request->jenis == 'Pelbagai_JPB'){
@@ -603,6 +603,7 @@ class CompoundResourceController extends BaseController
$compound->nama_syarikat = $request->namaS;
$compound->no_daftar_syarikat = strtolower($request->daftarNo);
$compound->alamat = $request->alamat;
$compound->lokasi_kejadian = $request->alamat_tempat_kesalahan;
// $compound->no_plate = $request->no_plate;
// $compound->no_cukai_jalan = $request->no_cukai_jalan;
// $compound->nama_kawasan => $request->namaKawasan;
@@ -616,9 +617,8 @@ class CompoundResourceController extends BaseController
$compound->dikeluarkan = $staff->_id;
$compound->status = 'Belum Bayar';
$compound->modul = '03';
$compound->no_telefon = $request->tel;
$compound->no_akaun_lesen = $request->lesen;
$compound->created_c = Carbon::now()->toDateTimeString();
$compound->created_c = Carbon::now();

}

@@ -686,19 +686,6 @@ class CompoundResourceController extends BaseController
$no_siri ='';
$noticeData = [];

// $countKPD = $this->compound->withTrashed()->count(); //for parking numbering

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

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

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

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

//for compound numbering
@@ -750,7 +737,7 @@ class CompoundResourceController extends BaseController
$no_siri = date('yn').'-'.filter_var($non, FILTER_SANITIZE_NUMBER_INT).'-1';

$noticeData = [
'jenis' => '-',
'jenis' => 'Pelbagai_KT',
'jenis_n' => $request->jenis,
'kpd' => '-',
'non' => $non,
@@ -759,31 +746,25 @@ class CompoundResourceController extends BaseController
'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" => '-',
"catatan" => $request->butiran_kesalahan,
"lokasi_kejadian" => $request->alamat_tempat_kesalahan,
'latlong' => $request->Latlong,
'jbkod_n' => $request->jabatan,
'jbkod' => $request->jabatan,
'akta_n' => $faulty->deed_law_id,
'seksyen_kesalahan_n' => $faulty->_id,
// 'jumlah_asal_kompaun' => $faulty->amount,
// 'jumlah_kemaskini_kompaun' => '-',
'dikeluarkan_n' => $staff->_id,
"status" => 'Belum Bayar',
// "amount_payment" => '-',
// "receipt" => '-',
"modul" => $request->modul,
"penguatkuasa" => '-',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
// "maklumat_tambahan" => $request->butiran_kesalahan,
"tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"created_n" => Carbon::now()->toDateTimeString(),
"tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
"created_n" => Carbon::now(),
];
}elseif($request->jenis == 'Notis_NMH'){

@@ -795,7 +776,7 @@ class CompoundResourceController extends BaseController
$no_siri = date('yn').'-'.filter_var($non, FILTER_SANITIZE_NUMBER_INT).'-2';

$noticeData = [
'jenis' => '-',
'jenis' => 'Pelbagai_JPB',
'jenis_n' => $request->jenis,
'kpd' => '-',
'non' => $non,
@@ -804,31 +785,25 @@ class CompoundResourceController extends BaseController
'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" => '-',
"catatan" => $request->butiran_kesalahan,
"lokasi_kejadian" => $request->alamat_tempat_kesalahan,
'latlong' => $request->Latlong,
'jbkod_n' => $request->jabatan,
'jbkod' => $request->jabatan,
'akta_n' => $faulty->deed_law_id,
'seksyen_kesalahan_n' => $faulty->_id,
// 'jumlah_asal_kompaun' => $faulty->amount,
// 'jumlah_kemaskini_kompaun' => '-',
'dikeluarkan_n' => $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,
// "maklumat_tambahan" => $request->butiran_kesalahan,
"tindakan" => $request->tinadkan,
"tempoh" => $request->tempoh,
"created_n" => Carbon::now()->toDateTimeString(),
"tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
"created_n" => Carbon::now(),
];
}
elseif($request->jenis == 'Notis_NHN'){
@@ -842,7 +817,7 @@ class CompoundResourceController extends BaseController
$no_siri = date('yn').'-'.filter_var($non, FILTER_SANITIZE_NUMBER_INT).'-3';

$noticeData = [
'jenis' => '-',
'jenis' => 'Pelbagai_KT',
'jenis_n' => $request->jenis,
'kpd' => '-',
'non' => $non,
@@ -851,31 +826,25 @@ class CompoundResourceController extends BaseController
'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" => '-',
"catatan" => $request->butiran_kesalahan,
"lokasi_kejadian" => $request->alamat_tempat_kesalahan,
'latlong' => $request->Latlong,
'jbkod_n' => $request->jabatan,
'jbkod' => $request->jabatan,
'akta_n' => $faulty->deed_law_id,
'seksyen_kesalahan_n' => $faulty->_id,
// 'jumlah_asal_kompaun' => $faulty->amount,
// 'jumlah_kemaskini_kompaun' => '-',
'dikeluarkan_n' => $staff->_id,
"status" => 'Belum Bayar',
// "amount_payment" => '-',
// "receipt" => '-',
"modul" => $request->modul,
"penguatkuasa" => '-',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
// "maklumat_tambahan" => $request->butiran_kesalahan,
// "tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"created_n" => Carbon::now()->toDateTimeString(),
"tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
"created_n" => Carbon::now(),
];
}
elseif($request->jenis == 'Notis_PA'){
@@ -888,7 +857,7 @@ class CompoundResourceController extends BaseController
$no_siri = date('yn').'-'.filter_var($non, FILTER_SANITIZE_NUMBER_INT).'-4';

$noticeData = [
'jenis' => '-',
'jenis' => 'Pelbagai_KT',
'jenis_n' => $request->jenis,
'kpd' => '-',
'non' => $non,
@@ -897,32 +866,26 @@ class CompoundResourceController extends BaseController
'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" => '-',
"catatan" => $request->butiran_kesalahan,
"lokasi_kejadian" => $request->alamat_tempat_kesalahan,
'latlong' => $request->Latlong,
'jbkod_n' => $request->jabatan,
'jbkod' => $request->jabatan,
'akta_n' => $faulty->deed_law_id,
'seksyen_kesalahan_n' => $faulty->_id,
// 'jumlah_asal_kompaun' => $faulty->amount,
// 'jumlah_kemaskini_kompaun' => '-',
'dikeluarkan_n' => $staff->_id,
"status" => 'Belum Bayar',
// "amount_payment" => '-',
// "receipt" => '-',
"modul" => $request->modul,
"penguatkuasa" => '-',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
// "maklumat_tambahan" => $request->butiran_kesalahan,
"tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
"created_n" => Carbon::now(),
"bil_haiwan" => $request->bil_haiwan,
"created_n" => Carbon::now()->toDateTimeString(),
];
}elseif($request->jenis == 'Notis_NPPM'){

@@ -934,7 +897,7 @@ class CompoundResourceController extends BaseController
$no_siri = date('yn').'-'.filter_var($non, FILTER_SANITIZE_NUMBER_INT).'-4';

$noticeData = [
'jenis' => '-',
'jenis' => 'Pelbagai_KT',
'jenis_n' => $request->jenis,
'kpd' => '-',
'non' => $non,
@@ -943,31 +906,25 @@ class CompoundResourceController extends BaseController
'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" => '-',
"catatan" => $request->butiran_kesalahan,
"lokasi_kejadian" => $request->alamat_tempat_kesalahan,
'latlong' => $request->Latlong,
'jbkod_n' => $request->jabatan,
'jbkod' => $request->jabatan,
'akta_n' => $faulty->deed_law_id,
'seksyen_kesalahan_n' => $faulty->_id,
// 'jumlah_asal_kompaun' => $faulty->amount,
// 'jumlah_kemaskini_kompaun' => '-',
'dikeluarkan_n' => $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,
// "maklumat_tambahan" => $request->butiran_kesalahan,
"tindakan" => $request->tindakan,
"tempoh" => $request->tempoh,
"created_n" => Carbon::now()->toDateTimeString(),
"tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
"created_n" => Carbon::now(),
];
}

@@ -1077,7 +1034,7 @@ class CompoundResourceController extends BaseController
"receipt" => '-',
"modul" => '03',
"penguatkuasa" => '-',
"created_c" => Carbon::now()->toDateTimeString(),
"created_c" => Carbon::now(),
];
}
if ($request->jenis == 'Pelbagai_KT') {
@@ -1094,13 +1051,10 @@ class CompoundResourceController extends BaseController
'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,
"lokasi_kejadian" => $request->alamat_tempat_pesalah,
"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,
@@ -1113,12 +1067,8 @@ class CompoundResourceController extends BaseController
"receipt" => '-',
"modul" => $request->modul,
"penguatkuasa" => '-',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"tindakan" => '-',
"tempoh" => '-',
"created_c" => Carbon::now()->toDateTimeString(),
"created_c" => Carbon::now(),
];
}
elseif ($request->jenis == 'Pelbagai_JPB') {
@@ -1135,13 +1085,10 @@ class CompoundResourceController extends BaseController
'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,
"lokasi_kejadian" => $request->alamat_tempat_pesalah,
"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,
@@ -1154,94 +1101,10 @@ class CompoundResourceController extends BaseController
"receipt" => '-',
"modul" => $request->modul,
"penguatkuasa" => '-',
"no_telefon" => $request->tel,
"no_akaun_lesen" => $request->lesen,
"maklumat_tambahan" => '-',
"tindakan" => '-',
"tempoh" => '-',
"created_c" => Carbon::now()->toDateTimeString(),
"created_c" => Carbon::now(),
];
}
// elseif ($request->jenis == 'Pelbagai_LESEN') {

// //HN bcs other N stands for notice. compound number no need front N
// $kpd = $this->generateCompoundNumber($request->jenis, 'HN');

// $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-3';

// $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" => '-',
// "created_c" => Carbon::now()->toDateTimeString(),
// ];
// }
// else if($request->jenis == 'Pelbagai_PA'){

// $kpd = $this->generateCompoundNumber($request->jenis, 'PA');

// $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-4';

// $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,
// "cpn_created" => Carbon::now()->toDateTimeString(),
// ];
// }

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

+ 1
- 1
app/Http/Controllers/Api/LoginController.php View File

@@ -88,7 +88,7 @@ class LoginController extends BaseController

//get all notice sections & deedlaws
$notis = array();
$sec_faulty = Faulty::with('DeedLaw', 'Department')->whereIn('itkod', ['33', '9', '8', '10'])->get();
$sec_faulty = Faulty::with('DeedLaw', 'Department')->whereIn('itkod', ['33', '9', '8', '10', '14', '36'])->get();
if(!empty($sec_faulty))
{
foreach ($sec_faulty as $sf)

Write Preview
Loading…
Cancel
Save