diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index a95d515..d48f7f2 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -125,9 +125,9 @@ class AliranTunaiController extends Controller
         $totalkeluar = 0;
         $bakiakhir = 0;
 
-        $totalkeluar = $request->pinjaman + $keluar;
+        // $totalkeluar = $request->pinjaman + $keluar;
     
-        $bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
+        $bakiakhir -= $request->pinjaman;
 
 
         //masuk dalam tunai aliran
@@ -170,7 +170,8 @@ class AliranTunaiController extends Controller
              $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
              $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
  
-             $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+            //  $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                $bakiakhir = $bakiakhir + $tebus_detail['bakiupah'] - $tebus_detail['addpinjaman'];
  
              
              $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
@@ -183,7 +184,8 @@ class AliranTunaiController extends Controller
         }else{
  
              $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
-             $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+            //  $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+            $bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
  
              $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                  'kodlaluan' => $tebus_detail['teller'],   
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 6996451..ccdd633 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -155,7 +155,7 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        @if(is_object($gadai_tebus) && is_array($gadai_tebus))
+                                        @if(is_object($gadai_tebus) || is_array($gadai_tebus))
                                         @foreach($gadai_tebus as $gt)
                                         <tr>
                                         <td> {{ $loop->iteration }} </td>
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 2dbd512..b7d13db 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -248,6 +248,18 @@
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            Baki Lelong
+                        </div>
+                        <div class="col-md-8">
+                            @php
+                                $limit_pinjaman_semasa = 0;
+                            @endphp
+                            <input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ number_format($limit_pinjaman_semasa,2) }}">
+                        </div>
+                    </div>
+
                 </div>
 
                 <div class="col-md-6">
@@ -270,6 +282,14 @@
                         </div>
                     </div>
                     
+                    <div class="form-group row">
+                        <div class="col-md-4">
+                            Rugi Lelong
+                        </div>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="nota_semasa" id="nota_semasa" readonly value="{{ $customer_info['nota'] }}">
+                        </div>
+                    </div>
                 </div>
 
                 <div class="col-md-12 mt-md-3 justify-content-between form-group row">