diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 827a7ba..d7cd0f7 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -13,6 +13,7 @@ use App\Events\NotifikasiAGH;
 
 use App\User;
 use App\Cawangan;
+use App\Lejeram;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
@@ -2766,64 +2767,73 @@ class KhazanahController extends Controller
             $tarikh_akhir = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];   
         }
 
-        //Calculation Imbang Duga
-        $imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        
-        $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
 
-        //Harta semasa
-        $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); 
-        $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+        $lejeramdata = Lejeram::orderBy('glcode')->get();
+        $lejeram = array();
+        $len = count($lejeramdata);
+        $totalkredit = 0;
+        $totaldebit = 0;
 
-        //Tanggungan Semasa
-        $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+        foreach($lejeramdata as $index => $lejer)
+        {
 
-        $Debit = [];
-        $TotalDebit = 0;
-        $TotalTunaiDebit = 0;
-        $TotalTunaiKredit = 0;
+           
+            if($lejer->api_redirect != null)
+            {
+                ${$lejer['variable']} = Http::get(config('api.url'). $lejer['api_redirect'] . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
 
-      	$TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
-      	$TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
+                if($lejer->namadebit == null)
+                {
+                    $debit = null;
+                }else{
+                    if($lejer->oneVar == 1)
+                    {
+                        $debit = ${$lejer['variable']};
+                    }else{
+                        $debit = ${$lejer['variable']}[$lejer->namadebit];
+                    }
 
-        array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
-        array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
-        array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]);
-        array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]);
-        array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]);
-        array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
-        if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
-        if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]);
-        if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]);
-        if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]);
-        if($bakilelong['rugilelong'] != 0) array_push($Debit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
+                    $totaldebit += floatval($debit);
+                }
 
+                if($lejer->namakredit == null)
+                {
+                    $kredit = null;
+                }else{
+                    if($lejer->oneVar == 1)
+                    {
+                        $kredit = ${$lejer['variable']};
+                    }else{
+                        $kredit = ${$lejer['variable']}[$lejer->namakredit];
+                    }
 
-        $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
+                    $totalkredit += floatval($kredit);
+                }
 
-        $Kredit = [];
-        $TotalKredit = 0;
+                if(!($kredit == null && $debit == null))
+                {
+                    array_push($lejeram,['glcode' => $lejer->glcode, 'descpt' => $lejer->descpt,'debit' => ($debit) ? $debit : 0,'kredit' => ($kredit) ? $kredit : 0]);
+                }
+            }else{
+                array_push($lejeram,['glcode' => $lejer->glcode, 'descpt' => $lejer->descpt,'debit' => 0,'kredit' => 0]);
+            }
 
-        array_push($Kredit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiDebit]); 
-        array_push($Kredit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Tebus']]);
-        array_push($Kredit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Tebus']]);
-        array_push($Kredit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan)]);
-        array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet)]);
-        array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
-        array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
-        array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]);
-        if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
-        if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
+            if($index == $len-1)
+            {
+                $lejeram[0]['debit'] = $totalkredit;
+                $lejeram[0]['kredit'] = $totaldebit;
+            }
+        }
 
-        $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
-   
-        return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit'));
+        $totalsamadebit = 0;
+        $totalsamakredit = 0;
+        foreach($lejeram as $index=>$lejer)
+        {
+            $totalsamadebit += floatval($lejer['debit']);
+            $totalsamakredit += floatval($lejer['kredit']);
+        }
+
+        return view('print.laporan_lejer_am',compact('cawangan','tarikh_cetak','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','lejeram','totalsamadebit','totalsamakredit'));
     }
 
     public function laporan_tuntutbaki(Request $request)
diff --git a/app/Lejeram.php b/app/Lejeram.php
new file mode 100644
index 0000000..d3aaf5f
--- /dev/null
+++ b/app/Lejeram.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Lejeram extends Model
+{
+    protected $table = 'lejeramdata';
+
+    protected $fillable = [
+        'no',
+        'descpt',
+        'glcode',
+        'api_redirect',
+        'variable',
+        'namadebit',
+        'namakredit',
+        'oneVar'
+    ];
+}
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index 45dd5da..fdfe7ac 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -18,9 +18,12 @@
             </li>
           </ul>
 
-          <label class="mt-2 ml-3">Bundle:</label><input type="text" class="form-control col-2 ml-3" id="amaunbundle" placeholder="0.00" readonly>
-         <label class="mt-2 ml-3">Keping:</label><input type="text" class="form-control col-2 ml-3" id="amaunkeping" placeholder="0.00" readonly>
-         <label class="mt-2 ml-3">Amaun:</label><input type="text" class="form-control col-2 ml-3" id="amaunkeseluruhan" placeholder="0.00" readonly>
+         <label class="mt-2 ml-3 hideelem d-none">Bundle:</label><input type="text" class="form-control col-2 ml-3 hideelem d-none" id="amaunbundle" placeholder="0.00" readonly>
+         <label class="mt-2 ml-3 hideelem d-none">Keping:</label><input type="text" class="form-control col-2 ml-3 hideelem d-none" id="amaunkeping" placeholder="0.00" readonly>
+         <label class="mt-2 ml-3">Amaun Deno:</label><input type="text" class="form-control col-2 ml-3" data-amaun="" id="amaunkeseluruhan" placeholder="0.00" readonly>
+         <label class="mt-2 ml-3">Amaun Vault:</label><input type="text" class="form-control col-2 ml-3" id="amaunvault" placeholder="0.00" readonly>
+
+         <button type="button" class="btn btn-warning ml-4 hideelement d-none" data-dismiss="modal">Tukar</button>
           
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
@@ -29,6 +32,9 @@
         </div>
         <div class="modal-body">  
 
+          <div class="alert alert-warning text-center d-none" role="alert">
+            <i class='fas fa-exclamation-triangle text-danger mr-2'></i> is a primary alert—check it out!
+          </div>
           <div class="tab-content">
             <div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
               
@@ -42,26 +48,26 @@
                           <th>Jumlah (RM)</th>
                     </tr>
                     <tr>
-                      <td>RM1</td>
+                      <td>RM 1.00</td>
                       <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" readonly/> </td>
                       <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
