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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -548,7 +548,7 @@ class CompoundResourceController extends BaseController
                         "receipt" => '-',
                         "modul" => '03',
                         "penguatkuasa" => '-',
-                        "cpn_created" => Carbon::now(),
+                        "created_c" => Carbon::now()->toISOString(),
                     ];
 
                     $file = ConfidentialFile::create($fileData);
@@ -591,7 +591,7 @@ class CompoundResourceController extends BaseController
                             $compound->status = 'Belum Bayar';
                             $compound->modul = '03';
                             $compound->no_akaun_lesen = $request->lesen;
-                            $compound->created_c = Carbon::now();
+                            $compound->created_c = Carbon::now()->toISOString();
 
 
                         }elseif($request->jenis == 'Pelbagai_JPB'){
@@ -618,7 +618,7 @@ class CompoundResourceController extends BaseController
                             $compound->status = 'Belum Bayar';
                             $compound->modul = '03';
                             $compound->no_akaun_lesen = $request->lesen;
-                            $compound->created_c = Carbon::now();
+                            $compound->created_c = Carbon::now()->toISOString();
 
                         }
 
@@ -677,8 +677,11 @@ class CompoundResourceController extends BaseController
 
             $faulty = Faulty::where('_id',$request->get('seksyen'))->first();
 
+
             if(!empty($faulty)){
 
+                // dd(Carbon::now()->addDays(5)->toISOString());
+
                 $data = array();
 
                 $non = '';
@@ -763,8 +766,8 @@ class CompoundResourceController extends BaseController
                         // "maklumat_tambahan" => $request->butiran_kesalahan,
                         "tindakan" => $request->tindakan,
                         "tempoh" => $request->tempoh,
-                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
-                        "created_n" => Carbon::now(),
+                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh)->toISOString(),
+                        "created_n" => Carbon::now()->toISOString(),
                     ];
                 }elseif($request->jenis == 'Notis_NMH'){
 
@@ -802,8 +805,8 @@ class CompoundResourceController extends BaseController
                         // "maklumat_tambahan" => $request->butiran_kesalahan,
                         "tindakan" => $request->tinadkan,
                         "tempoh" => $request->tempoh,
-                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
-                        "created_n" => Carbon::now(),
+                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh)->toISOString(),
+                        "created_n" => Carbon::now()->toISOString(),
                     ];
                 }
                 elseif($request->jenis == 'Notis_NHN'){
@@ -843,8 +846,8 @@ class CompoundResourceController extends BaseController
                         // "maklumat_tambahan" => $request->butiran_kesalahan,
                         // "tindakan" => $request->tindakan,
                         "tempoh" => $request->tempoh,
-                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
-                        "created_n" => Carbon::now(),
+                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh)->toISOString(),
+                        "created_n" => Carbon::now()->toISOString(),
                     ];
                 }
                 elseif($request->jenis == 'Notis_PA'){
@@ -883,8 +886,8 @@ class CompoundResourceController extends BaseController
                         // "maklumat_tambahan" => $request->butiran_kesalahan,
                         "tindakan" => $request->tindakan,
                         "tempoh" => $request->tempoh,
-                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
-                        "created_n" => Carbon::now(),
+                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh)->toISOString(),
+                        "created_n" => Carbon::now()->toISOString(),
                         "bil_haiwan" => $request->bil_haiwan,
                     ];
                 }elseif($request->jenis == 'Notis_NPPM'){
@@ -923,8 +926,8 @@ class CompoundResourceController extends BaseController
                         // "maklumat_tambahan" => $request->butiran_kesalahan,
                         "tindakan" => $request->tindakan,
                         "tempoh" => $request->tempoh,
-                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh),
-                        "created_n" => Carbon::now(),
+                        "tempoh_tarikh" => Carbon::now()->addDays($request->tempoh)->toISOString(),
+                        "created_n" => Carbon::now()->toISOString(),
                     ];
                 }
 
@@ -981,20 +984,6 @@ class CompoundResourceController extends BaseController
                 $kpd = '';
                 $no_siri ='';
 
-                // $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')
                 {
                     //for compound numbering
@@ -1033,7 +1022,7 @@ class CompoundResourceController extends BaseController
                         "receipt" => '-',
                         "modul" => '03',
                         "penguatkuasa" => '-',
-                        "created_c" => Carbon::now(),
+                        "created_c" => Carbon::now()->toISOString(),
                     ];
                 }
                 if ($request->jenis == 'Pelbagai_KT') {
@@ -1067,7 +1056,7 @@ class CompoundResourceController extends BaseController
                         "modul" => $request->modul,
                         "penguatkuasa" => '-',
                         "no_akaun_lesen" => $request->lesen,
-                        "created_c" => Carbon::now(),
+                        "created_c" => Carbon::now()->toISOString(),
                     ];
                 }
                 elseif ($request->jenis == 'Pelbagai_JPB') {
@@ -1101,7 +1090,7 @@ class CompoundResourceController extends BaseController
                         "modul" => $request->modul,
                         "penguatkuasa" => '-',
                         "no_akaun_lesen" => $request->lesen,
-                        "created_c" => Carbon::now(),
+                        "created_c" => Carbon::now()->toISOString(),
                     ];
                 }