Merge branch 'apiaku' into 'master'

fix reducing v2 See merge request online-sistem1/api_arrahn!88
2021-04-22 06:30:04 +00:00
parent 735094c345 045b984a08
commit cc1a500dad
2 changed files with 3 additions and 3 deletions
@@ -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;