-                      <td> RM20</td>
+                      <td> RM 20.00</td>
                       <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" readonly/> </td>
                       <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
-                      <td>RM5</td>
+                      <td>RM 5.00</td>
                       <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" readonly/> </td>
                       <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
-                      <td>RM50</td> 
+                      <td>RM 50.00</td> 
                       <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" readonly/> </td>
                       <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
-                      <td>RM10</td>
+                      <td>RM 10.00</td>
                       <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" readonly/> </td>
                       <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
-                      <td>RM100 </td>
+                      <td>RM 100.00 </td>
                       <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" readonly/> </td>
                       <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
                   </tr>
@@ -71,62 +77,61 @@
             <div class="tab-pane fade  show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
               
           <table class="table"> 
-            <tr>
-                  <th></th>
+            <tr class="bg-warning text-center">
+                  <th width="20%"></th>
                   <th>Peti Besi</th>
                   <th>Jumlah (RM)</th>
-                  <th></th>
+                  <th width="20%"></th>
                   <th>Peti Besi</th>
                   <th>Jumlah (RM)</th>
             </tr>
             <tr>
-              
-              <td>RM0.01</td>
-              <td><input type="text" name="ambilansen1" class="form-control" id="sen1" readonly/> </td>
-              <td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
-              <td>RM1</td>
-              <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" readonly/> </td>
-              <td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
+              <td class="text-center">RM 0.01</td>
+              <td><input type="text" data-deno="" name="ambilansen1" onchange="totaltukarandeno(this)" class="form-control text-center editfunc" id="sen1" readonly/> </td>
+              <td><input type="text" name="totalsen1" id="totalsen1" class="form-control text-center" value="0.00" readonly/> </td>
+              <td class="text-center">RM 1.00</td>
+              <td><input type="text" data-deno="" name="ambilanring1" class="form-control text-center editfunc" id="ringgit1" onchange="totaltukarandeno(this)" readonly/> </td>
+              <td><input type="text" name="totalring1" id="totalringgit1" class="form-control text-center" value="0.00" readonly/> </td>
           </tr>
           <tr>
-              <td>RM0.05</td>
-              <td><input type="text" name="ambilansen5" class="form-control" id="sen5" readonly/> </td>
-              <td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
-              <td>RM5</td>
-              <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" readonly/> </td>
-              <td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
+              <td class="text-center">RM 0.05</td>
+              <td><input type="text" data-deno="" name="ambilansen5" class="form-control text-center editfunc" id="sen5" onchange="totaltukarandeno(this)" readonly/> </td>
+              <td><input type="text" name="totalsen5" id="totalsen5" class="form-control text-center" value="0.00" readonly/> </td>
+              <td class="text-center">RM 5.00</td>
+              <td><input type="text" data-deno="" name="ambilanring5" class="form-control text-center editfunc" id="ringgit5" onchange="totaltukarandeno(this)" readonly/> </td>
+              <td><input type="text" name="totalring5" id="totalringgit5" class="form-control text-center" value="0.00" readonly/> </td>
           </tr>
           <tr>
-              <td>RM0.10</td>
-              <td><input type="text" name="ambilansen10" class="form-control" id="sen10" readonly/> </td>
-              <td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
-              <td>RM10</td>
-              <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" readonly/> </td>
-              <td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
+              <td class="text-center">RM 0.10</td>
+              <td><input type="text" data-deno="" name="ambilansen10" class="form-control text-center editfunc" id="sen10" onchange="totaltukarandeno(this)" readonly/> </td>
+              <td><input type="text" name="totalsen10" id="totalsen10" class="form-control text-center" value="0.00" readonly/> </td>
+              <td class="text-center">RM 10.00</td>
+              <td><input type="text" data-deno="" name="ambilanring10" class="form-control text-center editfunc" id="ringgit10" onchange="totaltukarandeno(this)" readonly/> </td>
+              <td><input type="text" name="totalring10" id="totalringgit10" class="form-control text-center" value="0.00" readonly/> </td>
           </tr>
           <tr>
-            <td>RM0.20</td>
-            <td><input type="text" name="ambilansen20" class="form-control" id="sen20" readonly/> </td>
-            <td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
-            <td> RM20</td>
-            <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" readonly/> </td>
-            <td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
+            <td class="text-center">RM 0.20</td>
+            <td><input type="text" data-deno="" name="ambilansen20" class="form-control text-center editfunc" id="sen20" onchange="totaltukarandeno(this)" readonly/> </td>
+            <td><input type="text" name="totalsen20" id="totalsen20" class="form-control text-center" value="0.00" readonly/> </td>
+            <td class="text-center"> RM 20.00</td>
+            <td><input type="text" data-deno="" name="ambilanring20" class="form-control text-center editfunc" id="ringgit20" onchange="totaltukarandeno(this)" readonly/> </td>
+            <td><input type="text" name="totalring20" id="totalringgit20" class="form-control text-center" value="0.00" readonly/> </td>
         </tr>
         <tr>
-          <td>RM0.50</td>
-          <td><input type="text" name="ambilansen50" class="form-control" id="sen50" readonly/> </td>
-          <td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
-          <td>RM50</td> 
-          <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" readonly/> </td>
-          <td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
+          <td class="text-center">RM 0.50</td>
+          <td><input type="text" data-deno="" name="ambilansen50" class="form-control text-center editfunc" id="sen50" onchange="totaltukarandeno(this)" readonly/> </td>
+          <td><input type="text" name="totalsen50" id="totalsen50" class="form-control text-center" value="0.00" readonly/> </td>
+          <td class="text-center">RM 50.00</td> 
+          <td><input type="text" data-deno="" name="ambilanring50" class="form-control text-center editfunc" id="ringgit50" onchange="totaltukarandeno(this)" readonly/> </td>
+          <td><input type="text" name="totalring50" id="totalringgit50" class="form-control text-center" value="0.00" readonly/> </td>
       </tr>
       <tr>
         <td></td>
         <td></td>
         <td></td>
