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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -489,13 +489,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => '03',
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                     
@@ -508,6 +508,7 @@ class CompoundResourceController extends BaseController
                 $kpd = $request->kpd;
 
                 $compound = Compound::where('jenis', $request->jenis)->where('kpd', $kpd)->first();
+                dd($compound);
                 
                 if (!empty($compound)) {
 
@@ -723,13 +724,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "notis_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }elseif($request->jenis == 'Pelbagai_KT'){
@@ -758,13 +759,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
@@ -798,13 +799,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
@@ -839,13 +840,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
@@ -878,13 +879,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
@@ -985,13 +986,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => '03',
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
@@ -1021,18 +1022,18 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
-                        "tindakan" => '',
-                        "tempoh" => '',
+                        "tindakan" => '-',
+                        "tempoh" => '-',
                         "notis_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
@@ -1062,18 +1063,18 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
-                        "tindakan" => '',
-                        "tempoh" => '',
+                        "tindakan" => '-',
+                        "tempoh" => '-',
                         "notis_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
@@ -1103,13 +1104,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
@@ -1142,13 +1143,13 @@ class CompoundResourceController extends BaseController
                         'akta' => $faulty->deed_law_id,
                         'seksyen_kesalahan' => $faulty->_id,
                         'jumlah_asal_kompaun' => $faulty->amount,
-                        'jumlah_kemaskini_kompaun' => '',
+                        'jumlah_kemaskini_kompaun' => '-',
                         'dikeluarkan' => $staff->_id,
                         "status" => 'Belum Bayar',
-                        "amount_payment" => '',
-                        "receipt" => '',
+                        "amount_payment" => '-',
+                        "receipt" => '-',
                         "modul" => $request->modul,
-                        "penguatkuasa" => '',
+                        "penguatkuasa" => '-',
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',

app/Jobs/StoreCompoundEPBT.php

@@ -90,7 +90,7 @@ class StoreCompoundEPBT implements ShouldQueue
 
             if($epbt_faulty){
 
-                info($epbt_faulty[0]->kesalahan);
+                info($epbt_faulty);
                 
                 $roads = CodeMukim::where('MKM_MNAMA', $compound['nama_kawasan'])->first();
             
@@ -131,7 +131,7 @@ class StoreCompoundEPBT implements ShouldQueue
 
                 array_push($k, 
                         strtoupper($this->kpd),             //no kompaun
-                        'TES' //strtoupper($kod_kompaun),           //kodKompaun
+                        'TES', //strtoupper($kod_kompaun),           //kodKompaun
                         $compound->Deedlaw->akkod,          //kod akta
                         strtoupper($compound->Faulty->nama),  //keterangan kesalahan
                         $compound->created_at->toDateString(), //tarikh