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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -391,7 +391,7 @@ class CompoundResourceController extends BaseController
         //check if theres no 001, start fresh with 0001
         if (empty(Compound::where('jenis', $jenis)->where('kpd', $tag.'0001')->first())) {
 
-            $kpd = $tag.'0001';
+            $kpd = '0001';
 
         }
         else{
@@ -742,6 +742,7 @@ class CompoundResourceController extends BaseController
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => 'KT'.$kpd,
+                        'non' => 'NKG'.$kpd,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -782,6 +783,7 @@ class CompoundResourceController extends BaseController
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => 'JPB'.$kpd,
+                        'non' => 'NMH'.$kpd,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -822,7 +824,8 @@ class CompoundResourceController extends BaseController
 
                     $compoundData = [
                         'jenis' => $request->jenis,
-                        'kpd' => 'NPI'.$kpd,
+                        'kpd' => 'NHN'.$kpd,
+                        'non' => 'NHN'.$kpd,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -862,6 +865,7 @@ class CompoundResourceController extends BaseController
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => 'PA'.$kpd,
+                        'non' => 'PA'.$kpd,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -1034,7 +1038,7 @@ class CompoundResourceController extends BaseController
                         "maklumat_tambahan" => '-',
                         "tindakan" => '-',
                         "tempoh" => '-',
-                        "notis_created" => Carbon::now()->toDateTimeString(),
+                        "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
                 elseif ($request->jenis == 'Pelbagai_JPB') {
@@ -1075,7 +1079,7 @@ class CompoundResourceController extends BaseController
                         "maklumat_tambahan" => '-',
                         "tindakan" => '-',
                         "tempoh" => '-',
-                        "notis_created" => Carbon::now()->toDateTimeString(),
+                        "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
                 elseif ($request->jenis == 'Pelbagai_LESEN') {
@@ -1114,7 +1118,7 @@ class CompoundResourceController extends BaseController
                         "no_telefon" => $request->tel,
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
-                        "notis_created" => Carbon::now()->toDateTimeString(),
+                        "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }
                 else if($request->jenis == 'Pelbagai_PA'){
@@ -1154,7 +1158,7 @@ class CompoundResourceController extends BaseController
                         "no_akaun_lesen" => $request->lesen,
                         "maklumat_tambahan" => '-',
                         "bil_haiwan" => $request->bil_haiwan,
-                        "notis_created" => Carbon::now()->toDateTimeString(),
+                        "cpn_created" => Carbon::now()->toDateTimeString(),
                     ];
                 }