-        <td>RM100 </td> 
-        <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" readonly/> </td>
-        <td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly/> </td>
+        <td class="text-center">RM 100.00 </td> 
+        <td><input type="text" data-deno="" name="ambilanring100" class="form-control text-center editfunc" id="ringgit100" onchange="totaltukarandeno(this)" readonly/> </td>
+        <td><input type="text" name="totalring100" id="totalringgit100" class="form-control text-center" value="0.00" readonly/> </td>
       </tr>
       </table>
 
@@ -139,7 +144,10 @@
 
         </div>
         <div class="modal-footer">
-            <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Tutup</button>
+            <button type="button" class="btn btn-warning btn-lg" id="editbtn" onclick="editfunc()">Edit</button>
+            <button type="button" class="btn btn-danger btn-lg" id="tutupbtn" data-dismiss="modal">Tutup</button>
+            <button type="button" class="btn btn-success btn-lg d-none" id="simpanbtn" onclick="simpanfunc()">Simpan</button>
+            <button type="button" class="btn btn-danger btn-lg d-none" id="batalbtn" onclick="batalfunc()">Batal</button>
         </div>
       </div>
     </div>
@@ -212,9 +220,9 @@
 </div>
 <script>
 
-  const formatter = new Intl.NumberFormat('en-US', {
-          minimumFractionDigits: 2
-      });
+        const formatter = new Intl.NumberFormat('en-US', {
+            minimumFractionDigits: 2
+        });
 
         var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
             cluster: 'ap1',
@@ -234,78 +242,514 @@
             }
         });
 
+        $(function() {
+            getData();
+        });
+
 
         let api = "{{ config('api.url') }}";
         let kodcaw = "{{ Auth::user()->cawangan }}";
 
