Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

app/Http/Controllers/TebusController.php

@@ -355,7 +355,6 @@ class TebusController extends Controller
             'kodcaw'=> $kodcaw
         ]);
 
-        
         if($request->jenistebus == 'P'){
             $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah;
             $transaction = Transaction::on('mysql7')->create([
@@ -866,10 +865,11 @@ class TebusController extends Controller
 
         $rebet = Tebus::on($cawangan['mysql'])
                 ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
-                ->where('tebus.t_tebus','>','2021-04-13')
+                // ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
+                ->where('db2.hargajualan','>','0') // tambahan 2021-05-07
                 ->whereNotNull('db2.hargajualan')
-                ->sum('rebate');
+                ->sum('rebate');      
 
         return response($rebet);
     }