fix laporan penebusan tambahan online
This commit is contained in:
@@ -1037,7 +1037,7 @@ class GadaiController extends Controller
|
||||
|
||||
$dateans = new Carbon($request->tarikh);
|
||||
|
||||
$ansurans = Transaction::on('mysql7')
|
||||
$ansuranskaunter = Transaction::on('mysql7')
|
||||
->leftJoin('transaksi_keuntungan as trans', function($join)
|
||||
{
|
||||
$join->on('transaction.norujukan', '=', 'trans.norujukan');
|
||||
@@ -1045,13 +1045,29 @@ class GadaiController extends Controller
|
||||
})
|
||||
->where('transaction.kodcaw','=',$kodcaw)
|
||||
->where('transaction.trans_type','=','A')
|
||||
->where('transaction.teller','<>','Online')
|
||||
->whereDate('transaction.created_at','=',$dateans);
|
||||
|
||||
$keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
|
||||
$pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
|
||||
$bilangan = $ansurans->count();
|
||||
$ansuransonline = Transaction::on('mysql7')
|
||||
->leftJoin('transaksi_keuntungan as trans', function($join)
|
||||
{
|
||||
$join->on('transaction.norujukan', '=', 'trans.norujukan');
|
||||
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
|
||||
})
|
||||
->where('transaction.kodcaw','=',$kodcaw)
|
||||
->where('transaction.trans_type','=','A')
|
||||
->where('transaction.teller','=','Online')
|
||||
->whereDate('transaction.created_at','=',$dateans);
|
||||
|
||||
$arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan];
|
||||
$keuntungankaunter = $ansuranskaunter->sum('trans.bayaran_keuntungan');
|
||||
$pendahuluankaunter = $ansuranskaunter->sum('trans.bayaran_pembiayaan');
|
||||
$bilangankaunter = $ansuranskaunter->count();
|
||||
|
||||
$keuntunganonline = $ansuransonline->sum('trans.bayaran_keuntungan');
|
||||
$pendahuluanonline = $ansuransonline->sum('trans.bayaran_pembiayaan');
|
||||
$bilanganonline = $ansuransonline->count();
|
||||
|
||||
$arrayansuran = ['totalpendahuluankaunter' => $pendahuluankaunter, 'totalkeuntungankaunter' => $keuntungankaunter, 'bilangankaunter' => $bilangankaunter,'totalpendahuluanonline' => $pendahuluanonline, 'totalkeuntunganonline' => $keuntunganonline, 'bilanganonline' => $bilanganonline];
|
||||
|
||||
return response()->json($arrayansuran,200);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user