diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 4cf667a..24a1428 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -2023,22 +2023,6 @@ class TebusController extends Controller ->where('tahun','=',$year_generate) ->latest('bulan')->first(); - - $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan; - - if($calculate_month > 1){ - - }else if($calculate_month == 1){ - - $jumlahakru = AkruNet::on($cawangan['mysql']) - ->sum('jumlah'); - - }else if($calculate_month <= 0){ - $jumlahakru = AkruNet::on($cawangan['mysql']) - ->where('bulan','<',$intmonth_sekarang) - ->sum('jumlah'); - } - if($year_generate == 2022 && $intmonth_sebelum > 4) { $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate); @@ -2075,7 +2059,26 @@ class TebusController extends Controller ->sum('bayaran_keuntungan'); $total = $sum_keun_tebus + $sum_keun_ansuran; + + $calculate_month = (int)$month_sekarang - $latest_month_akrunet->bulan; + if($calculate_month > 1){ + return 'ERR_MONTH_SEBELUM'; + }else if($calculate_month == 1){ + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->sum('jumlah'); + }else if($calculate_month < 0){ + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->where('bulan','<=',$intmonth_sekarang) + ->sum('jumlah'); + + return response()->json($jumlahakru); + }else if($calculate_month == 0) + { + $jumlahakru = AkruNet::on($cawangan['mysql']) + ->where('bulan','<',$intmonth_sekarang) + ->sum('jumlah'); + } if($determine_past->isToday()) { @@ -2099,6 +2102,31 @@ class TebusController extends Controller $calculation = $totaltunggakan_sebelum - $upah_diterima; $accrual_net = $totaltunggakan_now - $calculation; + if($calculate_month <= 1){ + $available_akru = AkruNet::on($cawangan['mysql']) + ->where('bulan', (int)$month_sekarang) + ->get()->toArray(); + + if(sizeof($available_akru) == 0) + { + $akrunet = new AkruNet(); + $akrunet->setConnection($cawangan['mysql']); + $akrunet->tahun = $current->year; + $akrunet->bulan = $tarikh->month; + $akrunet->jumlah = ($accrual_net - $total); + $akrunet->save(); + }else{ + if($available_akru[0]['jumlah'] !== ($accrual_net - $total)) + { + AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang) + ->update(['jumlah' => ($accrual_net - $total)]); + } + + } + } + + $total_accrual_net = $jumlahakru + ($accrual_net - $total); + }else{ @@ -2120,26 +2148,25 @@ class TebusController extends Controller $calculation = $totaltunggakan_sebelum - $upah_diterima; $accrual_net = $totaltunggakan_now - $calculation; - } - - if($calculate_month <= 1){ - $available_akru = AkruNet::on($cawangan['mysql']) - ->where('bulan', (int)$month_sekarang) - ->get()->toArray(); - - if(sizeof($available_akru) == 0) - { - $akrunet = new AkruNet(); - $akrunet->setConnection($cawangan['mysql']); - $akrunet->tahun = $current->year; - $akrunet->bulan = $tarikh->month; - $akrunet->jumlah = $accrual_net; - $akrunet->save(); + if($calculate_month <= 1){ + $available_akru = AkruNet::on($cawangan['mysql']) + ->where('bulan', (int)$month_sekarang) + ->get()->toArray(); + + if(sizeof($available_akru) == 0) + { + $akrunet = new AkruNet(); + $akrunet->setConnection($cawangan['mysql']); + $akrunet->tahun = $current->year; + $akrunet->bulan = $tarikh->month; + $akrunet->jumlah = ($accrual_net - $total); + $akrunet->save(); + } } + + $total_accrual_net = $jumlahakru + ($accrual_net - $total); } - $total_accrual_net = ($jumlahakru + $accrual_net) - $total; - return response()->json($total_accrual_net); }