diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 4e97892..db4fb98 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -658,10 +658,20 @@ class GadaiController extends Controller
 
         //Outstanding
         $outstanding = Gadai::on($cawangan['mysql'])
-        ->where('sttebus','=','')
-        ->sum('pinjaman');
+       	->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']])
+        ->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]])
+        ->get();
 
-        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
+        $totaloutstanding = 0;
+        foreach($outstanding as $index1=>$os)
+        {
+            if($os['hargajualan'] == null)
+                $totaloutstanding += $os['pinjaman'];
+            else
+                $totaloutstanding += $os['bakipjm'];
+        }
+
+        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $totaloutstanding]);
 
         return response()->json($array_dashboard);
     }
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index c09e025..87b4853 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -424,6 +424,20 @@ class LelongController extends Controller
         return response()->json($tuntutbaki,200);
     }
 
+    public function showTuntutBakiTarikh($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tuntutbaki = TuntutBaki::on($cawangan['mysql'])
+            ->where('tarikh','=', $request->tarikh)
+            ->get();
+
+        return response()->json($tuntutbaki,200);
+    }
+
     public function showTuntutBakiTeller($kodcaw,Request $request){
 
         $current = Carbon::now();
@@ -561,10 +575,10 @@ class LelongController extends Controller
             $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray();
             $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray();
 
-            $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
+            $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
                 'taglel' => 0
             ]);
-            $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([
+            $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([
                 'sttebus' => '',
                 'taglel' => 0
             ]);
diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php
index 5e5cf7d..feb455a 100644
--- a/app/Http/Controllers/TacExpressPaymentController.php
+++ b/app/Http/Controllers/TacExpressPaymentController.php
@@ -26,8 +26,8 @@ class TacExpressPaymentController extends Controller
         $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request';
 
         $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[
-            'apiusername' => 'APIQ4LP5EMKXM',
-            'apipassword' => 'APIQ4LP5EMKXM7CQOX',
+            'apiusername' => 'APIUK330HDAFO',
+            'apipassword' => 'APIUK330HDAFOUK330',
             'senderid' => 'INFO',
             'mobileno' => $mobileno,
             'message'=> $messages,
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 8bb2172..71dc89b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -203,6 +203,10 @@ class TebusController extends Controller
         }
         $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
+	if($upah_semasa <= 0){
+            $upah_semasa = 0;
+        }
+
         return $upah_semasa;
     }
 
@@ -238,6 +242,10 @@ class TebusController extends Controller
             $upah_semasa = str_replace(',','',$upah_semasa);
         }
         $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
+	
+	if($upah_semasa <= 0){
+            $upah_semasa = 0;
+        }
 
         return response()->json($upah_semasa);
     }
@@ -568,8 +576,8 @@ class TebusController extends Controller
         ->whereNotNull('hargajualan')
         ->where('hargajualan','<>','bakihargajualan');
 
-        $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
-        $bilpenebusantawarruq = $tebustawarruq->count();
+        $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
+	$bilpenebusantawarruq = $tebustawarruq->count();
         $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
         $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
 
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 0cd76a5..f64ff7f 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -393,7 +393,7 @@ class TunaiController extends Controller
 
         $teller = Tunai::on($cawangan['mysql'])
                     ->select('kodlaluan')
-                    ->whereRaw('LENGTH(kodlaluan) > 14')
+                    ->whereRaw('LENGTH(kodlaluan) > 10')
                     ->distinct()
                     ->get();
                     
diff --git a/routes/web.php b/routes/web.php
index 578ab7c..6b83392 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -340,6 +340,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('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']);
     $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
     $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);