-        $.ajax({
-            method: 'get',
-            url: api + '/api/DenominasiController/' + kodcaw,
-            success:function(data)
-            {
-                $.each(data, function(key,val) {             
-                    
+        const initialambilan = [["bundle1",0,0],["bundle5",0,0],["bundle10",0,0],
+                          ["bundle20",0,0],["bundle50",0,0],["bundle100",0,0],
+                          ["sen1",0,0],["sen5",0,0],["sen10",0,0],
+                          ["sen20",0,0],["sen50",0,0],["ringgit1",0,0],
+                          ["ringgit5",0,0],["ringgit10",0,0],["ringgit20",0,0],
+                          ["ringgit50",0,0],["ringgit100",0,0]
+                          ];
 
-                    $('#bundle1').val(val.bd1);
-                    $('#totalb1').val(formatter.format(val.b1));
+        let arrayambilan = [["bundle1",0,0],["bundle5",0,0],["bundle10",0,0],
+                          ["bundle20",0,0],["bundle50",0,0],["bundle100",0,0],
+                          ["sen1",0,0],["sen5",0,0],["sen10",0,0],
+                          ["sen20",0,0],["sen50",0,0],["ringgit1",0,0],
+                          ["ringgit5",0,0],["ringgit10",0,0],["ringgit20",0,0],
+                          ["ringgit50",0,0],["ringgit100",0,0]
+                          ];
 
-                    $('#bundle20').val(val.bd20);
-                    $('#totalb20').val(formatter.format(val.b20));
 
-                    $('#bundle5').val(val.bd5);
-                    $('#totalb5').val(formatter.format(val.b5));
+        function saveData()
+        {
+          let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
+          let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val();
+          let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();let ringgit100 = $('#ringgit100').val();
 
-                    $('#bundle50').val(val.bd50);
-                    $('#totalb50').val(formatter.format(val.b50));
 
-                    $('#bundle10').val(val.bd10);
-                    $('#totalb10').val(formatter.format(val.b10));
-
-                    $('#bundle100').val(val.bd100);
-                    $('#totalb100').val(formatter.format(val.b100));
-
-                    $('#sen1').val(val.txtsen1);
-                    $('#totalsen1').val(formatter.format(val.k01));
-
-                    $('#sen5').val(val.txtsen5);
-                    $('#totalsen5').val(formatter.format(val.k05));
-
-                    $('#sen10').val(val.txtsen10);
-                    $('#totalsen10').val(formatter.format(val.k010));
-
-                    $('#sen20').val(val.txtsen20);
-                    $('#totalsen20').val(formatter.format(val.k020));
-
-                    $('#sen50').val(val.txtsen50);
-                    $('#totalsen50').val(formatter.format(val.k050));
-
-                    $('#ringgit1').val(val.txtring1);
-                    $('#totalring1').val(formatter.format(val.k1));
-
-                    $('#ringgit5').val(val.txtring5);
-                    $('#totalring5').val(formatter.format(val.k5));
-
-                    $('#ringgit10').val(val.txtring10);
-                    $('#totalring10').val(formatter.format(val.k10));
-
-                    $('#ringgit20').val(val.txtring20);
-                    $('#totalring20').val(formatter.format(val.k20));
-
-                    $('#ringgit50').val(val.txtring50);
-                    $('#totalring50').val(formatter.format(val.k50));
-
-                    $('#ringgit100').val(val.txtring100);
-                    $('#totalring100').val(formatter.format(val.k100));
-
-                    $('#amaunkeping').val("RM " + formatter.format(val.jumlahkeping));
-                    $('#amaunbundle').val("RM " + formatter.format(val.jumlahbundle));
-                    $('#amaunkeseluruhan').val("RM " + formatter.format(val.txtjumlah));
-
-                });     
+          $.ajax({
+            method: 'put',
+            url: api + '/api/DenominasiUpdate/' + kodcaw,
+            data: { 
+              "bd1" : bundle1,
+              "bd5": bundle5,
+              "bd10": bundle10,
+              "bd20": bundle20,
+              "bd50": bundle50,
+              "bd100": bundle100,
+              "txtring1": ringgit1,
+              "txtring5": ringgit5,
+              "txtsen1": sen1,
+              "txtsen5": sen5,
+              "txtsen10": sen10,
+              "txtsen20": sen20,
+              "txtsen50": sen50,
+              "txtring10": ringgit10,
+              "txtring20": ringgit20,
+              "txtring50": ringgit50,
+              "txtring100": ringgit100,
+              "txtring1000": "0",
+              "jumlahbundle": "0",
+              "txtjumlah": "0",
+              "jumlahkeping" : "0"
+            } ,
+            success:function(data){
+              console.log(data);
             }
-            
+          });
+        }
+
+        function getData()
+        {
+          $.ajax({
+          method: 'get',
+          url: api + '/api/VaultController/' + kodcaw,
+          success:function(data){
+            $('#amaunvault').val(formatter.format(data[0].bakiakhir));
+          }
+          });
+
+          $.ajax({
+              method: 'get',
+              url: api + '/api/DenominasiController/' + kodcaw,
+              success:function(data)
+              {
+                  $.each(data, function(key,val) {             
+                    
+                    initialambilan[0][1] = val.bd1;
+                    initialambilan[0][2] = parseFloat(Number(val.b1));
+                    initialambilan[1][1] = val.bd5;
+                    initialambilan[1][2] = parseFloat(Number(val.b5));
+                    initialambilan[2][1] = val.bd10;
+                    initialambilan[2][2] = parseFloat(Number(val.b10));
+                    initialambilan[3][1] = val.bd20;
+                    initialambilan[3][2] = parseFloat(Number(val.b20));
+                    initialambilan[4][1] = val.bd50;
+                    initialambilan[4][2] = parseFloat(Number(val.b50));
+                    initialambilan[5][1] = val.bd100;
+                    initialambilan[5][2] = parseFloat(Number(val.b100));
+                    initialambilan[6][1] = val.txtsen1;
+                    initialambilan[6][2] = parseFloat(Number(val.k01));
+                    initialambilan[7][1] = val.txtsen5;
+                    initialambilan[7][2] = parseFloat(Number(val.k05));
+                    initialambilan[8][1] = val.txtsen10;
+                    initialambilan[8][2] = parseFloat(Number(val.k010));
+                    initialambilan[9][1] = val.txtsen20;
+                    initialambilan[9][2] = parseFloat(Number(val.k020));
+                    initialambilan[10][1] = val.txtsen50;
+                    initialambilan[10][2] = parseFloat(Number(val.k050));
+                    initialambilan[11][1] = val.txtring1;
+                    initialambilan[11][2] = parseFloat(Number(val.k1));
+                    initialambilan[12][1] = val.txtring5;
+                    initialambilan[12][2] = parseFloat(Number(val.k5));
+                    initialambilan[13][1] = val.txtring10;
+                    initialambilan[13][2] = parseFloat(Number(val.k10));
+                    initialambilan[14][1] = val.txtring20;
+                    initialambilan[14][2] = parseFloat(Number(val.k20));
+                    initialambilan[15][1] = val.txtring50;
+                    initialambilan[15][2] = parseFloat(Number(val.k50));
+                    initialambilan[16][1] = val.txtring100;
+                    initialambilan[16][2] = parseFloat(Number(val.k100));
+
+
+                    arrayambilan[0][1] = val.bd1;
+                    arrayambilan[0][2] = parseFloat(Number(val.b1));
+                    arrayambilan[1][1] = val.bd5;
+                    arrayambilan[1][2] = parseFloat(Number(val.b5));
+                    arrayambilan[2][1] = val.bd10;
+                    arrayambilan[2][2] = parseFloat(Number(val.b10));
+                    arrayambilan[3][1] = val.bd20;
+                    arrayambilan[3][2] = parseFloat(Number(val.b20));
+                    arrayambilan[4][1] = val.bd50;
+                    arrayambilan[4][2] = parseFloat(Number(val.b50));
+                    arrayambilan[5][1] = val.bd100;
+                    arrayambilan[5][2] = parseFloat(Number(val.b100));
+                    arrayambilan[6][1] = val.txtsen1;
+                    arrayambilan[6][2] = parseFloat(Number(val.k01));
+                    arrayambilan[7][1] = val.txtsen5;
+                    arrayambilan[7][2] = parseFloat(Number(val.k05));
+                    arrayambilan[8][1] = val.txtsen10;
+                    arrayambilan[8][2] = parseFloat(Number(val.k010));
+                    arrayambilan[9][1] = val.txtsen20;
+                    arrayambilan[9][2] = parseFloat(Number(val.k020));
+                    arrayambilan[10][1] = val.txtsen50;
+                    arrayambilan[10][2] = parseFloat(Number(val.k050));
+                    arrayambilan[11][1] = val.txtring1;
+                    arrayambilan[11][2] = parseFloat(Number(val.k1));
+                    arrayambilan[12][1] = val.txtring5;
+                    arrayambilan[12][2] = parseFloat(Number(val.k5));
+                    arrayambilan[13][1] = val.txtring10;
+                    arrayambilan[13][2] = parseFloat(Number(val.k10));
+                    arrayambilan[14][1] = val.txtring20;
+                    arrayambilan[14][2] = parseFloat(Number(val.k20));
+                    arrayambilan[15][1] = val.txtring50;
+                    arrayambilan[15][2] = parseFloat(Number(val.k50));
+                    arrayambilan[16][1] = val.txtring100;
+                    arrayambilan[16][2] = parseFloat(Number(val.k100));
+
+                      $('#bundle1').val(val.bd1);
+                      $('#totalb1').val(formatter.format(val.b1));
+
+                      $('#bundle20').val(val.bd20);
+                      $('#totalb20').val(formatter.format(val.b20));
+
+                      $('#bundle5').val(val.bd5);
+                      $('#totalb5').val(formatter.format(val.b5));
+
+                      $('#bundle50').val(val.bd50);
+                      $('#totalb50').val(formatter.format(val.b50));
+
+                      $('#bundle10').val(val.bd10);
+                      $('#totalb10').val(formatter.format(val.b10));
+
+                      $('#bundle100').val(val.bd100);
+                      $('#totalb100').val(formatter.format(val.b100));
+
+                      $('#sen1').val(val.txtsen1);
+                      $('#sen1').data('deno',val.txtsen1);
+                      $('#totalsen1').val(formatter.format(val.k01));
+
+                      $('#sen5').val(val.txtsen5);
+                      $('#sen5').data('deno',val.txtsen5);
+                      $('#totalsen5').val(formatter.format(val.k05));
+
+                      $('#sen10').val(val.txtsen10);
+                      $('#sen10').data('deno',val.txtsen10);
+                      $('#totalsen10').val(formatter.format(val.k010));
+
+                      $('#sen20').val(val.txtsen20);
+                      $('#sen20').data('deno',val.txtsen20);
+                      $('#totalsen20').val(formatter.format(val.k020));
+
+                      $('#sen50').val(val.txtsen50);
+                      $('#sen50').data('deno',val.txtsen50);
+                      $('#totalsen50').val(formatter.format(val.k050));
+
+                      $('#ringgit1').val(val.txtring1);
+                      $('#ringgit1').data('deno',val.txtring1);
+                      $('#totalringgit1').val(formatter.format(val.k1));
+
+                      $('#ringgit5').val(val.txtring5);
+                      $('#ringgit5').data('deno',val.txtring5);
+                      $('#totalringgit5').val(formatter.format(val.k5));
+
+                      $('#ringgit10').val(val.txtring10);
+                      $('#ringgit10').data('deno',val.txtring10);
+                      $('#totalringgit10').val(formatter.format(val.k10));
+
+                      $('#ringgit20').val(val.txtring20);
+                      $('#ringgit20').data('deno',val.txtring20);
+                      $('#totalringgit20').val(formatter.format(val.k20));
+
+                      $('#ringgit50').val(val.txtring50);
+                      $('#ringgit50').data('deno',val.txtring50);
+                      $('#totalringgit50').val(formatter.format(val.k50));
+
+                      $('#ringgit100').val(val.txtring100);
+                      $('#ringgit100').data('deno',val.txtring100);
+                      $('#totalringgit100').val(formatter.format(val.k100));
+
+                      $('#amaunkeping').val(formatter.format(val.jumlahkeping));
+                      $('#amaunbundle').val(formatter.format(val.jumlahbundle));
+                      $('#amaunkeseluruhan').val(formatter.format(val.txtjumlah));
+                      $('#amaunkeseluruhan').data('amaun',val.txtjumlah);
+
+                  });     
+              }
+              
+          });
+        }
+        
+
+      function editfunc()
+      {
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+
+        $('#editbtn').addClass('d-none');
+        $('#tutupbtn').addClass('d-none');
+        $('#simpanbtn').removeClass('d-none');
+        $('#batalbtn').removeClass('d-none');
+
+        if(parseFloat(Number(amaundeno)) > parseFloat(Number(amaunvault)))
+        {
+          $('#amaunkeseluruhan').addClass('bg-success');
+        }else if(parseFloat(Number(amaundeno)) < parseFloat(Number(amaunvault)))
+        {
+          $('#amaunkeseluruhan').addClass('bg-danger');
+        }else{
+          $('#amaunkeseluruhan').removeClass('bg-success');
+          $('#amaunkeseluruhan').removeClass('bg-danger');
+        }
+        
+        $('.editfunc').prop('readonly',false);
+      }
+
+      function simpanfunc()
+      {
+
+        Swal.fire({
+              title: 'Adakah anda pasti untuk mengemaskini denominasi?',
+              text: "Sila pastikan denominasi anda betul!",
+              icon: 'warning',
+              showCancelButton: true,
+              confirmButtonColor: '#3085d6',
+              cancelButtonColor: '#d33',
+              confirmButtonText: 'Simpan'
+            }).then((result) => {
+
+              console.log(result);
+              return false;
+            });
+
+
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+        let samacount = 0;
+
+        if(amaundeno !== amaunvault)
+        {
+          $.each(initialambilan, function(index, initial){
+            $.each(arrayambilan, function(index1, arr){
+
+              if(initial[0] === arr[0])
+              {
+                if((initial[1] === arr[1]) && (initial[2] === arr[2]))
+                {
+                  
+                }else{
+                  samacount++;
+                }
+              }
+
+            });
+          });
+        }
+
+        if(samacount != 0)
+        {
+          if(amaundeno != amaunvault)
+          {
+            Swal.fire({
+            icon: 'error',
+            title: 'Denominasi dan peti besi masih tidak sama!',
+            text: "Sila pastikan denominasi anda betul!"
+            });
+
+            return false;
+          }
+        }else{
+
+            Swal.fire({
+              title: 'Adakah anda pasti untuk mengemaskini denominasi?',
+              text: "Sila pastikan denominasi anda betul!",
+              icon: 'warning',
+              showCancelButton: true,
+              confirmButtonColor: '#3085d6',
+              cancelButtonColor: '#d33',
+              confirmButtonText: 'Simpan'
+            }).then((result) => {
+
+              console.log(result);
+              return false;
+              if (result.isConfirmed) {
+
+                saveData();
+
+                $('#editbtn').removeClass('d-none');
+                $('#tutupbtn').removeClass('d-none');
+                $('#simpanbtn').addClass('d-none');
+                $('#batalbtn').addClass('d-none');
+
+                $('.editfunc').prop('readonly',true);
+
+                location.reload();
+              }else if(result.isDismissed){
+                
+              }
+            })
+
+        }
+
+        $('#editbtn').removeClass('d-none');
+        $('#tutupbtn').removeClass('d-none');
+        $('#simpanbtn').addClass('d-none');
+        $('#batalbtn').addClass('d-none');
+
+        $('.editfunc').prop('readonly',true);
+        
+      }
+
+      function batalfunc()
+      {
+        let totalamaun = 0;
+
+        $.each(initialambilan, function( index, initial ){
+          $('#' + initial[0]).val(Number(initial[1]));
+          $('#total' + initial[0]).val(formatter.format(initial[2]));
+
+          totalamaun += initial[2];
+
+
+          $.each(arrayambilan, function( index1, arr ){
+
+            if(arr[0] == initial[0])
+            {
+              arr[1] = initial[1];
+              arr[2] = initial[2];
+            }
+
+          });
+
         });
 
+        $('#amaunkeseluruhan').val(formatter.format(totalamaun));
+
+        $('#editbtn').removeClass('d-none');
+        $('#tutupbtn').removeClass('d-none');
+        $('#simpanbtn').addClass('d-none');
+        $('#batalbtn').addClass('d-none');
+
+        $('.editfunc').prop('readonly',true);
+      }
+
+      function totalamountdeno(idwang,bilangan)
+      {
+        // console.log(idwang + 'asdas');
+          var amount = 0;
+          switch (idwang) { 
+              case 'bundle1': 
+                  amount += (bilangan * 100);
+                  break;
+              case 'bundle20': 
+                  amount += (bilangan * 1000);
+                  break;
+              case 'bundle5': 
+                  amount += (bilangan * 500);
+                  break;		
+              case 'bundle50': 
+                  amount += (bilangan * 5000);
+                  break;
+              case 'bundle10': 
+                  amount += (bilangan * 1000);
+                  break;
+              case 'bundle100': 
+                  amount += (bilangan * 5000);
+                  break;
+              case 'sen1': 
+                  amount += (bilangan * 0.01);
+                  break;
+              case 'sen5': 
+                  amount += (bilangan * 0.05);
+                  break;
+              case 'sen10': 
+                  console.log(bilangan);
+                  amount += (bilangan * 0.10);
+              break;
+              case 'sen20': 
+                  amount += (bilangan * 0.20);
+                  break;		
+              case 'sen50': 
+                  amount += (bilangan * 0.50);
+                  break;
+              case 'ringgit1': 
+                  amount += (bilangan * 1);
+                  break;
+              case 'ringgit5': 
+                  amount += (bilangan * 5);
+                  break;      
+              case 'ringgit10': 
+                  amount += (bilangan * 10);
+                  break;		
+              case 'ringgit20': 
+                  amount += (bilangan * 20);
+                  break;
+              case 'ringgit50': 
+                  amount += (bilangan * 50);
+                  break;
+              case 'ringgit100': 
+                  amount += (bilangan * 100);
+                  break;         
+          }
+
+          return amount;
+      }
+
+
+
+      function totaltukarandeno(datakeyin)
+      {
+        let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
+        let amaunvault = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+        var idkey = $(datakeyin).attr('id');
+        var valkey = $(datakeyin).val();
+        var deno = $(datakeyin).data('deno');
+        var amount = 0;
+
+          // if(parseFloat(Number(valkey)) > parseFloat(Number(deno)))
+          // {
+          //     $('#' + idkey).val(0);
+          //   Swal.fire({
+          //       icon: 'error',
+          //       title: 'Amaun Kiraan lebih banyak daripada Amaun Sebenar!'
+          //     });
+
+          //     return ;
+          // }
+
+          var validate = $('#amaunvault').val().replace(/[^0-9.-]+/g,"");
+          
+          let indexarr = 0;
+          $.each(arrayambilan, function( index, arr ){
+            if(arr[0] == idkey)
+            {
+                arrayambilan[index][1] = Number(valkey);
+                arrayambilan[index][2] = totalamountdeno(idkey,valkey);
+                indexarr = index;
+            }
+                
+            amount += parseFloat(Number(arr[2]));
+
+          });
+
+          // if(parseFloat(Number(amount)) > parseFloat(Number(validate)))
+          // {
+          //     // $('#' + idkey).val(0);
+          //     Swal.fire({
+          //       icon: 'error',
+          //       title: 'Amaran',
+          //       text: 'Jumlah deno melebihi peti besi',
+          //     });
+          // }
+          // else
+          // {
+          //   $('#amaunkiraan').val(formatter.format(amount));
+          // }
+
+          $('#total' + idkey).val(formatter.format(arrayambilan[indexarr][2]));         
+
+          if(parseFloat(Number(amount)) > parseFloat(Number(amaunvault)))
+          {
+            $('#amaunkeseluruhan').addClass('bg-success');
+          }else if(parseFloat(Number(amount)) < parseFloat(Number(amaunvault)))
+          {
+            $('#amaunkeseluruhan').addClass('bg-danger');
+          }else{
+            $('#amaunkeseluruhan').removeClass('bg-success');
+            $('#amaunkeseluruhan').removeClass('bg-danger');
+          }
+
+          $('#amaunkeseluruhan').val(formatter.format(amount));
+            
+      }
+
 
 </script>
 @endsection
diff --git a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php
index 19c613a..2f02b2c 100644
--- a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php
+++ b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php
@@ -110,7 +110,7 @@
                                     <input autocomplete="off" type="radio" name="radpendser" id="option2" value="serahan" autocomplete="off">
                                     <span>Serahan</span>
                                
-                                    <input autocomplete="off" type="radio" name="radpendser" id="option3" value="Online" autocomplete="off">
+                                    <input autocomplete="off" type="radio" name="radpendser" id="option3" value="online" autocomplete="off">
                                     <span>Serahan-Online</span>
                             </div>
 
diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php
index 34c6f05..dfd709b 100644
--- a/resources/views/print/laporan_lejer_am.blade.php
+++ b/resources/views/print/laporan_lejer_am.blade.php
@@ -1,300 +1,309 @@
 <style>
-  #header {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
-  }
-  
-  #header td, #customers th {
-   
-    padding:4px;
-    font-size:10px;
-  }
-  
-  #header tr:nth-child(even){background-color: #ffffff;}
-  
-  #header tr:hover {background-color: #ddd;}
-  
-  #header th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  }
-  </style>
-  
-  
-  
-  
-  <style>
-  #scan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
-  }
-  
-  #scan td, #scan th {
-   
-    padding: 8px;
-    font-size:11px;
-  }
-  
-  #scan tr:nth-child(even){background-color: #ffffff;}
-  
-  #scan tr:hover {background-color: #ddd;}
-  
-  #scan th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  }
-  </style>
-  
-  
-  <style>
-  #scan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
-  }
-  
-  #scan td, #scan th {
-    border-collapse: collapse;
-    padding: 8px;
-    font-size:11px;
-  }
-  
-  #scan tr:nth-child(even){background-color: #ffffff;}
-  
-  #scan tr:hover {background-color: #ddd;}
-  
-  #scan th {
-    border-collapse: collapse;
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  }
-  </style>
-  
-  
-  
-  <style>
-  #details {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 50%;
-  }
-  
-  #details td, #details th {
-   
-    padding: 8px;
-    font-size:11px;
-  }
-  
-  #details tr:nth-child(even){background-color: #ffffff;}
-  
-  #details tr:hover {background-color: #ffffff;}
-  
-  #details th {
-    padding-top: 12px;
-   font-style:bold;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  }
-  </style>
-  
-  <style>
-  #sign {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
-  }
-  
-  #sign td, #sign th {
-  
-    padding: 8px;
-    font-size:11px;
-    text-align: center;
-  }
-  
-  #sign tr:nth-child(even){background-color: #ffffff;}
-  
-  #sign tr:hover {background-color: #ddd;}
-  
-  #sign th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  }
-  </style>
-  
-  
-  
-  <style>
-  #title {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width: 50%;
-  }
-  
-  #title td, #title th {
-   
-    padding:4px;
-    font-size:12px;
-    border: 0px solid #fff;
-  }
-  
-  #title tr:nth-child(even){background-color: #ffffff;}
-  
-  #title tr:hover {background-color: #ddd;}
-  
-  #title th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  
-  }
-  </style>
-  
-  <style>
-  #details {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width:80%;
-  
-  }
-  
-  #details td, #details th {
-   
-    padding:4px;
-    font-size:12px;
-    border: 0px solid #ddd;
-  }
-  
-  #details tr:nth-child(even){background-color: #ffffff;}
-  
-  #details tr:hover {background-color: #ddd;}
-  
-  #details th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  
-  }
-  </style>
-  
-  <style>
-  #title {
-    font-family: Arial, Helvetica, sans-serif;
-   
-    width:95%;
-   
-  
-  }
-  
-  #title td, #title th {
-   
-    padding:4px;
-    font-size:12px;
+    #header {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+    }
     
