KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hafifierahman
2022-04-14 11:26:05 +08:00
parent 29848bd243
commit eda10ccfa0
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+24 -6
View File
@@ -1963,15 +1963,15 @@ class AdminPageController extends Controller
break; break;
case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]); case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]);
break; 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; 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; break;
case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]); case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]);
break; break;
case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]); case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]);
break; 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; break;
} }
@@ -2114,7 +2114,7 @@ class AdminPageController extends Controller
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]])
->update(array( ->update(array(
'tagpb' => 1, 'tagpb' => 1,
'kp_id' => $ar_files->id 'files_id' => $ar_files->id
)); ));
$permohonan = Permohonan::where('mohonid',$request->mohonid) $permohonan = Permohonan::where('mohonid',$request->mohonid)
@@ -2162,7 +2162,9 @@ class AdminPageController extends Controller
'tagdeposit' => 1, 'tagdeposit' => 1,
'tarikh_bankin' => $timeloni->toDateString(), 'tarikh_bankin' => $timeloni->toDateString(),
'jenisbank' => $request->jenisbank, 'jenisbank' => $request->jenisbank,
'noresit' => $request->noresit 'noresit' => $request->noresit,
'jeniscit' => $request->jeniscit,
'nama_cit' => $request->namacit
)); ));
}else{ }else{
$status->mohonid = $request->mohonid; $status->mohonid = $request->mohonid;
@@ -2224,11 +2226,27 @@ class AdminPageController extends Controller
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $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]]) $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]])
->update(array( ->update(array(
'tagcit' => 1, 'tagcit' => 1,
'resit_cit' => $request->resitcit, '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); return response()->json(1);
app/Pengesahan.php
+3 -2
View File
@@ -37,10 +37,11 @@ class Pengesahan extends Model
'tagcit', 'tagcit',
'bank_cit', 'bank_cit',
'komen_batal', 'komen_batal',
'kelulusanpbimage',
'resit_cit', 'resit_cit',
'nama_cit', 'nama_cit',
'jeniscit' 'jeniscit',
'resitfiles_id',
'invoicefiles_id'
]; ];
/** /**
app/Permohonan.php
+1 -3
View File
@@ -29,9 +29,7 @@ class Permohonan extends Model
'nama_penerima', 'nama_penerima',
'outstandingsemasa', 'outstandingsemasa',
'nopermohonan', 'nopermohonan',
'tagterima', 'tagterima'
'resit_id',
'invoice_id'
]; ];
/** /**
routes/web.php
+1 -1
View File
@@ -695,7 +695,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); $router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']);
$router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']); $router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']);
$router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); $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']); $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);