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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -689,6 +689,7 @@ class CompoundResourceController extends BaseController
 
                 $data = array();
 
+                $non = '';
                 $kpd = '';
                 $no_siri ='';
 
@@ -746,13 +747,14 @@ class CompoundResourceController extends BaseController
                 }elseif($request->jenis == 'Pelbagai_KT'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'KT');
+                    $non = 'NKG'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT);
 
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-1';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => $kpd,
-                        'non' => 'NKG'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
+                        'non' => $non,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -787,13 +789,14 @@ class CompoundResourceController extends BaseController
                 }elseif($request->jenis == 'Pelbagai_JPB'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'JPB');
+                    $non = 'NMH'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT);
 
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-2';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => $kpd,
-                        'non' => 'NMH'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
+                        'non' => $non,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -830,13 +833,14 @@ class CompoundResourceController extends BaseController
 
                     //HN bcs other N stands for notice. compound number no need front N
                     $kpd = $this->generateCompoundNumber($request->jenis, 'HN');
+                    $non = 'NHN'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT);
 
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-3';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => $kpd,
-                        'non' => 'NHN'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
+                        'non' => $non,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -870,13 +874,14 @@ class CompoundResourceController extends BaseController
                 elseif($request->jenis == 'Pelbagai_PA'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'PA');
+                    $non = 'PA'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT);
 
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-4';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
                         'kpd' => $kpd,
-                        'non' => 'PA'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
+                        'non' => $non,
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
@@ -927,7 +932,9 @@ class CompoundResourceController extends BaseController
                     //         $tawaran = $compound->jumlah_asal_kompaun;
                     //     }
                         $this->dispatch(new StoreNotice($request->all(), $kpd, $staff->_id, $no_siri));
-                        array_push($data, array('kpd' => $kpd));
+
+                        //mobile already accept 'kpd' string, so no need to change string name to 'notis'. 
+                        array_push($data, array('kpd' => $non));
 
                         return $this->sendResponse($data, 'Berjaya simpan rekod notis!');
                     // }