From 045b984a084ff02d1fa5ec5440cdc3cc0faabcfd Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:29:43 +0800
Subject: [PATCH] fix reducing v2

---
 app/Http/Controllers/TebusController.php | 2 +-
 routes/web.php                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index b96cde6..029a3d3 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -757,7 +757,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
-    
+