diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 60950b0..567441f 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1963,15 +1963,15 @@ class AdminPageController extends Controller break; case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]); break; - case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan']]); + case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan'],'pbfiles' => $stat['files_id']]); break; - case 5: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['jenisbank'],'noresit' => $stat['noresit']]); + case 5: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['jenisbank'],'noresit' => $stat['noresit'],'jeniscit' => $stat['jeniscit'],'namasyarikat' => $stat['nama_cit']]); break; case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]); break; case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]); break; - case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit']]); + case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit'],'invoicefiles' => $stat['invoicefiles_id'],'resitfiles' => $stat['resitfiles_id']]); break; } @@ -2114,7 +2114,7 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 1, - 'kp_id' => $ar_files->id + 'files_id' => $ar_files->id )); $permohonan = Permohonan::where('mohonid',$request->mohonid) @@ -2162,7 +2162,9 @@ class AdminPageController extends Controller 'tagdeposit' => 1, 'tarikh_bankin' => $timeloni->toDateString(), 'jenisbank' => $request->jenisbank, - 'noresit' => $request->noresit + 'noresit' => $request->noresit, + 'jeniscit' => $request->jeniscit, + 'nama_cit' => $request->namacit )); }else{ $status->mohonid = $request->mohonid; @@ -2224,11 +2226,27 @@ class AdminPageController extends Controller $status->tarikhmasa = $timeloni->toDateTimeString(); $status->save(); + $ar_files = new ARFiles; + $ar_files->data = $request->dataresit; + $ar_files->type = $request->resittype; + $ar_files->filename = $request->resitname; + $ar_files->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files->save(); + + $ar_files2 = new ARFiles; + $ar_files2->data = $request->datainvoice; + $ar_files2->type = $request->invoicetype; + $ar_files2->filename = $request->invoicename; + $ar_files2->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files2->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]]) ->update(array( 'tagcit' => 1, 'resit_cit' => $request->resitcit, - 'bank_cit' => $request->bank + 'bank_cit' => $request->bank, + 'resitfiles_id' => $ar_files->id, + 'invoicefiles_id' => $ar_files2->id )); return response()->json(1); diff --git a/app/Pengesahan.php b/app/Pengesahan.php index 76a5011..e373016 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -37,10 +37,11 @@ class Pengesahan extends Model 'tagcit', 'bank_cit', 'komen_batal', - 'kelulusanpbimage', 'resit_cit', 'nama_cit', - 'jeniscit' + 'jeniscit', + 'resitfiles_id', + 'invoicefiles_id' ]; /** diff --git a/app/Permohonan.php b/app/Permohonan.php index d4dd6c5..9071841 100644 --- a/app/Permohonan.php +++ b/app/Permohonan.php @@ -29,9 +29,7 @@ class Permohonan extends Model 'nama_penerima', 'outstandingsemasa', 'nopermohonan', - 'tagterima', - 'resit_id', - 'invoice_id' + 'tagterima' ]; /** diff --git a/routes/web.php b/routes/web.php index b24f2b9..3f465b5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -695,7 +695,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); $router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']); $router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); - $router->put('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); + $router->post('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);