-  }
+    #header td, #customers th {
+    
+      padding:4px;
+      font-size:10px;
+    }
+    
+    #header tr:nth-child(even){background-color: #ffffff;}
+    
+    #header tr:hover {background-color: #ddd;}
+    
+    #header th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    }
+
+    #scan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+    }
+    
+    #scan td, #scan th {
+    
+      padding: 8px;
+      font-size:11px;
+    }
+    
+    #scan tr:nth-child(even){background-color: #ffffff;}
+    
+    #scan tr:hover {background-color: #ddd;}
+    
+    #scan th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    }
+
+    #scan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+    }
+    
+    #scan td, #scan th {
+      border-collapse: collapse;
+      padding: 8px;
+      font-size:11px;
+    }
+    
+    #scan tr:nth-child(even){background-color: #ffffff;}
+    
+    #scan tr:hover {background-color: #ddd;}
+    
+    #scan th {
+      border-collapse: collapse;
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    }
+
+    #details {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 50%;
+    }
+    
+    #details td, #details th {
+    
+      padding: 8px;
+      font-size:11px;
+    }
+
+    .signature{ float: left; }
+    .signature{ 
+      margin: 20px 30px;
+      border-top: 1px solid #000;
+      border-top-style: dotted;
+      border-spacing: 200px;
+      width: 200px; 
+      text-align: center;
+    }
+    
+    #details tr:nth-child(even){background-color: #ffffff;}
+    
+    #details tr:hover {background-color: #ffffff;}
+    
+    #details th {
+      padding-top: 12px;
+    font-style:bold;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    }
+
+    #sign {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+    }
+    
+    #sign td, #sign th {
+    
+      padding: 8px;
+      font-size:11px;
+      text-align: center;
+    }
+    
+    #sign tr:nth-child(even){background-color: #ffffff;}
+    
+    #sign tr:hover {background-color: #ddd;}
+    
+    #sign th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    }
   
