diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php index 3c0853c..f913927 100644 --- a/app/Http/Controllers/AutoSerahanController.php +++ b/app/Http/Controllers/AutoSerahanController.php @@ -125,7 +125,7 @@ class AutoSerahanController extends Controller $denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v3'])->first(); - $this->updateDenominasi($kodcaw,$denopendser); + $this->updateDenominasi($kodcaw,$denopendser,$jenis); $gldetail = GlDetail::on($cawangan['mysql'])->create([ 'kodcaw' => $kodcaw, @@ -164,7 +164,7 @@ class AutoSerahanController extends Controller $denopendser = DenoPendSer::on('mysql7')->where('no',$pendserid)->first(); - $this->updateDenominasi($kodcaw,$denopendser); + $this->updateDenominasi($kodcaw,$denopendser,$jenis); $gldetail = GlDetail::on($cawangan['mysql'])->create([ 'kodcaw' => $kodcaw, @@ -239,32 +239,59 @@ class AutoSerahanController extends Controller } } - private function updateDenominasi($kodcaw,$denopendser){ + private function updateDenominasi($kodcaw,$denopendser,$jenis){ $current = Carbon::now(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - Log::debug($denopendser); - $k1 = $denopendser['k1']; - $txtring1 = $denopendser['k1'] * 1; - $k5 = $denopendser['k5']; - $txtring5 = $denopendser['k5'] * 5; - $k01 = $denopendser['k01']; - $txtsen1 = $denopendser['k01'] * 0.01; - $k05 = $denopendser['k05']; - $txtsen5 = $denopendser['k05'] * 0.05; - $k010 = $denopendser['k010']; - $txtsen10 = $denopendser['k010'] * 0.10; - $k020 = $denopendser['k020']; - $txtsen20 = $denopendser['k020'] * 0.20; - $k050 = $denopendser['k050']; - $txtsen50 = $denopendser['k050'] * 0.50; - $k10 = $denopendser['k10']; - $txtring10 = $denopendser['k10'] * 10; - $k20 = $denopendser['k20']; - $txtring20 = $denopendser['k20'] * 20; - $k50 = $denopendser['k50']; - $txtring50 = $denopendser['k50'] * 50; - $k100 = $denopendser['k100']; - $txtring100 = $denopendser['k100'] * 100; + + $current_denominasi = $this->checkDenominasi($kodcaw); + + 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;