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

Merge branch 'lapfix' into 'master'

Browse Source 
fix keuntungan sebenar

See merge request online-sistem1/api_arrahn!118
This commit is contained in:
arrahn pkb
2021-10-04 17:11:41 +00:00
parent 5b7c0fa3bf 646ffe99b9
commit 3f8af38907
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+25 -16
View File
@@ -949,24 +949,33 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh); $daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1); $daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan_data = TransaksiKeuntungan::on('mysql7') $keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) ->pluck('norujukan');
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0; $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){ $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
if($gadaiData){ // //Keuntungan Selepas Tawarruq
$keuntungan += $keuntunganData['bayaran_keuntungan']; // $keuntungan_data = TransaksiKeuntungan::on('mysql7')
} // // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
} // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
} // ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
// // ->whereNull('db2.hargajualan')
// // ->sum('bayaran_keuntungan');
// ->get();
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
// $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
// if($gadaiData){
// $keuntungan += $keuntunganData['bayaran_keuntungan'];
// }
// }
// }
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql']) // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh) // ->where('t_tebus','<=',$request->tarikh)