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

changes for keuntungan imbangduga

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-06-09 17:00:38 +08:00
parent 6d9e6fb178
commit c785af06b3
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+15 -2
View File
@@ -1032,14 +1032,27 @@ class TebusController extends Controller
$keuntunganreducing = TransaksiKeuntungan::on('mysql7') $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan')
->where('t.trans_type','!=','A')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$total = $keuntungan + $keuntunganreducing; $keuntunganansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan')
->where('t.trans_type','=','A')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
return response($total); return response($total);
} }