diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index e577613..7ec1625 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -267,8 +267,7 @@ class GadaiController extends Controller
                     ->first();
 
         if($gadai_data['tempoh'] > 6){
-            $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-            $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
             $upah_semasa_round = number_format($upahsemasa_raw,2);
             $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
         }else{
@@ -276,14 +275,12 @@ class GadaiController extends Controller
                 if($gadai_data['bakiupah'] != 0){
                     $upah_semasa = $gadai_data['bakiupah'];
                 }else{
-                    $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-                    $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
                     $upah_semasa_round = number_format($upahsemasa_raw,2);
                     $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
                 }
             }else{
-                $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-                $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
                 $upah_semasa_round = number_format($upahsemasa_raw,2);
                 $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
             }
@@ -345,8 +342,7 @@ class GadaiController extends Controller
             'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
-            'bakihargajualan' => $baki_hargajualan,
-            'tempohbayar' => $gadai['tempoh']
+            'bakihargajualan' => $baki_hargajualan
         ));
         return response()->json($update_gadai, 200);
     }
@@ -404,8 +400,7 @@ class GadaiController extends Controller
             'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
-            'bakihargajualan' => $baki_hargajualan,
-            'tempohbayar' => $gadai['tempoh']
+            'bakihargajualan' => $baki_hargajualan
         ));
         return response()->json($update_gadai, 200);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 7962e9f..9532af6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -67,8 +67,7 @@ class TebusController extends Controller
                     ->first();
 
         if($gadai_data['tempoh'] > 6){
-            $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-            $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
             $upah_semasa_round = number_format($upahsemasa_raw,2);
             $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
         }else{
@@ -76,14 +75,12 @@ class TebusController extends Controller
                 if($gadai_data['bakiupah'] != 0){
                     $upah_semasa = $gadai_data['bakiupah'];
                 }else{
-                    $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-                    $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
                     $upah_semasa_round = number_format($upahsemasa_raw,2);
                     $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
                 }
             }else{
-                $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-                $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
                 $upah_semasa_round = number_format($upahsemasa_raw,2);
                 $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
             }