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

app/Http/Controllers/Api/CompoundResourceController.php

                 }
 
             }while(!empty(Compound::where('jenis', $jenis)->where('kpd', $tag.$kpd)->first())); 
+
         }
 
+        //return kpd with tag 
+        $kpd = $tag . $kpd;
+
         return $kpd;
     }
 
     * Store a newly created notice
     *
     **/
-    public function storeNotice(Request $request)
+    public function storeNewNotice(Request $request)
     {
         $staff = Staff::with('StaffDetail')->where('api_token',$request->api_token)->first();
 
 
                     $compoundData = [
                         'jenis' => $request->jenis,
-                        'kpd' => 'KT'.$kpd,
-                        'non' => 'NKG'.$kpd,
+                        'kpd' => $kpd,
+                        'non' => 'NKG'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
                 }elseif($request->jenis == 'Pelbagai_JPB'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'JPB');
-
+                    
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-2';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
-                        'kpd' => 'JPB'.$kpd,
-                        'non' => 'NMH'.$kpd,
+                        'kpd' => $kpd,
+                        'non' => 'NMH'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
                 elseif($request->jenis == 'Pelbagai_LESEN'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'NHN');
-
+                    
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-3';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
-                        'kpd' => 'NHN'.$kpd,
-                        'non' => 'NHN'.$kpd,
+                        'kpd' => $kpd,
+                        'non' => 'NHN'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,
                 elseif($request->jenis == 'Pelbagai_PA'){
 
                     $kpd = $this->generateCompoundNumber($request->jenis, 'PA');
-
+                    
                     $no_siri = date('yn').'-'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT).'-4';
 
                     $compoundData = [
                         'jenis' => $request->jenis,
-                        'kpd' => 'PA'.$kpd,
-                        'non' => 'PA'.$kpd,
+                        'kpd' => $kpd,
+                        'non' => 'PA'.filter_var($kpd, FILTER_SANITIZE_NUMBER_INT),
                         'nama' => $request->namaP,
                         'identity' => $request->noIc,
                         'nama_syarikat' => $request->namaS,

app/Jobs/UpdateCompoundPrice.php

         // invididu Kompoun
         if($this->kpd != 'null'){
             $compound = Compound::with('ConfidentialFile')->where('kpd', $this->kpd)->first();
+        
             $file = ConfidentialFile::with(['Memo' => function($q){
                 $q->orderBy('updated_at','ASC');
             }])->where('no_siri',$compound->ConfidentialFile->no_siri)->first();

routes/api.php

     Route::post('/mobile/staff/compound/today/list', 'Api\CompoundController@viewCompoundToday');
     Route::post('/mobile/staff/notice/today/list', 'Api\CompoundController@viewNoticeToday');
     Route::post('/mobile/store/compound', 'Api\CompoundResourceController@store');
-    Route::post('/mobile/store/notice', 'Api\CompoundResourceController@storeNotice');
+    Route::post('/mobile/store/notice', 'Api\CompoundResourceController@storeNewNotice');
     Route::post('/mobile/store', 'Api\CompoundResourceController@storeNewCompound');
     Route::post('/mobile/store/compound/picture', 'Api\CompoundController@storeCompoundAttachment');
     Route::post('/mobile/store/acceptance/compound', 'Api\CompoundController@storeAcceptanceCompound');