diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php index 920cad3..07c99a3 100644 --- a/app/Http/Controllers/AutoSerahanController.php +++ b/app/Http/Controllers/AutoSerahanController.php @@ -381,6 +381,104 @@ class AutoSerahanController extends Controller )); } + private function updateDenominasiRemove($kodcaw,$denopendser,$jenis){ + $current = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $version = ($jenis == 'pendahuluan') ? 'v3' : 'v2'; + $current_denominasi = $this->checkDenominasi($kodcaw,$version); + + if($jenis == 'pendahuluan'){ + $k1 = ($denopendser['txtring1'] * 1) - $current_denominasi['k1']; + $txtring1 = $denopendser['txtring1'] - $current_denominasi['txtring1']; + $k5 = ($denopendser['txtring5'] * 5) - $current_denominasi['k5']; + $txtring5 = $denopendser['txtring5'] - $current_denominasi['txtring5']; + $k01 = ($denopendser['txtsen1'] * 0.01) - $current_denominasi['k01']; + $txtsen1 = $denopendser['txtsen1'] - $current_denominasi['txtsen1']; + $k05 = ($denopendser['txtsen5'] * 0.05) - $current_denominasi['k05']; + $txtsen5 = $denopendser['txtsen5'] - $current_denominasi['txtsen5']; + $k010 = ($denopendser['txtsen10'] * 0.10) - $current_denominasi['k010']; + $txtsen10 = $denopendser['txtsen10'] - $current_denominasi['txtsen10']; + $k020 = ($denopendser['txtsen20'] * 0.20) - $current_denominasi['k020']; + $txtsen20 = $denopendser['txtsen20'] - $current_denominasi['txtsen20']; + $k050 = ($denopendser['txtsen50'] * 0.50) - $current_denominasi['k050']; + $txtsen50 = $denopendser['txtsen50'] - $current_denominasi['txtsen50']; + $k10 = ($denopendser['txtring10'] * 10) - $current_denominasi['k10']; + $txtring10 = $denopendser['txtring10'] - $current_denominasi['txtring10']; + $k20 = ($denopendser['txtring20'] * 20) - $current_denominasi['k20']; + $txtring20 = $denopendser['txtring20'] - $current_denominasi['txtring20']; + $k50 = ($denopendser['txtring50'] * 50) - $current_denominasi['k50']; + $txtring50 = $denopendser['txtring50'] - $current_denominasi['txtring50']; + $k100 = ($denopendser['txtring100'] * 100) - $current_denominasi['k100']; + $txtring100 = $denopendser['txtring100'] - $current_denominasi['txtring100']; + }else{ + $k1 = $current_denominasi['k1'] + ($denopendser['txtring1'] * 1); + $txtring1 = $current_denominasi['txtring1'] + $denopendser['txtring1']; + $k5 = $current_denominasi['k5'] + ($denopendser['txtring5'] * 5); + $txtring5 = $current_denominasi['txtring5'] + $denopendser['txtring5']; + $k01 = $current_denominasi['k01'] + ($denopendser['txtsen1'] * 0.01); + $txtsen1 = $current_denominasi['txtsen1'] + $denopendser['txtsen1']; + $k05 = $current_denominasi['k05'] + ($denopendser['txtsen5'] * 0.05); + $txtsen5 = $current_denominasi['txtsen5'] + $denopendser['txtsen5']; + $k010 = $current_denominasi['k010'] + ($denopendser['txtsen10'] * 0.10); + $txtsen10 = $current_denominasi['txtsen10'] + $denopendser['txtsen10']; + $k020 = $current_denominasi['k020'] + ($denopendser['txtsen20'] * 0.20); + $txtsen20 = $current_denominasi['txtsen20'] + $denopendser['txtsen20']; + $k050 = $current_denominasi['k050'] + ($denopendser['txtsen50'] * 0.50); + $txtsen50 = $current_denominasi['txtsen50'] + $denopendser['txtsen50']; + $k10 = $current_denominasi['k10'] + ($denopendser['txtring10'] * 10); + $txtring10 = $current_denominasi['txtring10'] + $denopendser['txtring10']; + $k20 = $current_denominasi['k20'] + ($denopendser['txtring20'] * 20); + $txtring20 = $current_denominasi['txtring20'] + $denopendser['txtring20']; + $k50 = $current_denominasi['k50'] + ($denopendser['txtring50'] * 50); + $txtring50 = $current_denominasi['txtring50'] + $denopendser['txtring50']; + $k100 = $current_denominasi['k100'] + ($denopendser['txtring100'] * 100); + $txtring100 = $current_denominasi['txtring100'] + $denopendser['txtring100']; + } + + $totalkeping = $k01 + $k05 + $k010 + $k020 + $k050 + $k1 + $k5 + $k10 + $k20 + $k50 + $k100; + + Denominasi::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()]])->update(array( + 'bd1' => 0, + 'b1'=> 0, + 'bd5'=> 0, + 'b5'=> 0, + 'bd10'=> 0, + 'b10'=> 0, + 'bd20'=> 0, + 'b20'=> 0, + 'bd50'=> 0, + 'b50'=> 0, + 'bd100'=> 0, + 'b100'=> 0, + 'txtring1'=> $txtring1, + 'k1'=> $k1, + 'txtring5'=> $txtring5, + 'k5'=> $k5, + 'txtsen1'=> $txtsen1, + 'k01'=> $k01, + 'txtsen5'=> $txtsen5, + 'k05'=> $k05, + 'txtsen10'=> $txtsen10, + 'k010'=> $k010, + 'txtsen20'=> $txtsen20, + 'k020'=> $k020, + 'txtsen50'=> $txtsen50, + 'k050'=> $k050, + 'txtring10'=> $txtring10, + 'k10'=> $k10, + 'txtring20'=> $txtring20, + 'k20'=> $k20, + 'txtring50'=> $txtring50, + 'k50'=> $k50, + 'txtring100'=> $txtring100, + 'k100'=> $k100, + 'jumlahbundle'=> 0, + 'txtjumlah'=> $totalkeping, + 'jumlahkeping' => $totalkeping + )); + } + public function serahanAutoSerahan(Request $request){ $this->checkVault($request->kodcaw,'v2'); @@ -423,7 +521,7 @@ class AutoSerahanController extends Controller $kodcaw = $this->interchangeCawangan($request->kodcaw,'v3'); - $updated_pendahuluan = $this->autoSerahanRemove('pendahuluan',$kodcaw,$request->amaun,$request->id); + $updated_pendahuluan = $this->autoSerahanRemove('pendahuluan',$kodcaw,$request->amaun,$request->array_approval); return response()->json($updated_pendahuluan); } @@ -446,11 +544,14 @@ class AutoSerahanController extends Controller try{ if($jenis == 'pendahuluan'){ - $approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first(); + $approval = $id; $totalpendahuluan = $pendahuluan - $amaun; $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran; + $denopendser = Denopendser::on('mysql7')->where('no', $approval['denopendser_id_v3'])->get(); + + $this->updateDenominasiRemove($kodcaw,$denopendser,'pendahuluan'); Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( 'pendahuluan' => $totalpendahuluan, @@ -470,6 +571,9 @@ class AutoSerahanController extends Controller $totalserahan = $serahan - $amaun; $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran; + $denopendser = Denopendser::on('mysql7')->where('no', $approval['denopendser_id_v2'])->get(); + + $this->updateDenominasiRemove($kodcaw,$denopendser,'serahan'); Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( 'serahan' => $totalserahan,