fix

app/Http/Controllers/GadaiController.php

@@ -3421,14 +3421,14 @@ class GadaiController extends Controller
             $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
             foreach($gadai_all as $index=>$gadai){
                 $totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
-                $upah6bln_raw = $gadai['bakiupah'];
+                $upah6bln_raw = $gadai['bakiupah'] - 0.2;
 
                 $upah6bln_round = number_format($upah6bln_raw,2);
                 $upah6bln = substr($upah6bln_round, 0, -1);
-                //$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
-		if(strpos($upah6bln,',')){
-           		 $upah6bln = str_replace(',','',$upah6bln);
-       		 }
+
+		        if(strpos($upah6bln,',')){
+           		    $upah6bln = str_replace(',','',$upah6bln);
+       		    }
 
 
                 if($totalbayaran >= $upah6bln){

app/Http/Controllers/TebusController.php

@@ -216,6 +216,22 @@ class TebusController extends Controller
         return response()->json($harga_tebus);
     }
 
+    public function hargaTebusNotTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $upah_semasa = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+
+        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
+
+        return $harga_tebus;
+    }
+
     public function getMoratorium(){
         $bln_mora = Moratorium::first();
 
@@ -410,9 +426,14 @@ class TebusController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
+        if($gadai['hargajualan'] == null){
+            $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
+            $upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+        }else{
+            $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
+            $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        }
         $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
-        $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
         $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
 
         $create_tebus = Tebus::on($cawangan['mysql'])->create([