KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug#ringkasanterkumpul' into 'master'

Browse Source 
fix ringkasan terkumpul untuk tebus penuh

See merge request online-sistem1/api_arrahn!188
This commit is contained in:
hafifie rahman
2023-03-29 06:26:21 +00:00
parent 05fd79705a e3ff59a66a
commit 770c59a3c6
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+16 -19
View File
@@ -783,7 +783,10 @@ class LaporanController extends Controller
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]])->where('pinjaman','>',0);
$tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
$tebus = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->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);
@@ -792,7 +795,11 @@ class LaporanController extends Controller
//a
$total_gadai = $gadai->sum('pinjaman');
$total_tebus = $tebus->sum('pinjaman');
$total_tebus = $tebus->when(['gad.hargajualan', '!=' ,'gad.bakihargajualan'], function ($query) {
return $query->sum('gad.bakipjm');
}, function ($query) {
return $query->sum('gad.pinjaman');
});
// $total_ansuran = $ansuran->sum('duit_masuk');
// $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
$total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar');
@@ -823,8 +830,8 @@ class LaporanController extends Controller
$bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count();
//f
$data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->get();
$bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->count();
$data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->akhir]])->get();
$bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->akhir]])->count();
$cas_lelong = 0;
$jumlah_lelong = 0;
@@ -844,8 +851,8 @@ class LaporanController extends Controller
}
//g
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
@@ -895,7 +902,7 @@ class LaporanController extends Controller
$totalpendahuluan = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','<=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
->where([['tarikh','>=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
->sum('pendahuluan');
$belanjaam = Panjar::on($cawangan['mysql'])->where('tag','=', 1)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
@@ -1096,22 +1103,12 @@ class LaporanController extends Controller
$totalpenebusan = 0;
foreach($tebus as $index1=>$teb)
{
if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
{
$totalpenebusan += $teb['gadaibakipjm'];
}else{
$totalpenebusan += $teb['pinjaman'];
}
}
//Lelongan Pembiayaan
$totalpenebusan += $pembiayaanlelong;
$totalpenebusan = $total_tebus + $pembiayaanlelong;
array_push($laporan_terkumpul,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
'total_tebus'=>$totalpenebusan,
'total_ansuran'=>$total_ansuran,
'total_ansuranonline'=>$total_ansuranonline,
'bilangan_gadai'=>$bilangan_gadai,