diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 34c96da..3fb93dd 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -783,7 +783,7 @@ class TebusController extends Controller ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') - ->sum('bayaran_keuntungan'); + ->sum('keuntungan_rebet'); $total = $keuntungan + $keuntunganreducing; diff --git a/routes/web.php b/routes/web.php index ff3e100..97b13a2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -191,7 +191,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //LAPORAN API $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif - $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan stokaudit Tak Aktif + $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan takaktif $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']); $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']); @@ -357,7 +357,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //-- Untung Rugi --// $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar - +