diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php index 5567cf5..2f5d5b1 100644 --- a/app/Http/Controllers/AutoSerahanController.php +++ b/app/Http/Controllers/AutoSerahanController.php @@ -95,7 +95,7 @@ class AutoSerahanController extends Controller } } - private function autoSerahanEngine($jenis, $kodcaw,$teller,$amaun,$id,$denopendser_id = 0){ + private function autoSerahanEngine($jenis, $kodcaw,$teller,$amaun,$id){ $current = Carbon::now(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault = Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); @@ -113,7 +113,9 @@ class AutoSerahanController extends Controller try{ $approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first(); - + Log::info('approval'); + Log::debug($id); + Log::debug($approval); if($jenis == 'pendahuluan'){ $totalpendahuluan = $amaun + $pendahuluan; @@ -157,7 +159,7 @@ class AutoSerahanController extends Controller $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran; - $denopendser = DenoPendSer::on('mysql7')->where('no',$denopendser_id)->first(); + $denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v2'])->first(); $this->updateDenominasi($kodcaw,$denopendser); @@ -306,14 +308,14 @@ class AutoSerahanController extends Controller public function pendahuluanAutoSerahan(Request $request){ - $updated_serahan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id); + $updated_serahan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id); return response()->json(['status' => 'success','gldetail_id' => $updated_serahan['gldetail_id']],200); } public function serahanAutoSerahan(Request $request){ - $updated_pendahuluan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id); + $updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id); return response()->json(['status' => 'success','gldetail_id' => $updated_pendahuluan['gldetail_id']],200); } @@ -335,4 +337,9 @@ class AutoSerahanController extends Controller } } + + public function getAutoSerahanApproval(Request $request){ + $query = ApprovalWithdrawal::on('mysql7')->where('kodcaw',$request->kodcaw)->where('id',$request->id)->first(); + return response()->json($query,200); + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 331f254..9792c26 100644 --- a/routes/web.php +++ b/routes/web.php @@ -685,6 +685,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('autoserahan/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']); $router->put('autoserahan/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']); $router->put('autoserahan/setapproval',['uses'=>'AutoSerahanController@SetApprovalWithdrawal']); + $router->get('autoserahan/get',['uses'=>'AutoSerahanController@getAutoSerahanApproval']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){