From b9f00bb2bf871036bf5e8d26d5b01b6908a64431 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 14 Nov 2022 00:20:16 +0800 Subject: [PATCH] updated for previous issues about tuntutbaki duplicate and customer audit --- app/AkruNet.php | 25 ++ app/Http/Controllers/AdminPageController.php | 251 +++++++++++++++++++ app/Http/Controllers/CustomerController.php | 77 ++++-- app/Http/Controllers/TebusController.php | 201 +++++++++++++-- routes/web.php | 5 +- 5 files changed, 520 insertions(+), 39 deletions(-) create mode 100644 app/AkruNet.php diff --git a/app/AkruNet.php b/app/AkruNet.php new file mode 100644 index 0000000..d8f2c87 --- /dev/null +++ b/app/AkruNet.php @@ -0,0 +1,25 @@ +json($gadai); } + + public function AkruKeuntunganSebenar(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh = new Carbon($request->tarikh); + $year = $current->year; + $month = $tarikh->month; + + $test = Gadai::on($cawangan['mysql']) + ->whereBetween('tempoh',[0.5,1]) + ->where('sttebus','<>','') + ->whereYear('t_gadai',$current->year()) + ->pluck('norujukan'); + + $get_norujukan = Gadai::on($cawangan['mysql']) + ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") + ->whereNotNull('hargajualan') + ->having('result','=',1) + ->whereYear('t_gadai','=',$year) + ->whereMonth('t_gadai','<=',$month) + ->where('sttebus','<>','') + ->pluck('norujukan'); + + $sum_keun_tebus = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->whereIn('trans.norujukan',$get_norujukan) + ->where('transaction.trans_type','T') + ->sum('keuntungan_rebet'); + + $sum_keun_ansuran = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->whereIn('trans.norujukan',$get_norujukan) + ->where('transaction.trans_type','A') + ->sum('bayaran_keuntungan'); + + $total = $sum_keun_tebus + $sum_keun_ansuran; + + + return response()->json($total); + } + + public function getLaporanGadaiAllCaw(Request $request){ + + $cawangan_all = Cawangan::on('mysql7')->get(); + $arraygadai = []; + + foreach($cawangan_all as $index=>$cawangan){ + + + // gadaian + $gadai=Gadai::on($cawangan['mysql']) + ->where([['t_gadai','>=',$request->mula_date],['t_gadai','<=',$request->hingga_date]]); + + $jumlah_gadai = $gadai->sum('pinjaman'); + + $data_gadai = $gadai->get(); + + $nokp_gadai = $gadai->distinct('nokp') ; + $jum_org_gadai = $nokp_gadai->count('nokp'); + + $jum_surat_gadai = $data_gadai->count('norujukan'); + + //penebusan (Tebus + Lelong + Ansuran) + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date); + $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); + + + $tebus = Gadai::on($cawangan['mysql']) + ->where('sttebus','!=','') + ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]); + + $jum_tebus = $tebus->sum('bakipjm'); + // dd($jum_tebus) ; + + $orgtebus = Gadai::on($cawangan['mysql']) + ->where('sttebus','=','T') + ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]); + + $jum_surat_t = $orgtebus->count('norujukan'); + + $nokp_tebus = $orgtebus->distinct('nokp') ; + $jum_org_tebus = $nokp_tebus->count('nokp'); + + + $ansuran = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan', function($join) + { + $join->on('transaction.norujukan', '=', 'transaksi_keuntungan.norujukan'); + $join->on('transaction.created_at', '=', 'transaksi_keuntungan.tarikh_bayaran'); + }) + ->where('trans_type','=','A') + ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) + ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=', $datez]]); + + $jum_ansuran = $ansuran->sum('transaksi_keuntungan.bayaran_pembiayaan'); + + $jum_penebusan = $jum_tebus + $jum_ansuran ; + + + + + //Upah tebus (KEUNTUNGAN) + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date); + $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); + + + $lelongupahsimpan = Lelong::on($cawangan['mysql']) + + ->where([['t_jual','>=',$request->mula_date],['t_jual','<=',$request->hingga_date]]); + + $jum_lelongupahsimpan = $lelongupahsimpan->sum('bakiupah'); + + + + $upahtebus = Tebus::on($cawangan['mysql']) + ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan') + ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',NULL]]) + ->where([['t_tebus','>=',$request->mula_date],['t_tebus','<=',$request->hingga_date]]); + + $jum_upahtebus = $upahtebus->sum('tebus.bakiupah'); + + + $advansur = Advansur::on($cawangan['mysql']) + ->where([['tarikh','>=',$request->mula_date],['tarikh','<=',$request->hingga_date]]); + + $jum_advansur = $advansur->sum('upahDibayar'); + + + + $ansuranupah = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan', function($join) + { + $join->on('transaction.norujukan', '=', 'transaksi_keuntungan.norujukan'); + $join->on('transaction.created_at', '=', 'transaksi_keuntungan.tarikh_bayaran'); + }) + ->where('trans_type','=','A') + ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) + ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]); + + $jum_ansuranupah = $ansuranupah->sum('transaksi_keuntungan.bayaran_keuntungan'); + + + $upahtawarruq = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan', function($join) + { + $join->on('transaction.norujukan', '=', 'transaksi_keuntungan.norujukan'); + $join->on('transaction.created_at', '=', 'transaksi_keuntungan.tarikh_bayaran'); + }) + ->where('trans_type','!=','A') + ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw']) + ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]); + + $jum_upahtawarruq = $upahtawarruq->sum('transaksi_keuntungan.keuntungan_rebet'); + + + $jumlah_upah = $jum_lelongupahsimpan + $jum_upahtebus + $jum_advansur + $jum_upahtawarruq; + $jum_keseluruhan_upah = $jumlah_upah + $jum_ansuranupah; + + $jum_pinjaman_semasa = $jumlah_gadai - $jum_penebusan; + + + //baki awal dan baki akhir + + $myDateMonth = DateTime::createFromFormat('Y-m-d', $request->mula_date); + $month = $myDateMonth->modify('-1 day')->format('m'); + // dd($month); + + $myDateYear = DateTime::createFromFormat('Y-m-d', $request->mula_date); + $year = $myDateYear->format('Y'); + // dd($year); + + if($month == 1){ + $audit = StokAudit1::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 2){ + $audit = StokAudit2::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 3){ + $audit = StokAudit3::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 4){ + $audit = StokAudit4::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 5){ + $audit = StokAudit5::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 6){ + $audit = StokAudit6::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 7){ + $audit = StokAudit7::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 8){ + $audit = StokAudit8::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 9){ + $audit = StokAudit9::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 10){ + $audit = StokAudit10::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 11){ + $audit = StokAudit11::on($cawangan['mysql'])->where('tahun',$year); + }elseif($month == 12){ + $audit = StokAudit12::on($cawangan['mysql'])->where('tahun',$year); + } + + $rekodaudit = $audit->get(); + $bakiawal = $audit->sum('bakipjm'); + $bakiakhir = $bakiawal + $jumlah_gadai - $jum_penebusan; + + //pelanggan baru + $pelanggan_baru = Customer::on('mysql7') + ->where('kodcaw','=',$cawangan['kodcaw']) + ->where([['tarikhdaftar','>=',$request->mula_date],['tarikhdaftar','<=',$request->hingga_date]]); + + $bil_pelanggan_baru = $pelanggan_baru->count('id'); + + + array_push($arraygadai,[ + "data_gadai" => $data_gadai, + "cawangan" => $cawangan['details_caw'], + "cawangankod" => $cawangan['kodcaw'], + "jum_org_gadai" => $jum_org_gadai, + "jumlah_gadai"=> $jumlah_gadai, + "jum_surat_gadai"=>$jum_surat_gadai, + "jum_surat_t" => $jum_surat_t, + "jum_org_tebus" => $jum_org_tebus, + "jum_penebusan" => $jum_penebusan, + "jum_pinjaman_semasa" => $jum_pinjaman_semasa, + "bil_pelanggan_baru" => $bil_pelanggan_baru, + "jumlah_upah" => $jumlah_upah, + "jum_ansuranupah" => $jum_ansuranupah, + "jum_keseluruhan_upah" => $jum_keseluruhan_upah, + "bakiawal" => $bakiawal, + "bakiakhir" => $bakiakhir + ]); + + } + // dd($jum_lelongupahsimpan, $jum_upahtebus, $jum_advansur, $jum_ansuranupah, $jum_upahtawarruq ); + + + return response()->json($arraygadai,200); + + + } } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 5bd40f2..c6d66f1 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -359,24 +359,69 @@ class CustomerController extends Controller } public function customerUpdateKaunter($nokp,Request $request){ - - $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); - $customer_update = Customer::on('mysql7') + + DB::connection('mysql7')->beginTransaction(); + + try{ + $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); + + $customer_info = DB::connection('mysql7')->table('customer') + ->select('kodcaw','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2') + ->where('kplama','=',$nokp) + ->orWhere('kpbaru','=',$nokp) + ->get()->toArray(); + + + $old_data = json_encode($customer_info); + + $customer_update = Customer::on('mysql7') + ->where('kplama','=',$nokp) + ->orWhere('kpbaru','=',$nokp) + ->update(array( + 'telefon' => $request->telefon1, + 'telefon2' => $request->telefon2, + 'kodbank' => $request->kodbank, + 'noakaun' => $request->noakaun, + 'nota' => $request->nota, + 'alamat1' => $request->alamat, + 'poskod' => $request->poskod, + 'koddaerah' => $poskod['koddaerah'], + 'kodnegeri' => $poskod['kodnegeri'] + )); + + if($customer_update) + { + $customer_info_new = DB::connection('mysql7')->table('customer') + ->select('kodcaw','tarikhdaftar','nopelanggan','kpbaru','kplama','nama','t_lahir','jantina','alamat1','poskod','telefon','telefon2') ->where('kplama','=',$nokp) ->orWhere('kpbaru','=',$nokp) - ->update(array( - 'telefon' => $request->telefon1, - 'telefon2' => $request->telefon2, - 'kodbank' => $request->kodbank, - 'noakaun' => $request->noakaun, - 'nota' => $request->nota, - 'alamat1' => $request->alamat, - 'poskod' => $request->poskod, - 'koddaerah' => $poskod['koddaerah'], - 'kodnegeri' => $poskod['kodnegeri'] - )); - - return response()->json($customer_update, 200); + ->get()->toArray(); + + $new_data = json_encode($customer_info_new); + + $audit_customer = DB::connection('mysql7') + ->table('audit_customer') + ->insert([ + 'username' => $request->namateller, + 'old_data' => $old_data, + 'new_data' => $new_data, + 'kodcaw' => $customer_info[0]->kodcaw, + 'created_at' => Carbon::now()->toDateTimeString(), + 'updated_at' => Carbon::now()->toDateTimeString(), + 'customer_name' => $customer_info[0]->nama, + 'customer_nokp' => $nokp, + ]); + } + + DB::connection('mysql7')->commit(); + + return response()->json($customer_update, 200); + + }catch (\Exception $e) { + DB::connection('mysql7')->rollback(); + return response()->json($e->getMessage(),400); + + } } public function customerUpdateKhazanah($nokp,Request $request){ diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5eb2f4b..4cf667a 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -35,6 +35,7 @@ use App\StokAudit10; use App\StokAudit11; use App\StokAudit12; +use App\AkruNet; use Illuminate\Http\Request; @@ -1932,56 +1933,214 @@ class TebusController extends Controller return response(0); } + + public function calculationKeuntunganPenggadai($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + $determine_past = new Carbon($request->tarikh); $date = new Carbon($request->tarikh); + $date_sekarang = clone $date; $month_sebelum = $date->subMonth()->format('m'); - $month_sekarang = $date->format('m'); + $month_sekarang = $date_sekarang->format('m'); $year_generate = $date->format('Y'); - switch($month_sebelum){ - case '01': $audit_backdate = StokAudit1::on($cawangan['mysql'])->where('tahun',$year_generate); + if($determine_past->isToday()) + { + $audit_now = Gadai::on($cawangan['mysql']) + ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); + + $totaltunggakan_now = $audit_now->sum('tunggakan'); + }else{ + + $result_audit_backdate = $this->StokAuditGenerateTerakru($month_sekarang,$cawangan,$year_generate); + $totaltunggakan_now = $result_audit_backdate->sum('upahblmbyar'); + } + + return response()->json($totaltunggakan_now); + + } + + public function StokAuditGenerateTerakru($Month = null, $cawangan = [], $year_generate = null) : Object{ + switch($Month){ + case '01': return $audit_backdate = StokAudit1::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '02': $audit_backdate = StokAudit2::on($cawangan['mysql'])->where('tahun',$year_generate); + case '02': return $audit_backdate = StokAudit2::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '03': $audit_backdate = StokAudit3::on($cawangan['mysql'])->where('tahun',$year_generate); + case '03': return $audit_backdate = StokAudit3::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '04': $audit_backdate = StokAudit4::on($cawangan['mysql'])->where('tahun',$year_generate); + case '04': return $audit_backdate = StokAudit4::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '05': $audit_backdate = StokAudit5::on($cawangan['mysql'])->where('tahun',$year_generate); + case '05': return $audit_backdate = StokAudit5::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '06': $audit_backdate = StokAudit6::on($cawangan['mysql'])->where('tahun',$year_generate); + case '06': return $audit_backdate = StokAudit6::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '07': $audit_backdate = StokAudit7::on($cawangan['mysql'])->where('tahun',$year_generate); + case '07': return $audit_backdate = StokAudit7::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '08': $audit_backdate = StokAudit8::on($cawangan['mysql'])->where('tahun',$year_generate); + case '08': return $audit_backdate = StokAudit8::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '09': $audit_backdate = StokAudit9::on($cawangan['mysql'])->where('tahun',$year_generate); + case '09': return $audit_backdate = StokAudit9::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '10': $audit_backdate = StokAudit10::on($cawangan['mysql'])->where('tahun',$year_generate); + case '10': return $audit_backdate = StokAudit10::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '11': $audit_backdate = StokAudit11::on($cawangan['mysql'])->where('tahun',$year_generate); + case '11': return $audit_backdate = StokAudit11::on($cawangan['mysql'])->where('tahun',$year_generate); break; - case '12': $audit_backdate = StokAudit12::on($cawangan['mysql'])->where('tahun',$year_generate); + case '12': return $audit_backdate = StokAudit12::on($cawangan['mysql'])->where('tahun',$year_generate); break; } + } + + public function CalculationPendapatanTerakru(Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $date = new Carbon($request->tarikh); + + $current = Carbon::now(); + $current = new Carbon(); + $tarikh = new Carbon($request->tarikh); + + $date_sebelum = clone $date; + $determine_past = new Carbon($request->tarikh); + $date_sebelum = $date_sebelum->firstOfMonth(); + $month_sebelum = $date_sebelum->subMonth()->format('m'); + $month_sekarang = $date->format('m'); + $year_generate = $date->format('Y'); + $haripertama = $date->firstOfMonth(); + $haripertama_extension = $haripertama->toDateString(); + $datenow = new Carbon($request->tarikh); + $year = $current->year; + $month = $tarikh->month; - $audit_now = Gadai::on($cawangan['mysql']) + $intmonth_sebelum = (int)$month_sebelum; + $intmonth_sekarang = (int)$month_sekarang; + + $latest_month_akrunet = AkruNet::on($cawangan['mysql']) + ->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); + } + + $get_norujukan = Gadai::on($cawangan['mysql']) + ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") + ->whereNotNull('hargajualan') + ->having('result','=',1) + ->whereYear('t_gadai','=',$year) + ->whereMonth('t_gadai','>',7) + ->whereMonth('t_gadai','<=',$month) + ->where('sttebus','<>','') + ->pluck('norujukan'); + + $sum_keun_tebus = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->whereIn('trans.norujukan',$get_norujukan) + ->where('transaction.trans_type','T') + ->sum('keuntungan_rebet'); + + $sum_keun_ansuran = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->whereIn('trans.norujukan',$get_norujukan) + ->where('transaction.trans_type','A') + ->sum('bayaran_keuntungan'); + + $total = $sum_keun_tebus + $sum_keun_ansuran; + + + if($determine_past->isToday()) + { + $audit_now = Gadai::on($cawangan['mysql']) ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->orderBy('t_gadai', 'ASC') ->orderBy('sirig', 'ASC'); - $totaltunggakan_now = $audit_now->sum('tunggakan'); - $totaltunggakan_sebelum = $audit_backdate->sum('upahblmbyar'); + $totaltunggakan_now = $audit_now->sum('tunggakan'); + $totaltunggakan_sebelum = $result_audit_backdate->sum('upahblmbyar'); + $request_dibina = new \Illuminate\Http\Request([ + 'mula' => $haripertama_extension, + 'hingga' => $datenow->toDateString(), + 'kodcaw' => $request->kodcaw, + ]); + + $calculation_keuntungan_sebenar = $this->untungrugicalculationLejer($request->kodcaw,$request_dibina); + $upah_diterima = $calculation_keuntungan_sebenar->getContent(); + $calculation = $totaltunggakan_sebelum - $upah_diterima; + $accrual_net = $totaltunggakan_now - $calculation; + + }else{ + + + $result_audit_stated = $this->StokAuditGenerateTerakru($month_sekarang,$cawangan,$year_generate); + + $totaltunggakan_now = $result_audit_stated->sum('upahblmbyar'); + $totaltunggakan_sebelum = $result_audit_backdate->sum('upahblmbyar'); + + $request_dibina = new \Illuminate\Http\Request([ + 'mula' => $haripertama_extension, + 'hingga' => $date->endOfMonth()->toDateString(), + 'kodcaw' => $request->kodcaw, + ]); + + $calculation_keuntungan_sebenar = $this->untungrugicalculationLejer($request->kodcaw,$request_dibina); + $calculation_upahsimpan = $this->calculationKeuntunganSebenarLejer($request->kodcaw,$request_dibina); + + $upah_diterima = $calculation_keuntungan_sebenar->getContent() + $calculation_upahsimpan->getContent(); + $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(); + } + } - dd($totaltunggakan_now,$totaltunggakan_sebelum); - - + $total_accrual_net = ($jumlahakru + $accrual_net) - $total; + + return response()->json($total_accrual_net); } } diff --git a/routes/web.php b/routes/web.php index 0aaf9bb..eda1719 100644 --- a/routes/web.php +++ b/routes/web.php @@ -725,8 +725,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('dashboard/aging',['uses'=>'AdminPageController@DashboardAging']); $router->get('laporan/auditcustomer',['uses'=>'AdminPageController@laporanAuditCustomer']); - $router->get('test/keuntungansebenar',['uses'=>'AdminPageController@AkruKeuntunganSebenar']); - $router->get('test/pendapatanterakru',['uses'=>'TebusController@CalculationPendapatanTerakru']); + $router->get('ig/keuntungansebenar',['uses'=>'AdminPageController@AkruKeuntunganSebenar']); + $router->get('ig/pendapatanterakru',['uses'=>'TebusController@CalculationPendapatanTerakru']); $router->get('laporan/serahgadai',['uses'=>'AdminPageController@Laporan_SerahPetiBesiGadai']); $router->get('laporan/serahmarhuntebus',['uses'=>'AdminPageController@Laporan_SerahMarhunTebus']); @@ -734,6 +734,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('tetapan/listbarcode',['uses'=>'AdminPageController@ListBarcodeScannedOperasi']); $router->put('tetapan/listbarcode/update',['uses'=>'AdminPageController@ListBarcodeScannedOperasi_Update']); + $router->get('laporanllcaw/gadai',['uses'=>'AdminPageController@getLaporanGadaiAllCaw']); }); $router->group(['prefix'=>'lelong'], function () use ($router){