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

resolve conflict

Browse Source
This commit is contained in:
Hafifie PKB
2025-03-16 15:44:34 +08:00
parent d236ca2268
commit 521e52874f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AutoSerahanController.php
+12 -6
View File
@@ -36,8 +36,9 @@ class AutoSerahanController extends Controller
->where('approval_status',"APPROVED") ->where('approval_status',"APPROVED")
->where('action','create') ->where('action','create')
->where('updated_serahan_v2',1) ->where('updated_serahan_v2',1)
->where('updated_pendahuluan_v3',1) ->where('updated_pendahuluan_v3',1);
->get();
$listapproval = optional($listapproval)->first();
$approval = ApprovalWithdrawal::on('mysql7')->create([ $approval = ApprovalWithdrawal::on('mysql7')->create([
'kodcaw' => ($request->version == 'v3') ? $this->interchangeCawangan($request->kodcaw,$request->version) : $request->kodcaw, 'kodcaw' => ($request->version == 'v3') ? $this->interchangeCawangan($request->kodcaw,$request->version) : $request->kodcaw,
@@ -49,10 +50,10 @@ class AutoSerahanController extends Controller
'approval_timestamp' => null, 'approval_timestamp' => null,
'gldetail_id_v3' => $listapproval['gldetail_id_v3'], 'gldetail_id_v3' => $listapproval['gldetail_id_v3'],
'gldetail_id_v2' => isset($request->recno) ? $request->recno : 0, 'gldetail_id_v2' => isset($request->recno) ? $request->recno : 0,
'denopendser_id_v3' => 0, 'denopendser_id_v3' => $listapproval['denopendser_id_v3'],
'denopendser_id_v2' => 0, 'denopendser_id_v2' => $listapproval['denopendser_id_v2'],
'updated_serahan_v2' => 0, 'updated_serahan_v2' => $listapproval['updated_serahan_v2'],
'updated_pendahuluan_v3' => 0, 'updated_pendahuluan_v3' => $listapproval['updated_pendahuluan_v3'],
'created_at' => $current, 'created_at' => $current,
'updated_at' => $current, 'updated_at' => $current,
]); ]);
@@ -119,6 +120,7 @@ class AutoSerahanController extends Controller
'updated_serahan_v2' => 0, 'updated_serahan_v2' => 0,
'updated_pendahuluan_v3' => 0, 'updated_pendahuluan_v3' => 0,
'created_at' => $current, 'created_at' => $current,
'action' => 'create',
'updated_at' => $current, 'updated_at' => $current,
]); ]);
DB::connection('mysql7')->commit(); DB::connection('mysql7')->commit();
@@ -253,6 +255,10 @@ class AutoSerahanController extends Controller
try{ try{
$approval = ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->first(); $approval = ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->first();
if($request->action == 'delete'){
}
if($approval->approval_status == 'PENDING' && $request->sendApproval == 'ACCEPTED'){ if($approval->approval_status == 'PENDING' && $request->sendApproval == 'ACCEPTED'){
$approval->operasi_name = $request->operasi_name; $approval->operasi_name = $request->operasi_name;
$approval->approval_status = 'APPROVED'; $approval->approval_status = 'APPROVED';
routes/web.php
+1
View File
@@ -681,6 +681,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
/* Endpoint for Auto Serahan */ /* Endpoint for Auto Serahan */
$router->get('autoserahan/list',['uses'=>'AutoSerahanController@getAutoSerahan']); $router->get('autoserahan/list',['uses'=>'AutoSerahanController@getAutoSerahan']);
$router->put('autoserahan/approve',['uses'=>'AutoSerahanController@autoSerahanApproval']); $router->put('autoserahan/approve',['uses'=>'AutoSerahanController@autoSerahanApproval']);
$router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']);
$router->post('autoserahan/create',['uses'=>'AutoSerahanController@createAutoSerahan']); $router->post('autoserahan/create',['uses'=>'AutoSerahanController@createAutoSerahan']);
$router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']); $router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']);
$router->put('autoserahan/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']); $router->put('autoserahan/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']);