diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 0b601d8..c6a5197 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -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); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 96ccf44..a0d3952 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -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); }