diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2d1584c..b53b472 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -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); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5d17ab3..3eca0fc 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -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) // {