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

added lejeram fix untuk keuntungan_sebenar tambahan ansuran dan akru 1persen dan ujrah tambahan untuk accumulative

Browse Source
This commit is contained in:
Hafifie PKB
2024-05-26 13:36:30 +08:00
parent 9c40ff9b55
commit bb567e0f6a
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+18 -3
View File
@@ -1268,12 +1268,25 @@ class LaporanController extends Controller
$sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
$sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran;
$get_norujukan_ansuran = 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)
->whereDate('t_gadai','>=',$request->mula)->whereDate('t_gadai','<=',$request->hingga)
->where('sttebus','=','')
->where('tagbaru','=',1)
->pluck('norujukan');
$summation_ansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');
$total_keuntungan_sebenar = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
/* End Keuntungan Sebenar Calculation */
/* Start Keuntungan Semasa Calculation */
$get_norujukan = Gadai::on($cawangan['mysql'])
->whereNotNull('hargajualan')->pluck('norujukan');
->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')->where('tagbaru',0)->having('result','=',0)->pluck('norujukan');
$summation = Transaction::on('mysql7')
->selectRaw("SUM(CASE WHEN (transaction.trans_type) <> 'A' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
@@ -1297,7 +1310,9 @@ class LaporanController extends Controller
$sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;
$sum_bayaran = ($summation) ? $summation[0]['sum_bayaran'] : 0;
$total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong) - $total_keuntungan_sebenar;
// $total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong) - $total_keuntungan_sebenar;
$total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong);
/* End Keuntungan Semasa Calculation */
$array_keuntungan = ['keuntungan_sebenar' => $total_keuntungan_sebenar, 'keuntungan_semasa' => $total_keuntungan_semasa];