added denopendser in function
This commit is contained in:
@@ -95,7 +95,7 @@ class AutoSerahanController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
private function autoSerahanEngine($jenis, $kodcaw,$teller,$amaun,$id){
|
||||
private function autoSerahanEngine($jenis, $kodcaw,$teller,$amaun,$id,$denopendser_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,11 +113,12 @@ 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'){
|
||||
|
||||
$pendserid = empty($approval) ? $denopendser_id : $approval['denopendser_id_v3'];
|
||||
|
||||
$totalpendahuluan = $amaun + $pendahuluan;
|
||||
|
||||
$bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
|
||||
@@ -137,7 +138,7 @@ class AutoSerahanController extends Controller
|
||||
'date_created' => $current
|
||||
]);
|
||||
|
||||
DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v3'])->update(array(
|
||||
DenoPendSer::on('mysql7')->where('no',$pendserid)->update(array(
|
||||
'recno' => $gldetail->id,
|
||||
'update' => 1
|
||||
));
|
||||
@@ -155,11 +156,13 @@ class AutoSerahanController extends Controller
|
||||
|
||||
}else if($jenis == 'serahan'){
|
||||
|
||||
$pendserid = empty($approval) ? $denopendser_id : $approval['denopendser_id_v2'];
|
||||
|
||||
$totalserahan = $amaun + $serahan;
|
||||
|
||||
$bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
|
||||
|
||||
$denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v2'])->first();
|
||||
$denopendser = DenoPendSer::on('mysql7')->where('no',$pendserid)->first();
|
||||
|
||||
$this->updateDenominasi($kodcaw,$denopendser);
|
||||
|
||||
@@ -308,14 +311,14 @@ class AutoSerahanController extends Controller
|
||||
|
||||
public function serahanAutoSerahan(Request $request){
|
||||
|
||||
$updated_serahan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id);
|
||||
$updated_serahan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
|
||||
|
||||
return response()->json(['status' => 'success','gldetail_id' => $updated_serahan['gldetail_id']],200);
|
||||
}
|
||||
|
||||
public function pendahuluanAutoSerahan(Request $request){
|
||||
|
||||
$updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id);
|
||||
$updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
|
||||
|
||||
return response()->json(['status' => 'success','gldetail_id' => $updated_pendahuluan['gldetail_id']],200);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user