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

fix laporan penebusan tambahan online

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-10-11 14:42:43 +08:00
parent 1371c1d518
commit 7d1c009e2f
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+21 -5
View File
@@ -1037,7 +1037,7 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh); $dateans = new Carbon($request->tarikh);
$ansurans = Transaction::on('mysql7') $ansuranskaunter = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function($join) ->leftJoin('transaksi_keuntungan as trans', function($join)
{ {
$join->on('transaction.norujukan', '=', 'trans.norujukan'); $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -1045,13 +1045,29 @@ class GadaiController extends Controller
}) })
->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A') ->where('transaction.trans_type','=','A')
->where('transaction.teller','<>','Online')
->whereDate('transaction.created_at','=',$dateans); ->whereDate('transaction.created_at','=',$dateans);
$keuntungan = $ansurans->sum('trans.bayaran_keuntungan'); $ansuransonline = Transaction::on('mysql7')
$pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan'); ->leftJoin('transaksi_keuntungan as trans', function($join)
$bilangan = $ansurans->count(); {
$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); return response()->json($arrayansuran,200);
} }
app/Http/Controllers/TebusController.php
+11 -5
View File
@@ -893,13 +893,19 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$listadvansur = Advansur::on($cawangan['mysql']) $listadvansurkaunter = Advansur::on($cawangan['mysql'])
->where('tarikh','=',$request->tarikh); ->where([['tarikh','=',$request->tarikh],['teller','<>','Online']]);
$countadvansur = $listadvansur->count(); $listadvansuronline = Advansur::on($cawangan['mysql'])
$totaladvansur = $listadvansur->sum('upahdibayar'); ->where([['tarikh','=',$request->tarikh],['teller','=','Online']]);
$arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur]; $countadvansurkaunter = $listadvansurkaunter->count();
$totaladvansurkaunter = $listadvansurkaunter->sum('upahdibayar');
$countadvansuronline = $listadvansuronline->count();
$totaladvansuronline = $listadvansuronline->sum('upahdibayar');
$arrayadvansur = ['bilkaunter' => $countadvansurkaunter, 'totalkaunter' => $totaladvansurkaunter,'bilonline' => $countadvansuronline, 'totalonline' => $totaladvansuronline];
return response()->json($arrayadvansur,200); return response()->json($arrayadvansur,200);
} }