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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -594,25 +594,20 @@ class CompoundResourceController extends BaseController
                         "status" => 'Belum Bayar',
                         "amount_payment" => '',
                         "receipt" => '',
-                        "modul" => '03',
+                        "modul" => $request->modul,
                         "penguatkuasa" => '',
                     ];
                 }elseif($request->jenis == 'Pelbagai_KT'){
                     $compoundData = [
-                        'jenis' => 'Parkir',
+                        'jenis' => $request->jenis,
                         '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,
+                        '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,
                         "catatan" => $request->catatan,
                         "lokasi_kejadian" => '-',
                         'latlong' => $request->Latlong,
@@ -625,25 +620,25 @@ class CompoundResourceController extends BaseController
                         "status" => 'Belum Bayar',
                         "amount_payment" => '',
                         "receipt" => '',
-                        "modul" => '03',
+                        "modul" => $request->modul,
                         "penguatkuasa" => '',
+                        "no_telefon" => $request->tel,
+                        "no_akaun_lesen" => $request->lesen,
+                        "maklumat_tambahan" => '-',
+                        "tindakan" => $request->tindakan,
+                        "tempoh" => $request->tempoh,
                     ];
                 }elseif($request->jenis == 'Pelbagai_JPB'){
                     $compoundData = [
-                        'jenis' => 'Parkir',
+                        'jenis' => $request->jenis,
                         '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,
+                        '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,
                         "catatan" => $request->catatan,
                         "lokasi_kejadian" => '-',
                         'latlong' => $request->Latlong,
@@ -656,26 +651,26 @@ class CompoundResourceController extends BaseController
                         "status" => 'Belum Bayar',
                         "amount_payment" => '',
                         "receipt" => '',
-                        "modul" => '03',
+                        "modul" => $request->modul,
                         "penguatkuasa" => '',
+                        "no_telefon" => $request->tel,
+                        "no_akaun_lesen" => $request->lesen,
+                        "maklumat_tambahan" => '-',
+                        "tindakan" => $request->tindakan,
+                        "tempoh" => $request->tempoh,
                     ];
                 }
                 elseif($request->jenis == 'Pelbagai_LESEN'){
                     $compoundData = [
-                        'jenis' => 'Parkir',
+                        'jenis' => $request->jenis,
                         '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,
+                        '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,
                         "catatan" => $request->catatan,
                         "lokasi_kejadian" => '-',
                         'latlong' => $request->Latlong,
@@ -688,26 +683,24 @@ class CompoundResourceController extends BaseController
                         "status" => 'Belum Bayar',
                         "amount_payment" => '',
                         "receipt" => '',
-                        "modul" => '03',
+                        "modul" => $request->modul,
                         "penguatkuasa" => '',
+                        "no_telefon" => $request->tel,
+                        "no_akaun_lesen" => $request->lesen,
+                        "tempoh" => $request->tempoh,
                     ];
                 }
                 elseif($request->jenis == 'Pelbagai_PA'){
                     $compoundData = [
-                        'jenis' => 'Parkir',
+                        'jenis' => $request->jenis,
                         '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,
+                        '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,
                         "catatan" => $request->catatan,
                         "lokasi_kejadian" => '-',
                         'latlong' => $request->Latlong,
@@ -720,8 +713,11 @@ class CompoundResourceController extends BaseController
                         "status" => 'Belum Bayar',
                         "amount_payment" => '',
                         "receipt" => '',
-                        "modul" => '03',
+                        "modul" => $request->modul,
                         "penguatkuasa" => '',
+                        "no_telefon" => $request->tel,
+                        "no_akaun_lesen" => $request->lesen,
+                        "bil_haiwan" => $request->bil_haiwan,
                     ];
                 }
 

app/Jobs/StoreCompoundEPBT.php

@@ -293,10 +293,15 @@ class StoreCompoundEPBT implements ShouldQueue
                         $urlQueryString = $urlQueryString . 'KompaunDetails[]=' . $k[$i];
                         // bla/bla/my/registerkompaunDetails?KompaunDetails[]=KP45&KompaunDetails[]=ayu
                     }
-                    
 
-                    $client = new \GuzzleHttp\Client();
-                    $result = $client->request('GET', 'http://218.208.81.239:81/appsepbtkompaun_ws/registerkompaun/registerkompaunDetails' . $urlQueryString);
+                    try {
+                        $client = new \GuzzleHttp\Client();
+                        $result = $client->request('GET', 'http://218.208.81.239:81/appsepbtkompaun_ws/registerkompaun/registerkompaunDetails' . $urlQueryString);
+                    } catch (Throwable $e) {
+                        report($e);
+
+                        return true;
+                    }
 
                 }
                 else