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

fix conflict

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-06-20 15:30:28 +08:00
parent 42b83449f1
commit 12408dbdd1
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+1 -2
View File
@@ -49,10 +49,9 @@ class LaporanController extends Controller
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.trans_type','=','A')
->groupBy('trans.id')
->sum('keuntungan_rebet');
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
app/Http/Controllers/TebusController.php
+2 -4
View File
@@ -1003,7 +1003,7 @@ class TebusController extends Controller
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
->join('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1017,7 +1017,7 @@ class TebusController extends Controller
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
->join('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1032,8 +1032,6 @@ class TebusController extends Controller
$total = $bukanansuran + $ansuran + $keuntungan;
// $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
return response($total);
}