-  #title tr:nth-child(even){background-color: #ffffff;}
+    #title {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 50%;
+    }
+    
+    #title td, #title th {
+    
+      padding:4px;
+      font-size:12px;
+      border: 0px solid #fff;
+    }
+    
+    #title tr:nth-child(even){background-color: #ffffff;}
+    
+    #title tr:hover {background-color: #ddd;}
+    
+    #title th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    
+    }
   
-  #title tr:hover {background-color: #ddd;}
+    #details {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width:80%;
+    
+    }
+    
+    #details td, #details th {
+    
+      padding:4px;
+      font-size:12px;
+      border: 0px solid #ddd;
+    }
+    
+    #details tr:nth-child(even){background-color: #ffffff;}
+    
+    #details tr:hover {background-color: #ddd;}
+    
+    #details th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    
+    }
+
+    #title {
+      font-family: Arial, Helvetica, sans-serif;
+    
+      width:95%;
+    
+    
+    }
+    
+    #title td, #title th {
+    
+      padding:4px;
+      font-size:12px;
+      
+    }
+    
+    #title tr:nth-child(even){background-color: #ffffff;}
+    
+    #title tr:hover {background-color: #ddd;}
+    
+    #title th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    
+    }
+
+    .tarikhcetak{
+      margin-bottom:20px;
+      padding:2px;
+      font-family: Arial, Helvetica, sans-serif;
+      color:black;
+      font-size:12px;
+      text-align:left;
+      
+    }
+
+    #tarikh_cetak {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width:50%;
+    
+    }
+    
+    #tarikh_cetak  td, #tarikh_cetak th {
+    
+      padding:4px;
+      font-size:12px;
+    
+    }
+    
+    #tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
+    
+    #tarikh_cetak  tr:hover {background-color: #ddd;}
+    
+    #tarikh_cetak  th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      padding:4px;
+      color:black;
+    
+    }
   
