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

fix conflict yang second

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-06-20 15:38:15 +08:00
parent 12408dbdd1 c620d015d9
commit c19ccd1f31
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+3 -5
View File
@@ -1000,10 +1000,9 @@ class TebusController extends Controller
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as trans', function($join)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1017,7 +1016,7 @@ class TebusController extends Controller
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as trans', function($join)
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1029,8 +1028,7 @@ class TebusController extends Controller
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$total = $bukanansuran + $ansuran + $keuntungan;
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
return response($total);
}