diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index f7f443c..84018d0 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -170,7 +170,7 @@ class AliranTunaiController extends Controller
         {
               
              $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
-             $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
+             $totalmasuk = $tebus_detail['bakiupah'] + $masuk;  
  
             //  $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
                 $bakiakhir = $bakiakhir + $tebus_detail['bakiupah'] - $tebus_detail['addpinjaman'];
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 56e7848..d36c132 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -91,7 +91,18 @@ class KhazanahController extends Controller
 
         $listgldetail = Http::get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
 
-        return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail'));
+        $denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        else
+        {
+            $denominasi=$denominasi[0];
+        }
+
+        return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi'));
     }
 
     public function dashboard()
@@ -338,15 +349,6 @@ class KhazanahController extends Controller
 
     }
 
-    ///PANJAR///
-
-    public function panjarlist()
-    {
-
-    }
-
-    ///END PANJAR///
-
 
     ///KELULUSAN///
 
@@ -610,6 +612,8 @@ class KhazanahController extends Controller
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
+        $bakiperubatan = 0;
+
         switch ($request->jenismodal) {
             case "selenggara":
                 $kategori = "Baiki dan Selenggara";
@@ -644,7 +648,7 @@ class KhazanahController extends Controller
             'tag' => $tag,
             'kategori' => $kategori,
             'id' => $auth_user['name'],
-            'bakiperubatan' => "0",
+            'bakiperubatan' => $bakiperubatan,
             'nobaucer' => $request->baucer,
             'nobil' => "3213231",
             'tuntutoleh' => $request->tuntutan    
@@ -1599,7 +1603,10 @@ class KhazanahController extends Controller
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.panjar',compact('cawangan_info','api_url'));
+
+        $usercawangan = User::where('cawangan','=',$auth_user['cawangan'])->get();
+
+        return view('khazanah.panjar',compact('cawangan_info','api_url','usercawangan'));
     }
 
     public function unjuran()
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 2d8d19a..5f07630 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -34,7 +34,6 @@ class LelongController extends Controller
 
         $gadai = $gadaidetail[0][0];
         
-
         return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong'));
     }
     
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php
index 64c8e1c..4e80d87 100644
--- a/resources/views/khazanah/panjar.blade.php
+++ b/resources/views/khazanah/panjar.blade.php
@@ -197,6 +197,12 @@
 
     }
 
+    function panjaransubmit()
+    {
+        let baucer = $('input[name').val();
+        console.log('test');
+    }
+
 </script>
 
 @endsection
diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php
index b3682f6..aec24c3 100644
--- a/resources/views/khazanah/pendahuluanserahanmain.blade.php
+++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php
@@ -32,8 +32,8 @@
                                   <tr>
                                   <td>{{ $gldetail['tarikh'] }}</td>
                                   <td>{{ $gldetail['descpt'] }}</td>
-                                  <td>{{ $gldetail['pendahuluan'] }}</td>
-                                  <td>{{ $gldetail['serahan'] }}</td>
+                                  <td>{{ number_format($gldetail['pendahuluan'],2) }}</td>
+                                  <td>{{ number_format($gldetail['serahan'],2) }}</td>
                                   </tr>
                                 @endforeach
                             </tbody>
@@ -84,12 +84,18 @@
                 $('#keterangan').val('Pendahuluan Daripada HQ');
                 $('#dtacct').val('1000/010');
                 $('#ktacct').val('7000/102');
+                $('input[name="denominasi"]').attr('style','display: none');
+                $('.denominasi').attr('style','display: none');
+                
 
             }else if(jenis == 'serahan')
             {
                 $('#keterangan').val('Serahan Kepada HQ');
                 $('#dtacct').val('1000/010');
                 $('#ktacct').val('1000/020');
+                $('input[name="denominasi"]').attr('style','display: block');
+                $('.denominasi').attr('style','display: block');
+
             }
             else
             {
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php
index 043111b..6ee868b 100644
--- a/resources/views/lelongan/index.blade.php
+++ b/resources/views/lelongan/index.blade.php
@@ -91,7 +91,7 @@
                                    TARIKH
                                 </div>
                                 <div class="col-8">
-                                    <input type="text" value="{{ $lelong['sirilel'] }}" class="form-control" readonly/>
+                                    <input type="text" value="{{ $lelong['t_lelong'] }}" class="form-control" readonly/>
                                 </div>
                             </div>
                             
diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
index 23aa649..8e876d8 100644
--- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php
@@ -25,33 +25,41 @@
               <table class="table"> 
                     <tr>
                           <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
                           <th>Ambilan</th>
                           <th>Total</th>
                           <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
                           <th>Ambilan</th>
                           <th>Total (RM)</th>
                     </tr>
                     <tr>
                       <td>RM1</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd1'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
                       <td> RM20</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd20'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM5</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd5'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
                       <td>RM50</td> 
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd50'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd10'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
                       <td>RM100 </td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd100'] }}" readonly/></td>
                       <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)"/> </td>
                       <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
                   </tr>
diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php
index b1ad433..dbeafa8 100644
--- a/resources/views/modal/panjar.blade.php
+++ b/resources/views/modal/panjar.blade.php
@@ -19,7 +19,12 @@
                 <input type="date" class="form-control mb-4" name="tarikh"/>
 
                 <label>Tuntutan Oleh: </label> 
-                <input type="text" class="form-control mb-4" name="tuntutan"/>
+                <select name="tuntutan" class="form-control mb-4">
+                  @foreach($usercawangan as $user)
+                  <option value="{{ $user->name }}">{{ $user->name }}</option>
+                  @endforeach
+                </select>
+                {{-- <input type="text" class="form-control mb-4" name="tuntutan"/> --}}
 
                 <label>Tarikh Bil: </label> 
                 <input type="date" class="form-control mb-4" name="tarikhbil"/>
@@ -29,10 +34,11 @@
 
                 <label>Bayaran RM: </label> 
                 <input type="text" class="form-control mb-4" name="bayaran"/>
+
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success btn-lg">Terima</button>
+            <button type="button" class="btn btn-success btn-lg" onclick="panjaransubmit()">Terima</button>
         </div>
       </form>
       </div>
@@ -60,7 +66,12 @@
                 <input type="date" name="tarikh" class="form-control mb-4"/>
 
                 <label>Tuntutan Oleh:
-                <input type="text" name="tuntutan" class="form-control mb-4"/>
+                <select name="tuntutan" class="form-control mb-4">
+                  @foreach($usercawangan as $user)
+                    <option value="{{ $user->name }}">{{ $user->name }}</option>
+                  @endforeach
+                </select>
+                {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
 
                 <label>Tarikh Bil:
                 <input type="date" name="tarikhbil" class="form-control mb-4"/>
@@ -73,7 +84,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success btn-lg">Terima</button>
+            <button type="button" class="btn btn-success btn-lg" onclick="panjaransubmit()">Terima</button>
         </div>
       </form>
       </div>
@@ -101,7 +112,12 @@
                 <input type="date" name="tarikh" class="form-control mb-4"/>
 
                 <label>Tuntutan Oleh:</label>
-                <input type="text" name="tuntutan" class="form-control mb-4"/>
+                <select name="tuntutan" class="form-control mb-4">
+                  @foreach($usercawangan as $user)
+                    <option value="{{ $user->name }}">{{ $user->name }}</option>
+                  @endforeach
+                </select>
+                {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
 
                 <label>Tarikh Bil:</label>
                 <input type="date" name="tarikhbil" class="form-control mb-4"/>
@@ -144,7 +160,12 @@
               <input type="date" name="tarikh" class="form-control mb-4"/>
 
               <label>Tuntutan Oleh:</label>
-              <input type="text" name="tuntutan" class="form-control mb-4"/>
+              <select name="tuntutan" class="form-control mb-4">
+                @foreach($usercawangan as $user)
+                  <option value="{{ $user->name }}">{{ $user->name }}</option>
+                @endforeach
+              </select>
+              {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
 
               <label>Tarikh Bil:</label>
               <input type="date" name="tarikhbil" class="form-control mb-4"/>
@@ -186,7 +207,12 @@
                 <input type="date" name="tarikh" class="form-control mb-4"/>
   
                 <label>Tuntutan Oleh:</label>
-                <input type="text" name="tuntutan" class="form-control mb-4"/>
+                <select name="tuntutan" class="form-control mb-4">
+                  @foreach($usercawangan as $user)
+                    <option value="{{ $user->name }}">{{ $user->name }}</option>
+                  @endforeach
+                </select>
+                {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
   
                 <label>Tarikh Bil:</label>
                 <input type="date" name="tarikhbil" class="form-control mb-4"/>
@@ -221,11 +247,11 @@
               @csrf
             <div class="modal-body text-center">
                 <input type="hidden" name="jenismodal" value="pos"/>
-                <label>Tarikh:</label>
-                <input type="date" name="tarikh" class="form-control mb-4"/>
-
                 <label>Baucer No:</label>
                 <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                
+                <label>Tarikh:</label>
+                <input type="date" name="tarikh" class="form-control mb-4"/>
   
                 <label>Tarikh Bil:</label>
                 <input type="date" name="tarikhbil" class="form-control mb-4"/>
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php
index 031fc0a..3b46d1c 100644
--- a/resources/views/modal/pendahuluanserahan.blade.php
+++ b/resources/views/modal/pendahuluanserahan.blade.php
@@ -30,7 +30,7 @@
             </div>
             <div class="row">
               <label class="col-2 mt-2">Keterangan</label>
-              <input type="text" class="form-control col-8 mt-2" name="keterangan" readonly id="keterangan"/>
+              <input type="text" class="form-control col-8 mt-2" name="keterangan" id="keterangan"/>
             </div>
             <div class="row"> 
               <label class="col-2 mt-2">Amaun (RM)</label>