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

Merged in api-laporan-ujrah (pull request #44)

Browse Source 
update api laporan admin
This commit is contained in:
nur amirah zulkipli
2023-12-19 07:28:10 +00:00
parent 0a4bb2f024 5df809d6e7
commit 8737a3b45c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+5 -1
View File
@@ -1044,6 +1044,8 @@ class GadaiController extends Controller
$keuntunganonline = $ansuransonline->sum('trans.bayaran_keuntungan');
$pendahuluanonline = $ansuransonline->sum('trans.bayaran_pembiayaan');
$bilanganonline = $ansuransonline->count();
$ujrahonline = $ansuransonline->sum('trans.ujrah');
$onepercentonline = $ansuransonline->sum('trans.onepercent');
$arrayansuran = [
'totalpendahuluankaunter' => $pendahuluankaunter,
@@ -1054,7 +1056,9 @@ class GadaiController extends Controller
'totalpendahuluanonline' => $pendahuluanonline,
'totalkeuntunganonline' => $keuntunganonline,
'bilanganonline' => $bilanganonline
'bilanganonline' => $bilanganonline,
'totalujrahonline' => $ujrahonline,
'totalonepercentonline' => $onepercentonline
];
return response()->json($arrayansuran,200);
app/Http/Controllers/TebusController.php
+1 -1
View File
@@ -184,7 +184,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus_data = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg','tebus.ujrah','tebus.onepercent','gad.tagbaru')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
// ->join('online_arrahn.customer as cust', function($join)
// {