-  #title th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  
-  }
-  </style>
-  
-  
-  
-  <style>
-  #tarikh_cetak {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width:50%;
-  
-  }
-  
-  #tarikh_cetak  td, #tarikh_cetak th {
-   
-    padding:4px;
-    font-size:12px;
-  
-  }
-  
-  #tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
-  
-  #tarikh_cetak  tr:hover {background-color: #ddd;}
-  
-  #tarikh_cetak  th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  
-  }
-  </style>
-  
-  
-  <style>
-  #glejer {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse: collapse;
-    width:100%;
-  
-  
-  }
-  
-  #glejer  td, #glejer th {
-   
-    padding:4px;
-    font-size:12px;
-    border: 1px solid #ddd;
-    padding: 6px;
-  
-  }
-  
-  #glejer  tr:nth-child(even){background-color: #ffffff;}
-  
-  #glejer  tr:hover {background-color: #ddd;}
-  
-  #glejer  th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: left;
-    padding:4px;
-    color:black;
-  
-  }
-  </style>
+    #glejer {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width:100%;
+    }
+
+    
+    #glejer  td {
+      padding:4px;
+      font-size:12px;
+      /* border: 1px solid #ddd; */
+      border-right:1px solid #000000;
+      border-left:1px solid #000000;
+      padding: 6px;
+    
+    }
+    
+    #glejer  tr:nth-child(even){background-color: #ffffff;}
+    
+    #glejer  tr:hover {background-color: #ddd;}
+    
+    #glejer  th {
+      /* padding-top: 12px;
+      padding-bottom: 12px; */
+      background-color:#ecf0f1;
+      text-align: center;
+      padding:12px;
+      color:black;
+      font-size:12px;
+      border: 1px solid #000000;
+      margin:20px;
+
+    }
+
+    #glejer td:nth-child(1) {  
+      text-align:center;
+    }
+
+    #glejer td:nth-child(3) {  
+      text-align:right;
+    }
+    #glejer td:nth-child(4) {  
+      text-align:right;
+    }
+    #glejer td:nth-child(5),#glejer td:nth-child(5) {  
+      text-align:right;
+    }
+</style>
   
   
   
   <table id="header">
     <tr>
