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

fix imbangduga

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-06-09 17:29:32 +08:00
parent c785af06b3
commit 5e578a1a9a
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+29 -6
View File
@@ -1030,11 +1030,25 @@ class TebusController extends Controller
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
$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('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('t.trans_type','!=','A') ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
$keuntunganreducinga = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->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)
@@ -1043,16 +1057,25 @@ class TebusController extends Controller
$keuntunganansuran = TransaksiKeuntungan::on('mysql7') $keuntunganansuran = 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') ->leftJoin('transaction as trans', function($join)
->where('t.trans_type','=','A') {
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->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('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran);
$total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran);
dd($total);
$total = $keuntungan + $keuntunganreducing + $keuntunganansuran; $total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
// $total = $keuntungan + $keuntunganreducing;
return response($total); return response($total);
} }