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

Merge branch 'apiaku' into 'master'

Browse Source 
fix reducing v2

See merge request online-sistem1/api_arrahn!88
This commit is contained in:
hafifie rahman
2021-04-22 06:30:04 +00:00
parent 735094c345 045b984a08
commit cc1a500dad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+1 -1
View File
@@ -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;
routes/web.php
+2 -2
View File
@@ -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