-      <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+      <th rowspan="4"  ><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
       <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
     </tr>
     <tr>
@@ -319,69 +328,52 @@
 <br>
 
 
-<table id="tarikh_cetak">
+<div class="tarikhcetak">
+  <span style="font-weight: bold;">[ TARIKH DARI : </span>
+  <span>@php 
+    $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
+    $tarikhmula = $myDateTime->format('d-m-Y');
+    echo($tarikhmula)
+  @endphp</span>
+  <span style="font-weight: bold;"> ..... </span>
+  <span style="font-weight: bold;">HINGGA : </span><span>@php 
+    $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
+    $tarikhakhir = $myDateTime->format('d-m-Y');
+    echo($tarikhakhir)
+  @endphp<span style="font-weight:bold"> ]</span></span>
+   <span style="margin-left:50px;font-weight: bold;">TARIKH CETAK : </span><span>@php 
+    $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+    $tarikh_cetak = $myDateTime->format('d-m-Y');
+    echo($tarikh_cetak)
+  @endphp</span>
+</div>
 
-<tr>
-<td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}}  </td>
-<td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td> 
-</tr>
 
-</table>
-
-<br>
 
 <table id="glejer">
   <tr>
-    <th style="width:10px">KOD GL</th>
-    <th colspan="2" style="width:50px">KETERANGAN</th>
-    <th style="width:5px">DEBIT</th>
-    <th style="width:5px" >KREDIT</th>
-    <th style="width:10px">JUMLAH</th>
+    <th>KOD GL</th>
+    <th colspan="2">KETERANGAN</th>
+    <th>DEBIT</th>
+    <th>KREDIT</th>
+    <th>JUMLAH</th>
   </tr>
 
- @foreach($Kredit as $index=>$kred)
-    @foreach($Debit as $index=>$deb)
-      @if($kred['glcode'] === $deb['glcode'])
-      <tr>
-        <td style="width:10px">{{ $kred['glcode'] }}</td>
-        <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
-        <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
-        <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
-        <td style="width:10px">@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp</td>
-      </tr>
-      @endif
-    @endforeach
+  @foreach($lejeram as $index => $lejer)
+    <tr>
+      <td>{{ $lejer['glcode'] }}</td>
+      <td colspan="2">{{ $lejer['descpt'] }}</td>
+      <td>{{ number_format($lejer['debit'],2) }}</td>
+      <td>{{ number_format($lejer['kredit'],2) }}</td>
+      <td>@php $Totalsama = $lejer['debit'] - $lejer['kredit']; echo number_format($Totalsama,2); @endphp</td>
+    </tr>
   @endforeach
 
-@foreach($Debit as $index=>$deb)
-  @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019' || $deb['glcode'] == '3000/020')
-    <tr>
-      <td style="width:10px">{{ $deb['glcode'] }}</td>
-      <td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
-      <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
-      <td style="width:5px" >{{ number_format(0,2) }}</td>
-      <td style="width:10px">{{ number_format($deb['amaun'],2) }}</td>
-    </tr>
-  @endif
-@endforeach
-
-@foreach($Kredit as $index=>$kred)
-  @if($kred['glcode'] == '5000/241'  || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102' || $kred['glcode'] == '7000/090')
-    <tr>
-      <td style="width:10px">{{ $kred['glcode'] }}</td>
-      <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
-      <td style="width:5px">{{ number_format(0,2) }}</td>
-      <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
-      <td style="width:10px">{{ number_format(($kred['amaun']*-1),2) }}</td>
-    </tr>
-  @endif
-@endforeach
-
   <tr>
-    <th style="width:10px" colspan="3">JUMLAH: </th>
-    <th style="width:5px">{{ number_format($TotalDebit,2) }}</th>
-    <th style="width:5px" >{{ number_format($TotalKredit,2) }}</th>
-    <th style="width:10px">@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp</th>
+    <th style="text-align:left;font-weight:700;"colspan="3">Jumlah: </th>
+    <th style="text-align:right;font-weight:700;">{{ number_format($totalsamadebit,2) }}</th>
+    <th style="text-align:right;font-weight:700;">{{ number_format($totalsamakredit,2) }}</th>
+    <th style="text-align:right;font-weight:700;">@php $Total = $totalsamadebit - $totalsamakredit; echo number_format($Total,2); @endphp</th>
   </tr>
 </table>
 
@@ -391,7 +383,7 @@
 <br>
 
 
-<table id="details">
+{{-- <table id="details">
 <tr>
 <th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
 </tr>
@@ -429,4 +421,9 @@
  <td> </td>
  </tr>
 
-</table>
+</table> --}}
+
+<div style="margin-left:70px;">
+  <span class ="signature"><span style="margin-top:20px;">Disemak Oleh</span></span>  
+  <span class ="signature">Disahkan Oleh</span> 
+</div>