change routes and fix sort of function
This commit is contained in:
@@ -411,7 +411,7 @@ class AutoSerahanController extends Controller
|
|||||||
|
|
||||||
$kodcaw = $this->interchangeCawangan($request->kodcaw,'v2');
|
$kodcaw = $this->interchangeCawangan($request->kodcaw,'v2');
|
||||||
|
|
||||||
$updated_serahan = $this->autoSerahanRemove('pendahuluan',$kodcaw,$request->amaun,$request->id);
|
$updated_serahan = $this->autoSerahanRemove('serahan',$kodcaw,$request->amaun,$request->array_approval);
|
||||||
|
|
||||||
return response()->json($updated_serahan);
|
return response()->json($updated_serahan);
|
||||||
|
|
||||||
@@ -445,9 +445,9 @@ class AutoSerahanController extends Controller
|
|||||||
DB::connection('mysql7')->beginTransaction();
|
DB::connection('mysql7')->beginTransaction();
|
||||||
|
|
||||||
try{
|
try{
|
||||||
$approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first();
|
|
||||||
|
|
||||||
if($jenis == 'pendahuluan'){
|
if($jenis == 'pendahuluan'){
|
||||||
|
$approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first();
|
||||||
|
|
||||||
$totalpendahuluan = $pendahuluan - $amaun;
|
$totalpendahuluan = $pendahuluan - $amaun;
|
||||||
|
|
||||||
$bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
|
$bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
|
||||||
@@ -458,13 +458,15 @@ class AutoSerahanController extends Controller
|
|||||||
'bakieod' => $bakiakhir
|
'bakieod' => $bakiakhir
|
||||||
));
|
));
|
||||||
|
|
||||||
DenoPendSer::where('no', $approval['denopendser_id_v2'])->delete();
|
GlDetail::on($cawangan['mysql'])->where('recno', $approval['gldetail_id_v3'])->delete();
|
||||||
GlDetail::where('recno', $approval['gldetail_id_v3'])->delete();
|
DenoPendSer::on('mysql7')->where('no', $approval['denopendser_id_v2'])->delete();
|
||||||
|
|
||||||
ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
|
ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
|
||||||
'updated_pendahuluan_v3' => 1,
|
'updated_pendahuluan_v3' => 1,
|
||||||
));
|
));
|
||||||
}else{
|
}else{
|
||||||
|
$approval = $id;
|
||||||
|
|
||||||
$totalserahan = $serahan - $amaun;
|
$totalserahan = $serahan - $amaun;
|
||||||
|
|
||||||
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
|
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
|
||||||
@@ -475,8 +477,8 @@ class AutoSerahanController extends Controller
|
|||||||
'bakieod' => $bakiakhir
|
'bakieod' => $bakiakhir
|
||||||
));
|
));
|
||||||
|
|
||||||
DenoPendSer::where('no', $approval['denopendser_id_v2'])->delete();
|
GlDetail::on($cawangan['mysql'])->where('recno', $approval['gldetail_id_v2'])->delete();
|
||||||
GlDetail::where('recno', $approval['gldetail_id_v2'])->delete();
|
DenoPendSer::on('mysql7')->where('no', $approval['denopendser_id_v2'])->delete();
|
||||||
|
|
||||||
ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
|
ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
|
||||||
'updated_serahan_v2' => 1,
|
'updated_serahan_v2' => 1,
|
||||||
|
|||||||
+2
-2
@@ -686,8 +686,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$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']);
|
||||||
$router->put('autoserahan/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']);
|
$router->put('autoserahan/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']);
|
||||||
$router->put('autoserahan/delete/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']);
|
$router->put('autoserahan/delete/pendahuluan',['uses'=>'AutoSerahanController@removeAutoPendahuluan']);
|
||||||
$router->put('autoserahan/delete/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']);
|
$router->put('autoserahan/delete/serahan',['uses'=>'AutoSerahanController@removeAutoSerahan']);
|
||||||
$router->put('autoserahan/setapproval',['uses'=>'AutoSerahanController@SetApprovalWithdrawal']);
|
$router->put('autoserahan/setapproval',['uses'=>'AutoSerahanController@SetApprovalWithdrawal']);
|
||||||
$router->get('autoserahan/get',['uses'=>'AutoSerahanController@getAutoSerahanApproval']);
|
$router->get('autoserahan/get',['uses'=>'AutoSerahanController@getAutoSerahanApproval']);
|
||||||
$router->get('autoserahan/checkapproval',['uses'=>'AutoSerahanController@checkProsesApproval']);
|
$router->get('autoserahan/checkapproval',['uses'=>'AutoSerahanController@checkProsesApproval']);
|
||||||
|
|||||||
Reference in New Issue
Block a user