diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 8c8b354..1cd22a1 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -225,6 +225,9 @@ class GadaiController extends Controller
         if($request->transaction == 'Ubah Gadai'){
             $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
         }
+
+        $bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->count();
+
         $gadai = Gadai::on($cawangan['mysql'])
             ->where('norujukan','=',$norujukan)
             ->update(array(
@@ -247,7 +250,7 @@ class GadaiController extends Controller
                 't_matang' => $t_matang,
                 't_matang1' => $t_kontrak,
                 'tempoh' => 0.5,
-                'kuantiti' => $request->kuantiti_marhun,
+                'kuantiti' => $bil_marhun,
                 'tagkomuditi' => 0,
                 'upahdibayar' => 0.00,
                 'tempohbayar' => 0.00,
@@ -311,7 +314,7 @@ class GadaiController extends Controller
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = substr($upah_semasa_round, 0, -1);
-	$upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
+	    $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
         return $upah_semasa;
     }
 
@@ -330,6 +333,7 @@ class GadaiController extends Controller
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
         $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+        $upah_rebet = floatval(preg_replace('/[^\d.]/', '', $upah_rebet));
 
         return $upah_rebet;
     }
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 93921d8..203c6a5 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -548,12 +548,7 @@ class LelongController extends Controller
 
         if($lelong)
         {
-            if($lelong['lel1stop'] == 1)
-            {
-                return response(1);
-            }else{
-                return response(0);
-            }
+            return response(1);
         }else{
             return response(0);
         }
diff --git a/routes/web.php b/routes/web.php
index 6349eff..71d9427 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,7 +380,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //Tuntut Baki
     $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']);
-$router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']);
+    $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']);
     $router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']);
     $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
     $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);