fix skit2

app/Http/Controllers/TebusController.php

@@ -17,6 +17,7 @@ use App\Lelong;
 use App\HapusKira;
 use App\Parameter;
 use App\Panjar;
+use App\HargaEmas;
 
 use Illuminate\Http\Request;
 
@@ -76,13 +77,12 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        // $totalnmhargasemasa = $request->tnmhargasemasa;
-
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
 
         $margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
+        // $margin_pembiayaan = round(($gadai_data['bakipjm']/$request->hargasemasa)*100,2);
 
         $nilai_marhun = $gadai_data['nilaimarhun'];
         $total_harga_tebus = 0;
@@ -217,11 +217,13 @@ class TebusController extends Controller
         $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $rebet_round = number_format($rebet_raw,2);
+
         if(strpos($rebet_round,',')){
             $rebet_round = str_replace(',','',$rebet_round);
         }
-        $rebet = (float)substr($rebet_round, 0, -1);
 
+        $rebet = (float)substr($rebet_round, 0, -1);
+        
         return $rebet;
     }
 
@@ -496,12 +498,12 @@ class TebusController extends Controller
         $keuntungansebelumtawarruq = 0;
 
 
-        $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
-            ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>=','2021-03-14')
-            ->whereYear('t_tebus','=',$current->year)
-            ->whereNotNull('rebate')
-            ->sum('rebate');
+        // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
+        //     ->where('t_tebus','<=',$request->tarikh)
+        //     ->where('t_tebus','>=','2021-03-14')
+        //     ->whereYear('t_tebus','=',$current->year)
+        //     ->whereNotNull('rebate')
+        //     ->sum('rebate');
 
         $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
             ->where('t_tebus','<=',$request->tarikh)
@@ -528,7 +530,8 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        $keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah; 
+        $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+
 
         $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;