From 5bc5d286b41704504da6e454931634e955f6fbab Mon Sep 17 00:00:00 2001 From: nurafrinaalimi16 Date: Sun, 14 Jun 2026 15:05:02 +0800 Subject: [PATCH] fix figure on laporan terkumpul --- app/Http/Controllers/LaporanController.php | 41 +++++++++------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 815e6fe..4c3320b 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -804,7 +804,7 @@ $date = new Carbon($request->tarikh); $tebus = Tebus::on($cawangan['mysql']) ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') - ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['tebus.jenistebus','=','T']]); + ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]); $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]); $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw); @@ -834,20 +834,22 @@ $date = new Carbon($request->tarikh); ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.trans_type','=','A') ->where('trans.kodcaw','=',$request->kodcaw) + // ->pluck('trans.norujukan'); // ->groupBy('trans.id') ->sum('bayaran_keuntungan'); - + // dd($total_keuntunganansuran); // $total_ansuran = number_format($total_ansuran,2); $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); - + //b $bilangan_gadai = $gadai->count(); $bilangan_tebus = $tebus->count(); // $bilangan_ansuran = $ansuran->count(); - //$bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count(); - $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count(); + //$bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count() + //$bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count(); + $bilangan_customer_baru = Customer::on('mysql7')->whereBetween('tarikhdaftar', [$request->mula, $request->akhir])->where('kodcaw', $request->kodcaw)->count(); //f $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->akhir]])->get(); @@ -970,33 +972,23 @@ $date = new Carbon($request->tarikh); ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.teller','<>','Online') ->where('trans.trans_type','=','A') - ->where('trans.kodcaw',$request->kodcaw) - ->pluck('transaksi_keuntungan.norujukan'); + ->where('trans.kodcaw',$request->kodcaw); + // ->pluck('transaksi_keuntungan.norujukan'); + - $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan'); + // $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan'); // $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7') // ->whereIn('norujukan',$gadaiDataKaunter) + // ->where('kodcaw',$request->kodcaw) // ->whereDate('tarikh_bayaran','>=',$request->mula) // ->whereDate('tarikh_bayaran','<=',$request->akhir); - // //new update - $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7') - ->leftJoin('transaction as trans', function($join) - { - $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); - $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); - }) - ->whereDate('trans.created_at','>=',$request->mula) - ->whereDate('trans.created_at','<=',$request->akhir) - ->where('trans.teller','<>','Online') - ->where('trans.trans_type','=','A') - ->where('trans.kodcaw',$request->kodcaw) - ->pluck('transaksi_keuntungan.norujukan'); + //dd($keuntunganansuran_kaunter_query->get()->toArray()); - $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan'); - $bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count(); - + $total_keuntunganansuran_kaunter = $total_keuntunganansuran_data_kaunter->sum('bayaran_keuntungan'); + //dd($total_keuntunganansuran_kaunter); + $bil_keuntunganansuran_kaunter = $total_keuntunganansuran_data_kaunter->count(); $total_keuntunganansuran_data_online = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { @@ -1258,6 +1250,7 @@ $date = new Carbon($request->tarikh); 'tarikh' => $tarikh, 'masa' => $masa, 'users' => isset($at['users']) && $at['users'] !== '' ? $at['users'] : '-', + 'users' => isset($at['users']) && $at['users'] !== '' ? $at['users'] : '-', 'pelulus' => isset($atnewdata['namapelulus']) ? $atnewdata['namapelulus'] : '-', 'actions' => $at['actions'], 'norujukan' => $at['norujukan'],