diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index d79985f..bcba937 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -21,6 +21,20 @@ class HomeController extends Controller
      */
     public function index()
     {
-        return view('includes.home');
+        $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();
+
+        $hargaemasterdahulu = array();
+
+        foreach($harga_emas as $index=>$harga)
+        {
+            $hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json();
+
+            $percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100;
+
+            array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]);
+
+        }
+
+        return view('includes.home',compact('hargaemasterdahulu'));
     }
 }
diff --git a/resources/views/includes/analisaportal.blade.php b/resources/views/includes/analisaportal.blade.php
index c0671d3..bef3525 100644
--- a/resources/views/includes/analisaportal.blade.php
+++ b/resources/views/includes/analisaportal.blade.php
@@ -214,62 +214,7 @@
                     </div>
                 </div>
             </div> -->
-            <div class="col-xl-6 col-md-12">
-                <div class="card card-bg shadow p-4">
-                    <div class="card-header border-0">
-                        <div class="row align-items-center">
-                            <div class="col">
-                                <h4 class="mb-0 text-primary">Harga Emas</h4>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="table-responsive">
-                        <!-- Projects table -->
-                        <table class="table align-items-center table-bordered table-hover border" id="harga_emas" style="text-align: center; width: 100%">
-                            <thead class="thead-dark bg-dark text-white text-center">
-                                <tr>
-                                    <th>Karat</th>
-                                    <th>Harga (RM)</th>
-                                    <th>Perubahan (%)</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                @foreach($hargaemasterdahulu as $index=>$hm)
-                                <tr>
-                                    <td>{{ $hm['karat'] }}</td>
-                                    <td>{{ $hm['hargasemasa'] }}</td>
-                                    @if($hm['percent'] > 0)
-                                    <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">({{ number_format($hm['percent'],2) }})</span></td>
-                                    @else
-                                    <td><i class="fas fa-arrow-down text-warning mr-3"></i><span class="text-warning">({{ number_format($hm['percent']*-1,2) }})</span></td>
-                                    @endif
-                                </tr>
-                                @endforeach
-                                <!-- <tr>
-                                    <td>14.0k</td>
-                                    <td>157.30</td>
-                                    <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                                </tr>
-                                <tr>
-                                    <td>14.0k</td>
-                                    <td>157.30</td>
-                                    <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                                </tr>
-                                <tr>
-                                    <td>14.0k</td>
-                                    <td>157.30</td>
-                                    <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                                </tr>
-                                <tr>
-                                    <td>14.0k</td>
-                                    <td>157.30</td>
-                                    <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
-                                </tr> -->
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
+            
         </div>
     </div>
 </section>
diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php
index 4055d5d..a2be44b 100644
--- a/resources/views/includes/bayaran/senaraibayaransag.blade.php
+++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php
@@ -69,10 +69,7 @@
                                     <th>#</th>
                                     <th>Ar-Rahn</th>
                                     <th>No Rujukan</th>
-                                    <th>Pembiayaan Asal</th>
-                                    <th>Baki Pembiayaan</th>
                                     <th>Keuntungan Semasa</th>
-                                    <th>Status</th>
                                 </tr>
                             </thead>
                             <tbody class="list">
@@ -121,24 +118,18 @@
                                                     @php
                                                     $marhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json();
                                                     @endphp
-                                                    <a href="#" class="linktarget" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$bt['pinjaman']}}" data-norujukan="{{$bt['norujukan']}}" data-hargajualan="{{$bt['hargajualan']}}" data-kodcaw="{{ $bt['kodcaw'] }}" data-target="#marhunModal"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
+                                                    <a href="#" class="linktarget" data-toggle="modal" data-pjmnum="{{ number_format($bt['pinjaman'],2) }}" data-bakipjm="{{ number_format($bt['bakipjm'],2) }}" data-lelong="{{ $bt['taglel'] }}" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$bt['pinjaman']}}" data-norujukan="{{$bt['norujukan']}}" data-hargajualan="{{$bt['hargajualan']}}" data-kodcaw="{{ $bt['kodcaw'] }}" data-target="#marhunModal"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
                                                 </div>
                                             </div>
                                         </th>
-                                        <td>
-                                            {{ number_format($bt['pinjaman'],2) }}
-                                        </td>
-                                        <td>
-                                            {{ number_format($bt['bakipjm'],2) }}
-                                        </td>
                                         <td>
                                             {{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) :  $koskeuntungan }}
                                         </td>
-                                        <td>
+                                        {{-- <td>
                                             @if($bt['taglel'] === 1)
                                             <span class="badge alert-danger">Akan Dilelong</span>
                                             @endif
-                                        </td>
+                                        </td> --}}
                                     </tr>
                                     @endif
                                     @endforeach
@@ -217,6 +208,21 @@
         var kodcaw = $(this).data('kodcaw');
         var hargajualan = $(this).data('hargajualan');
         var pinjaman = $(this).data('pinjaman');
+        var bakipjm = $(this).data('bakipjm');
+        var lelong = $(this).data('lelong');
+        var pjmnum = $(this).data('pjmnum');
+
+        $('#pemb').text('RM ' + pjmnum);
+        $('#bpemb').text('RM ' + bakipjm);
+
+        if(lelong === 1)
+        {
+            $('#statuslelong').text('Akan Dilelong');
+        }else{
+            $('#statuslelong').text('-');
+        }
+
+
 
         $('#norujukan_modal').val(norujukan);
         $('#pinjaman_modal').val(pinjaman);
diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index b74684f..592ce88 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -101,13 +101,86 @@
         </div>
         <div class="card-body text-center">
             <h5 class="font-weight-normal">
-                <a>Gold</a>
+                <a>PitihEmas</a>
             </h5>
             <button type="button" class="btn bg-gradient-primary btn-sm mb-0 mt-3" disabled>Enter</button>
         </div>
     </div>
 </div>
 
+<div class="col-lg-4 col-md-6">
+    <div class="card mt-3 card-bg shadow p-4">
+        {{-- <div class="card-header border-0">
+            <div class="row align-items-center">
+                <div class="col">
+                    <h4 class="mb-0 text-primary">Harga Emas</h4>
+                </div>
+            </div>
+        </div> --}}
+        <div class="table-responsive">
+            <!-- Projects table -->
+            <table class="table align-items-center table-bordered table-hover border" id="harga_emas" style="text-align: center; width: 100%">
+                <thead class="thead-dark bg-dark text-white text-center">
+                    <tr>
+                        <th>Karat</th>
+                        <th>Harga (RM)</th>
+                        <th>Perubahan (%)</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($hargaemasterdahulu as $index=>$hm)
+                    <tr>
+                        <td>{{ $hm['karat'] }}</td>
+                        <td>{{ $hm['hargasemasa'] }}</td>
+                        @if($hm['percent'] > 0)
+                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">({{ number_format($hm['percent'],2) }})</span></td>
+                        @else
+                        <td><i class="fas fa-arrow-down text-warning mr-3"></i><span class="text-warning">({{ number_format($hm['percent']*-1,2) }})</span></td>
+                        @endif
+                    </tr>
+                    @endforeach
+                    <!-- <tr>
+                        <td>14.0k</td>
+                        <td>157.30</td>
+                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
+                    </tr>
+                    <tr>
+                        <td>14.0k</td>
+                        <td>157.30</td>
+                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
+                    </tr>
+                    <tr>
+                        <td>14.0k</td>
+                        <td>157.30</td>
+                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
+                    </tr>
+                    <tr>
+                        <td>14.0k</td>
+                        <td>157.30</td>
+                        <td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">0.47</span></td>
+                    </tr> -->
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<script>
+
+var hargaemastable = $('#harga_emas').DataTable({
+        "bLengthChange": false,
+        "bFilter": false,
+        language: {
+            'paginate': {
+                'previous': '<span class="fas fa-backward"></span>',
+                'next': '<span class="fas fa-forward"></span>'
+            }
+        },
+        "scrollX": true,
+        "pageLength": 5
+
+    });
+
+</script>
 <!-- <script>
     $(function() {
         setTimeout(() => {
diff --git a/resources/views/includes/login/index.blade.php b/resources/views/includes/login/index.blade.php
index 0132981..0107510 100644
--- a/resources/views/includes/login/index.blade.php
+++ b/resources/views/includes/login/index.blade.php
@@ -72,13 +72,14 @@
                             Hak Milik ©
                             <script>
                                 document.write(new Date().getFullYear())
-                            </script> Koperasi Permodalan Kelantan Berhad
+                            </script> Permodalan Kelantan Berhad
                         </div>
                     </div>
                     <div class="col-12 col-md-6">
                         <ul class="nav nav-footer justify-content-center justify-content-lg-end">
                             <li class="nav-item">
-                                <a href="#" class="nav-link text-white">Hubungi Kami</a>
+                                <a href="#" target="_blank" class="nav-link text-white">Hubungi Kami</a>
+                                <a href="#" target="_blank" class="nav-link text-white">Hubungi Kami</a>
                             </li>
                         </ul>
                     </div>
diff --git a/resources/views/includes/login/loginportal.blade.php b/resources/views/includes/login/loginportal.blade.php
index 1f85d30..15e9088 100644
--- a/resources/views/includes/login/loginportal.blade.php
+++ b/resources/views/includes/login/loginportal.blade.php
@@ -35,7 +35,7 @@
 
     <div class="form-check form-switch d-flex align-items-center mb-3">
         <input class="form-check-input" type="checkbox" id="rememberMe">
-        <label class="form-check-label mb-0 ms-2" for="rememberMe">Remember me</label>
+        <label class="form-check-label mb-0 ms-2" for="rememberMe">Remember Me</label>
     </div>
     <div class="text-center">
         <button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" onclick="loadingbtn();this.disabled=true;this.form.submit();" style="background: #4A4E59;">Log In</button>
diff --git a/resources/views/includes/main/footercontent.blade.php b/resources/views/includes/main/footercontent.blade.php
index 69c31a0..b7c786b 100644
--- a/resources/views/includes/main/footercontent.blade.php
+++ b/resources/views/includes/main/footercontent.blade.php
@@ -56,16 +56,16 @@
             <li class="nav-link nav-color" style="font-size: 12px;">
                 Hotline : 1300-22-4343
             </li>
-            <!-- <li class="nav-link nav-color" style="font-size: 12px;">
-                            <i class="fa fa-envelope" aria-hidden="true"></i>
+            <li class="nav-link nav-color" style="font-size: 12px;">
+                <i class="fa fa-envelope" aria-hidden="true"></i>
 
-                            arrahncareline@gmail.com
-                        </li>
-                        <li class="nav-link nav-color" style="font-size: 12px;">
-                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                arrahncareline@gmail.com
+            </li>
+            <li class="nav-link nav-color" style="font-size: 12px;">
+                <i class="fa fa-envelope" aria-hidden="true"></i>
 
-                            arcc@pkb.net.my
-                        </li> -->
+                arcc@pkb.net.my
+            </li>
         </ul>
     </div>
 </div>
diff --git a/resources/views/includes/main/navigation.blade.php b/resources/views/includes/main/navigation.blade.php
index 89ca5af..c4af549 100644
--- a/resources/views/includes/main/navigation.blade.php
+++ b/resources/views/includes/main/navigation.blade.php
@@ -67,7 +67,7 @@
             <nav class="navbar navbar-expand-lg blur border-radius-xl top-0 z-index-fixed shadow position-absolute my-3 py-2 start-0 end-0 mx-4">
                 <div class="container-fluid px-0">
                     <a class="navbar-brand font-weight-bolder ms-sm-3" href="/" rel="tooltip" title="e-Rahn" data-placement="bottom">
-                        CUSTOMER PORTAL
+                        PORTAL PELANGGAN
                     </a>
                     <button class="navbar-toggler shadow-none ms-2" type="button" data-bs-toggle="collapse" data-bs-target="#navigation" aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
                         <span class="navbar-toggler-icon mt-2">
diff --git a/resources/views/includes/rekod/pilihcawangan.blade.php b/resources/views/includes/rekod/pilihcawangan.blade.php
index 660ce49..cc3f9a0 100644
--- a/resources/views/includes/rekod/pilihcawangan.blade.php
+++ b/resources/views/includes/rekod/pilihcawangan.blade.php
@@ -2,13 +2,13 @@
 
 @section('content')
 
-<title>Rekod Pembelian | Customer Portal</title>
+<title>Rekod Pembayaran | Customer Portal</title>
 
 <div class="row">
     <nav aria-label="breadcrumb">
         <ol class="breadcrumb">
             <li class="breadcrumb-item text-dark opacity-5"><a href="/">Home</a></li>
-            <li class="breadcrumb-item text-dark active" aria-current="page">Rekod Pembelian</li>
+            <li class="breadcrumb-item text-dark active" aria-current="page">Rekod Pembayaran</li>
         </ol>
     </nav>
 </div>
diff --git a/resources/views/includes/rekod/rekodsag.blade.php b/resources/views/includes/rekod/rekodsag.blade.php
index 53b6142..9299647 100644
--- a/resources/views/includes/rekod/rekodsag.blade.php
+++ b/resources/views/includes/rekod/rekodsag.blade.php
@@ -94,12 +94,7 @@
             <thead class="thead-light bg-dark text-white text-center">
                 <tr>
                     <th scope="col" class="sort" data-sort="name">No Rujukan</th>
-                    <th scope="col" class="sort" data-sort="budget">Pembiayaan Asal</th>
-                    <th scope="col" class="sort" data-sort="status">Baki Pembiayaan</th>
                     <th scope="col" class="sort" data-sort="budget">Keuntungan</th>
-                    <th scope="col" class="sort" data-sort="budget">N. Marhun</th>
-                    <th scope="col" class="sort" data-sort="budget">Berat(gm)</th>
-                    <th scope="col" class="sort" data-sort="budget">Kos Keuntungan (12 Bulan)</th>
                     <th scope="col" class="sort" data-sort="budget">JBG</th>
                 </tr>
             </thead>
@@ -110,29 +105,14 @@
                     <th scope="row">
                         <div class="media align-items-center">
                             <div class="media-body">
-                                <a href="#" onclick="bayaranfunc(this)" class="linktarget" data-toggle="modal" data-target="#historybayaranModal" data-norujukan="{{ $bt['norujukan'] }}" data-url="">{{ $bt['norujukan'] }}</a>
+                                <a href="#" onclick="bayaranfunc(this)" data-pinjaman="{{ number_format($bt['pinjaman'],2) }}" data-upah12="{{ number_format($bt['upah12'],2) }}" data-bakipjm="{{ number_format($bt['bakipjm'],2) }}" data-berat="{{ $bt['berat'] }}" data-nm="{{ number_format($bt['nilaimarhun'],2) }}" class="linktarget" data-toggle="modal" data-target="#historybayaranModal" data-norujukan="{{ $bt['norujukan'] }}" data-url="">{{ $bt['norujukan'] }}</a>
                                 {{-- <a href="{{ route('penyata.summary',['kodcaw' => $bt['kodcaw'], 'norujukan' => $bt['norujukan']]) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a> --}}
                             </div>
                         </div>
                     </th>
-                    <td>
-                        {{ number_format($bt['pinjaman'],2) }}
-                    </td>
-                    <td>
-                        {{ number_format($bt['bakipjm'],2) }}
-                    </td>
                     <td>
                         {{ number_format($bt['bakiupah'],2) }}
                     </td>
-                    <td>
-                        {{ number_format($bt['nilaimarhun'],2) }}
-                    </td>
-                    <td>
-                        {{ number_format($bt['berat'],2) }}
-                    </td>
-                    <td>
-                        {{ number_format($bt['upah12'],2) }}
-                    </td>
                     <td>
                         {{ number_format($bt['tempoh'],2) }}
                     </td>
@@ -147,7 +127,7 @@
 <!-- <hr class="dark my-md-6 mt-2 mx-7"> -->
 <div class="container col-11 shadow-lg p-3 mb-5 bg-white rounded">
     <div class="card-header border-0">
-        <h5 class="mb-0 text-primary">Penyata Yang Sudah Ditebus</h5>
+        <h5 class="mb-0 text-primary">Pembiayaan Yang Sudah Diselesaikan</h5>
     </div>
     <!-- Light table -->
     <div class="table-responsive table-bordered">
@@ -248,6 +228,22 @@
     function bayaranfunc(e){
         let norujukan = $(e).data('norujukan');
 
+        let pinjaman = $(e).data('pinjaman');
+        let upah12 = $(e).data('upah12');
+        let bakipjm = $(e).data('bakipjm');
+        let berat = $(e).data('berat');
+        let nm = $(e).data('nm');
+
+        console.log(pinjaman,upah12,bakipjm,berat,nm);
+
+        $('#pembiayaan').text('RM ' + pinjaman);
+        $('#bpemb').text('RM ' + bakipjm);
+        $('#nm').text('RM ' + nm);
+        $('#berat').text(berat + 'g');
+        $('#koskeun').text('RM ' + upah12);
+
+
+
         $.ajax({
             method: 'get',
             url: endpoint + '/api/transaction/' + norujukan,
@@ -269,9 +265,9 @@
             var date = new Date(bayaran['created_at']);
             historybayarandatatable.row.add([
                     counter,
-                    date.toLocaleDateString(), 
+                    // date.toLocaleDateString(), 
+                    '<a target="_blank" href='+ urlroute + '>'+date.toLocaleDateString()+'</a>',
                     "RM " + bayaran['duit_masuk'],
-                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
                 ]).draw();
                 counter = counter + 1;
         });
diff --git a/resources/views/modal/historybayaran.blade.php b/resources/views/modal/historybayaran.blade.php
index 7c40282..466ca46 100644
--- a/resources/views/modal/historybayaran.blade.php
+++ b/resources/views/modal/historybayaran.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <h5 class="modal-title" id="ModalTitle">History Bayaran</h5>
+          <h5 class="modal-title" id="ModalTitle">Rekod Bayaran</h5>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
@@ -33,37 +33,60 @@
 
   <div class="modal animate__animated animate__bounceInDown" id="historybayaranModal">
     <div class="modal-dialog modal-lg modal-dialog-centered">
-        <div class="modal-content">
+      <div class="modal-content">
 
-            <!-- Modal Header -->
-            <div class="modal-header">
-              <h5 class="modal-title" id="ModalTitle">History Bayaran</h5>
-              </button>
-            </div>
-
-            <!-- Modal body -->
-            <div class="modal-body">  
-              <table id="tablehistorybayaran" class="table table-striped table-bordered text-center">
-                  <thead class="bg-dark text-white">
-                      <tr>
-                          <th>Bil</th>
-                          <th>Tarikh Bayaran</th>
-                          <th>Bayaran</th>
-                          <th>Action</th>
-                      </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-              </table>
-            </div>
-
-            <!-- Modal footer -->
-            <div class="modal-footer">
-              <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-          </div>
+        <!-- Modal Header -->
+        <div class="modal-header">
+          <h5 class="modal-title" id="ModalTitle">Rekod Bayaran</h5>
+          </button>
         </div>
+
+        <!-- Modal body -->
+        <div class="modal-body">
+
+          <div class="row">
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pembiayaan"></span></b></div></div>
+            </div>
+
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>B. Pembiayaan: <span id="bpemb"></span></b></div></div>
+            </div>
+
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>N. Marhun: <span id="nm"></span></b></div></div>
+            </div>
+
+            <div class="col-4">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Berat: <span id="berat"></span></b></div></div>
+            </div>
+
+            <div class="col-6">
+              <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Kos Keuntungan (12 Bulan): <span id="koskeun"></span></b></div></div>
+            </div>
+          </div>
+
+          <div style="overflow-x: auto;">
+            <table id="tablehistorybayaran" class="table table-striped table-bordered text-center">
+              <thead class="bg-dark text-white">
+                <tr>
+                  <th>Bil</th>
+                  <th>Tarikh Bayaran</th>
+                  <th>Bayaran</th>
+                  <!-- <th>Action</th> -->
+                </tr>
+              </thead>
+              <tbody>
+              </tbody>
+            </table>
+          </div>
+          <p><i>*Sila klik di atas tarikh bayaran untuk mencetak resit bayaran.</i></p>
+        </div>
+
+        <!-- Modal footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Kembali</button>
+        </div>
+      </div>
     </div>
-</div>
-
-
-
+  </div>
\ No newline at end of file
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php
index f4f8ecb..492d33b 100644
--- a/resources/views/modal/marhun.blade.php
+++ b/resources/views/modal/marhun.blade.php
@@ -10,9 +10,24 @@
 
             <!-- Modal body -->
             <div class="modal-body">
+
+                <div class="row">
+                    <div class="col-4">
+                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Pembiayaan: <span id="pemb"></span></b></div></div>
+                    </div>
+        
+                    <div class="col-4">
+                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>B. Pembiayaan: <span id="bpemb"></span></b></div></div>
+                    </div>
+        
+                    <div class="col-4">
+                      <div class="p-2 rounded bg-warning text-center text-dark mb-2"><div class="inner"><b>Status: <span id="statuslelong"></span></b></div></div>
+                    </div>
+                  </div>
+
                 <div class="table-responsive table-bordered">
                     <table id="biasa" class="table table-hover text-center" style="width:100%">
-                        <thead class="thead-dark">
+                        <thead class="bg-dark text-white">
                             <tr>
                                 <th>Bil</th>
                                 <th>Jenis Marhun</th>
diff --git a/resources/views/resit/resitansuran.blade.php b/resources/views/resit/resitansuran.blade.php
index d7586aa..714eeaf 100644
--- a/resources/views/resit/resitansuran.blade.php
+++ b/resources/views/resit/resitansuran.blade.php
@@ -1,459 +1,589 @@
-
-
 <!DOCTYPE html>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-<script>
-    // $(document).ready(function () {
-    //   window.print();
-    //   window.onfocus=function(){ window.close();}
-    // });
-</script>
-<style>
-/* Red border */
-hr.new1 {
-  border-top: 1px solid red;
-}
-
-/* Dashed red border */
-hr.new2 {
-  border-top: 1px dashed red;
-}
-
-/* Dotted red border */
-hr.new3 {
-  border-top: 1px dotted red;
-}
-
-/* Thick red border */
-hr.new4 {
-  border: 1px solid red;
-}
-
-/* Large rounded green border */
-hr.new5 {
-  border: 10px solid green;
-  border-radius: 5px;
-}
-</style>
-
-<style>
-
-#cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:20%;
-    font-size:12px;
-    border: 1px solid black;
-
-  }
-
-  #cust td, #cust th {
-    border: 0px solid;
-    padding: 3px;
-    font-size:10px;
-    text-align:right;
-
-  }
-
-  #cust tr:nth-child(even){background-color: #ffffff;}
-
-  #cust tr:hover {background-color: #ddd;}
-
-  #cust th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align:right;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
-
-  #cust {
-  margin-left: auto;
-  margin-right: 0;
-}
-
-  hr.new1 {
-    border-top: 1px dotted black;
-  }
-  .khazanah{
-    border:1px solid black;
-    margin-left:20px;
-    padding:10px;
-    width : 250px;
-    transform: rotate(-90deg);
-    font-size:11px;
-  }
-
-  #inside {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    font-size:15px;
-  }
-
-  #inside td, #inside th {
-    border: none;
-    padding: 2px;
-  }
-
-  #inside tr:nth-child(even){background-color: #ffffff;}
-
-  #inside tr:hover {background-color: #ddd;}
-
-  #inside th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: left;
-    background-color: #4CAF50;
-    color: white;
-  }
-
-
-
-
-  #semakan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    margin-top:40px;
-    font-size:12px;
-  }
-
-  #semakan td, #semakan th {
-    border: none;
-    padding: 2px;
-    text-align: center;
-  }
-
-  #semakan tr:nth-child(even){background-color: #ffffff;}
-
-  #semakan tr:hover {background-color: #ddd;}
-
-  #semakan th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: left;
-    background-color: #4CAF50;
-    color: white;
-  }
-
-  #salinan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    font-size:11px;
-  }
-
-  #salinan td, #salinan th {
-    padding: 2px;
-  }
-
-
-  #salinan tr:nth-child(even){background-color: #ffffff;}
-
-  #salinan tr:hover {background-color: #ffffff;}
-
-  #salinan th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: right;
-    background-color: #ffffff;
-    color: black;
-    padding:2px;
-  }
-  #perjanjian {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 100%;
-    font-size:12px;
-
-  }
-
-  #perjanjian td, #perjanjian th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:10px;
-  }
-
-  #perjanjian tr:nth-child(even){background-color:#ffffff}
-
-  #perjanjian tr:hover {background-color: #ddd;}
-
-  #perjanjian th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:5px;
-  }
-  #keuntungan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 100%;
-    font-size:12px;
-
-  }
-
-  #keuntungan td, #keuntungan th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:10px;
-  }
-
-  #keuntungan tr:nth-child(even){background-color: #ffffff;}
-
-  #keuntungan tr:hover {background-color: #ddd;}
-
-  #keuntungan th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
-
-  #payment {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 90%;
-    font-size:13px;
-    border: 1px solid black;
-
-  }
-
-  #payment td, #payment th {
-    border: 0px solid;
-    padding: 3px;
-    font-size:15px;
-    text-align: left;
-
-  }
-
-  #payment tr:nth-child(even){background-color: #ffffff;}
-
-  #payment tr:hover {background-color: #ddd;}
-
-  #payment th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align:left;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+  <script>
+    $(document).ready(function() {
+      window.print();
+      // window.onfocus=function(){ window.close();}
+    });
+  </script>
+  <style>
+    /* Red border */
+    hr.new1 {
+      border-top: 1px solid red;
+    }
+
+    /* Dashed red border */
+    hr.new2 {
+      border-top: 1px dashed red;
+    }
+
+    /* Dotted red border */
+    hr.new3 {
+      border-top: 1px dotted red;
+    }
+
+    /* Thick red border */
+    hr.new4 {
+      border: 1px solid red;
+    }
+
+    /* Large rounded green border */
+    hr.new5 {
+      border: 10px solid green;
+      border-radius: 5px;
+    }
+  </style>
+
+  <style>
+    #cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      /* width: 100%; */
+      font-size: 12px;
+      border: 1px solid black;
+
+    }
+
+    #cust td,
+    #cust th {
+      border: 0px solid;
+      padding: 3px;
+      font-size: 10px;
+      text-align: right;
+
+    }
+
+    #cust tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #cust tr:hover {
+      background-color: #ddd;
+    }
+
+    #cust th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: right;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #cust {
+      margin-left: auto;
+      margin-right: 0;
+    }
+
+    hr.new1 {
+      border-top: 1px dotted black;
+    }
+
+    .khazanah {
+      border: 1px solid black;
+      margin-left: 20px;
+      padding: 10px;
+      width: 250px;
+      transform: rotate(-90deg);
+      font-size: 11px;
+    }
+
+    #inside {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 15px;
+    }
+
+    #inside td,
+    #inside th {
+      border: none;
+      padding: 2px;
+    }
+
+    #inside tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #inside tr:hover {
+      background-color: #ddd;
+    }
+
+    #inside th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: left;
+      background-color: #4CAF50;
+      color: white;
+    }
+
+
+
+
+    #semakan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      margin-top: 40px;
+      font-size: 12px;
+    }
+
+    #semakan td,
+    #semakan th {
+      border: none;
+      padding: 2px;
+      text-align: center;
+    }
+
+    #semakan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #semakan tr:hover {
+      background-color: #ddd;
+    }
+
+    #semakan th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: left;
+      background-color: #4CAF50;
+      color: white;
+    }
+
+    #salinan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 11px;
+    }
+
+    #salinan td,
+    #salinan th {
+      padding: 2px;
+    }
+
+
+    #salinan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #salinan tr:hover {
+      background-color: #ffffff;
+    }
+
+    #salinan th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: right;
+      background-color: #ffffff;
+      color: black;
+      padding: 2px;
+    }
+
+    #perjanjian {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 12px;
+
+    }
+
+    #perjanjian td,
+    #perjanjian th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 10px;
+    }
+
+    #perjanjian tr:nth-child(even) {
+      background-color: #ffffff
+    }
+
+    #perjanjian tr:hover {
+      background-color: #ddd;
+    }
+
+    #perjanjian th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 5px;
+    }
+
+    #keuntungan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 12px;
+
+    }
+
+    #keuntungan td,
+    #keuntungan th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 10px;
+    }
+
+    #keuntungan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #keuntungan tr:hover {
+      background-color: #ddd;
+    }
+
+    #keuntungan th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #payment {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 90%;
+      font-size: 13px;
+      border: 1px solid black;
+
+    }
+
+    #payment td,
+    #payment th {
+      border: 0px solid;
+      padding: 3px;
+      font-size: 15px;
+      text-align: left;
+
+    }
+
+    #payment tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #payment tr:hover {
+      background-color: #ddd;
+    }
+
+    #payment th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #payment {
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    #akuan td,
+    #akuan th {
+      padding: 7px;
+      font-size: 10px;
+      padding: 4px;
+    }
+
+    #akuan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #akuan tr:hover {
+      background-color: #ddd;
+    }
+
+    #akuan th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 3px;
+    }
 
-  #payment {
-  margin-left: auto;
-  margin-right: auto;
-}
+    .page-break {
+      page-break-before: always;
+    }
 
-  #akuan td, #akuan th {
-    padding: 7px;
-    font-size:10px;
-    padding:4px;
-  }
+    .formula {
+      font-family: Arial, Helvetica, sans-serif;
+      font-size: 14px;
+    }
 
-  #akuan tr:nth-child(even){background-color:#ffffff;}
+    #copy_cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 10%;
+      font-size: 12px;
 
-  #akuan tr:hover {background-color: #ddd;}
+    }
 
-  #akuan th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:3px;
-  }
-  .page-break{
-    page-break-before:always;
-  }
-  
-  .formula{
-    font-family: Arial, Helvetica, sans-serif;
-    font-size:14px;
-  }
-  
-  #copy_cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:10%;
-    font-size:12px;
 
-  }
 
+    #copy_cust tr:nth-child(even) {
+      background-color: #ffffff;
+    }
 
+    #copy_cust tr:hover {
+      background-color: #ffffff
+    }
 
-  #copy_cust tr:nth-child(even){background-color: #ffffff;}
+    #copy_cust th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 4px;
+    }
 
-  #copy_cust tr:hover {background-color:#ffffff}
 
-  #copy_cust th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:4px;
-  }
+    #copy_cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 50%;
+      font-size: 12px;
 
 
-  #copy_cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 50%;
-    font-size:12px;
-
-
-  }
-
-  #copy_cust td, #copy_cust th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:9px;
-    text-align:right;
-    width: 10%;
-
-  }
-
-  #copy_cust {
-    margin-right:0px;margin-left:auto
-}
-
-
-
-
-
-  #inside tr:nth-child(even){background-color: #ffffff;}
-
-  #inside tr:hover {background-color: #ddd;}
-
-  #inside th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:4px;
-  }
- 
-</style>
-
-
-
-
-
-
-
-  <table>
-
-    <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
-    <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
-    
-  </table>
-
-  <table id="cust">
-<tr>
- <th style="width:5px;"> Salinan Pelanggan</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
-
-</tr>
-
-  </table>
-
-<br>
-  <table id="inside">
-
- <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
- </tr>
- <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
- </tr>
+    }
+
+    #copy_cust td,
+    #copy_cust th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 9px;
+      text-align: right;
+      width: 10%;
+
+    }
+
+    #copy_cust {
+      margin-right: 0px;
+      margin-left: auto
+    }
+
+
+
+
+
+    #inside tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #inside tr:hover {
+      background-color: #ddd;
+    }
+
+    #inside th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 4px;
+    }
+  </style>
+
+  <title>Resit | Portal Pelanggan</title>
+  <link href="{{ asset('argon') }}/img/brand/ARRAHN1.png" rel="icon" type="image/png">
+
+
+</head>
+
+
+
+
+
+
+<table>
+
+  <td rowspan="4" style="width:50px;"> <img src="{{ asset('argon/img/brand/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center"> </td>
+  <td rowspan="4" style="width:50px;"><img src="{{ asset('argon/img/brand/pkb.png') }}" style="width:50px" alt="User Image" class="center"> </td>
 
- <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpanan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
- </tr>
- 
- <tr>
-  <td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
-   </tr>
-  
-   <tr>
-  <td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
-   </tr>
-  </table>
-  <br>
-
-  <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
-<table id="payment">
-  <tr>
-    <td style="width:30%">Harga Jualan/Baki</td>
-    <td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
-    <td style="width:30%">Pembiayaan/Baki</td>
-    <td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
-  </tr>
-  <tr>
-    <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
-    <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
-    <td style="width:30%">Ansuran Pembiyaan</td>
-    <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
-  </tr>
-  <tr>
-    <td style="width:30%">Baki Harga Jualan</td>
-    <td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
-    <td style="width:30%">Baki Pembiayaan</td>
-    <td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
-  </tr>
-  <tr>
-    <td style="width:10px"></td>
-    <td style="width:10px"></td>
-    <td style="width:10px">Keuntungan</td>
-    <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
-  </tr>
 </table>
-<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
+
+<table id="cust">
+  <tr>
+    <th>Cetakan Atas Talian Ar-Rahn Pay</th>
+  </tr>
+  <tr>
+    <td> RESIT BAYARAN </td>
+
+  </tr>
+
+</table>
+
+<br>
+<div class="container">
+  <div class="row">
+    <div class="col-md-6 col-sm-12">
+      <table id="inside">
+
+        <tr>
+          <td colspan="3" width="50%">Marhun</td>
+          <td>: {{ $gadai['marhun'] }} </td>
+        </tr>
+        <tr>
+          <td colspan="3">Nama</td>
+          <td>: {{ $customers_info['nama'] }} </td>
+        </tr>
+
+        <tr>
+          <td colspan="3">No K/P </td>
+          <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td>
+        </tr>
+
+        <tr>
+          <td colspan="3">Nama Wakil </td>
+          <td>: </td>
+        </tr>
+
+        <tr>
+          <td colspan="3">No K/P Wakil </td>
+          <td>: </td>
+        </tr>
+      </table>
+    </div>
+    <div class="col-md-6 col-sm-12">
+      <table id="inside">
+
+        <tr>
+          <td width="50%"><b> No SAG</b></td>
+          <td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
+        </tr>
+        <tr>
+          <td> Tarikh Bayar</td>
+          <td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+        </tr>
+
+        <tr>
+          <td> <b>Tempoh Simpanan</b></td>
+          <td>:<b> {{ $gadai['tempoh'] }}</b> </td>
+        </tr>
+
+        <!-- <tr>
+          <td colspan="3">Nama Wakil </td>
+          <td>: </td>
+          <td colspan="3"> </td>
+          <td> </td>
+          <td> </td>
+          <td> </td>
+          <td> </td>
+        </tr>
+
+        <tr>
+          <td colspan="3">No K/P Wakil </td>
+          <td>: </td>
+          <td colspan="3"> </td>
+          <td> </td>
+          <td> </td>
+          <td> </td>
+          <td> </td>
+        </tr> -->
+      </table>
+      <h1>A</h1>
+    </div>
+  </div>
+</div>
+<br>
+
+<!-- <h1 style="float:left;position:absolute;margin-left:10px;">A</h1> -->
+<div class="container" style="border: 1px solid #000;">
+  <div class="row">
+    <div class="col-md-6 col-sm-12">
+
+      <table id="inside">
+        <tr>
+          <td>Harga Jualan/Baki</td>
+          <td>: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
+
+
+        </tr>
+        <tr>
+          <td><b>Bayaran Harga Jualan</b></td>
+          <td>: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
+
+
+        </tr>
+        <tr>
+          <td>Baki Harga Jualan</td>
+          <td>: RM {{ number_format($transaction['bakiharga'],2) }}</td>
+
+
+        </tr>
+
+      </table>
+    </div>
+    <div class="col-md-6 col-sm-12">
+      <table id="inside">
+        <tr>
+          <td>Pembiayaan/Baki</td>
+          <td>: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
+        </tr>
+        <tr>
+          <td>Ansuran Pembiyaan</td>
+          <td>: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
+        </tr>
+        <tr>
+          <td>Baki Pembiayaan</td>
+          <td>: RM {{ number_format($gadai['bakipjm'],2) }} </td>
+        </tr>
+        <tr>
+          <td>Keuntungan</td>
+          <td>: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</div>
+<p style="margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
+<p><i>* *Paparan terbaik resit menggunakan paparan web.</i></p>
 <br>
 
 
 
 
 
-  <table id="semakan">
-      <tr>
-      <td colspan="3">.................................................... </td> 
-      <td></td>    
+{{--<table id="semakan">
+    <tr>
       <td colspan="3">.................................................... </td>
-      <td></td> 
+      <td></td>
       <td colspan="3">.................................................... </td>
-      <td></td> 
+      <td></td>
       <td colspan="3">.................................................... </td>
-</tr>
-<tr>
+      <td></td>
+      <td colspan="3">.................................................... </td>
+    </tr>
+    <tr>
 
-<td colspan="3">DiSemak </td> 
-      <td></td>    
+      <td colspan="3">DiSemak </td>
+      <td></td>
       <td colspan="3"> Cagaran Di Keluarkan</td>
-      <td></td> 
+      <td></td>
       <td colspan="3">Cagaran Diterima </td>
-      <td></td> 
+      <td></td>
       <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
-  </table>
-  <br>
-  <br>
-  <hr class="new2"></hr>
+</table>
+<br>
+<br>
+<hr class="new2">
+</hr>
 
 <br>
 <br>
@@ -462,37 +592,67 @@ hr.new5 {
 
 
 <table id="cust">
-<tr>
-<th style="width:5px;"> Salinan Pejabat</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
+  <tr>
+    <th style="width:5px;"> Salinan Pejabat</th>
+  </tr>
+  <tr>
+    <td style="width:5px;"> RESIT BAYARAN </td>
 
-</tr>
+  </tr>
 
 </table>
 
 <br>
 <table id="inside">
 
-<tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
-</tr>
-<tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
-</tr>
+  <tr>
+    <td colspan="3">Marhun</td>
+    <td>: {{ $gadai['marhun'] }} </td>
+    <td colspan="3"> </td>
+    <td> </td>
+    <td> </td>
+    <td><b> No SAG</b></td>
+    <td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
+  </tr>
+  <tr>
+    <td colspan="3">Nama</td>
+    <td>: {{ $customers_info['nama'] }} </td>
+    <td colspan="3"> </td>
+    <td> </td>
+    <td> </td>
+    <td> Tarikh Bayar</td>
+    <td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
+  </tr>
 
-<tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
-</tr>
+  <tr>
+    <td colspan="3">No K/P </td>
+    <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td>
+    <td colspan="3"> </td>
+    <td> </td>
+    <td> </td>
+    <td> <b>Tempoh Simpan</b></td>
+    <td>:<b> {{ $gadai['tempoh'] }}</b> </td>
+  </tr>
 
-<tr>
-  <td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
-   </tr>
-  
-   <tr>
-  <td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
-   </tr>
+  <tr>
+    <td colspan="3">Nama Wakil </td>
+    <td>: </td>
+    <td colspan="3"> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+
+  <tr>
+    <td colspan="3">No K/P Wakil </td>
+    <td>: </td>
+    <td colspan="3"> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
 </table>
 <br>
 
@@ -532,26 +692,26 @@ hr.new5 {
 
 
 <table id="semakan">
-    <tr>
-    <td colspan="3">.................................................... </td> 
-    <td></td>    
+  <tr>
     <td colspan="3">.................................................... </td>
-    <td></td> 
+    <td></td>
     <td colspan="3">.................................................... </td>
-    <td></td> 
+    <td></td>
     <td colspan="3">.................................................... </td>
-</tr>
-<tr>
+    <td></td>
+    <td colspan="3">.................................................... </td>
+  </tr>
+  <tr>
 
-<td colspan="3">DiSemak </td> 
-    <td></td>    
+    <td colspan="3">DiSemak </td>
+    <td></td>
     <td colspan="3"> Cagaran Di Keluarkan</td>
-    <td></td> 
+    <td></td>
     <td colspan="3">Cagaran Diterima </td>
-    <td></td> 
+    <td></td>
     <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
-</tr>
+  </tr>
 </table>
-<br>
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resitansuransebelum.blade.php b/resources/views/resit/resitansuransebelum.blade.php
index 1c4b76b..c6525b5 100644
--- a/resources/views/resit/resitansuransebelum.blade.php
+++ b/resources/views/resit/resitansuransebelum.blade.php
@@ -442,7 +442,7 @@ hr.new5 {
 
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -565,4 +565,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resittambahpinjam.blade.php b/resources/views/resit/resittambahpinjam.blade.php
index 5f3ffa4..db76484 100644
--- a/resources/views/resit/resittambahpinjam.blade.php
+++ b/resources/views/resit/resittambahpinjam.blade.php
@@ -445,7 +445,7 @@ hr.new5 {
 
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -571,4 +571,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resittebus.blade.php b/resources/views/resit/resittebus.blade.php
index 830076f..abfac3d 100644
--- a/resources/views/resit/resittebus.blade.php
+++ b/resources/views/resit/resittebus.blade.php
@@ -1,430 +1,505 @@
-
-
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-<script>
-    $(document).ready(function () {
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+
+  <title>Resit | Portal Pelanggan</title>
+  <link href="{{ asset('argon') }}/img/brand/ARRAHN1.png" rel="icon" type="image/png">
+
+
+  <script>
+    $(document).ready(function() {
       window.print();
-      window.onfocus=function(){ window.close();}
+      // window.onfocus = function() {
+      //   window.close();
+      // }
     });
-</script>
-<style>
-/* Red border */
-hr.new1 {
-  border-top: 1px solid red;
-}
+  </script>
+  <style>
+    /* Red border */
+    hr.new1 {
+      border-top: 1px solid red;
+    }
+
+    /* Dashed red border */
+    hr.new2 {
+      border-top: 1px dashed red;
+    }
+
+    /* Dotted red border */
+    hr.new3 {
+      border-top: 1px dotted red;
+    }
+
+    /* Thick red border */
+    hr.new4 {
+      border: 1px solid red;
+    }
+
+    /* Large rounded green border */
+    hr.new5 {
+      border: 10px solid green;
+      border-radius: 5px;
+    }
+  </style>
+  <style>
+    #cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      /* width: 20%; */
+      font-size: 12px;
+      border: 1px solid black;
+
+    }
+
+    #cust td,
+    #cust th {
+      border: 0px solid;
+      padding: 3px;
+      font-size: 10px;
+      text-align: right;
+
+    }
+
+    #cust tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #cust tr:hover {
+      background-color: #ddd;
+    }
+
+    #cust th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: right;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #cust {
+      margin-left: auto;
+      margin-right: 0;
+    }
+  </style>
+  <style>
+    hr.new1 {
+      border-top: 1px dotted black;
+    }
+
+    .khazanah {
+      border: 1px solid black;
+      margin-left: 20px;
+      padding: 10px;
+      width: 250px;
+      transform: rotate(-90deg);
+      font-size: 12px;
+    }
+
+    #inside {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 15px;
+    }
+
+    #inside td,
+    #inside th {
+      border: none;
+      padding: 2px;
+    }
+
+    #inside tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #inside tr:hover {
+      background-color: #ddd;
+    }
+
+    #inside th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: left;
+      background-color: #4CAF50;
+      color: white;
+    }
+
+
+
+
+    #semakan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      margin-top: 40px;
+      font-size: 12px;
+    }
+
+    #semakan td,
+    #semakan th {
+      border: none;
+      padding: 2px;
+      text-align: center;
+    }
+
+    #semakan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #semakan tr:hover {
+      background-color: #ddd;
+    }
+
+    #semakan th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: left;
+      background-color: #4CAF50;
+      color: white;
+    }
+
+
+
+
+
+
+
+
+
+
+    #salinan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 12px;
+    }
+
+    #salinan td,
+    #salinan th {
+      padding: 2px;
+    }
+
+
+    #salinan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #salinan tr:hover {
+      background-color: #ffffff;
+    }
+
+    #salinan th {
+      padding-top: 12px;
+      padding-bottom: 10px;
+      text-align: right;
+      background-color: #ffffff;
+      color: black;
+      padding: 2px;
+    }
+
+    #perjanjian {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 12px;
+
+    }
+
+    #perjanjian td,
+    #perjanjian th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 10px;
+    }
+
+    #perjanjian tr:nth-child(even) {
+      background-color: #ffffff
+    }
+
+    #perjanjian tr:hover {
+      background-color: #ddd;
+    }
+
+    #perjanjian th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 5px;
+    }
+
+    #keuntungan {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 100%;
+      font-size: 12px;
+
+    }
+
+    #keuntungan td,
+    #keuntungan th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 10px;
+    }
+
+    #keuntungan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #keuntungan tr:hover {
+      background-color: #ddd;
+    }
+
+    #keuntungan th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #payment {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 60%;
+      font-size: 12px;
+      border: 1px solid black;
+
+    }
+
+    #payment td,
+    #payment th {
+      border: 0px solid;
+      padding: 3px;
+      font-size: 15px;
+      text-align: left;
+
+    }
+
+    #payment tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #payment tr:hover {
+      background-color: #ddd;
+    }
+
+    #payment th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: left;
+      background-color: #d9deda;
+      color: black;
+      padding: 2px;
+    }
+
+    #payment {
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    #akuan td,
+    #akuan th {
+      padding: 7px;
+      font-size: 10px;
+      padding: 4px;
+    }
+
+    #akuan tr:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    #akuan tr:hover {
+      background-color: #ddd;
+    }
+
+    #akuan th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 3px;
+    }
 
-/* Dashed red border */
-hr.new2 {
-  border-top: 1px dashed red;
-}
+    .page-break {
+      page-break-before: always;
+    }
 
-/* Dotted red border */
-hr.new3 {
-  border-top: 1px dotted red;
-}
+    .formula {
+      font-family: Arial, Helvetica, sans-serif;
+      font-size: 12px;
+    }
 
-/* Thick red border */
-hr.new4 {
-  border: 1px solid red;
-}
+    #copy_cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 10%;
+      font-size: 12px;
 
-/* Large rounded green border */
-hr.new5 {
-  border: 10px solid green;
-  border-radius: 5px;
-}
-</style>
+    }
 
-<style>
 
-#cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:20%;
-    font-size:12px;
-    border: 1px solid black;
 
-  }
+    #copy_cust tr:nth-child(even) {
+      background-color: #ffffff;
+    }
 
-  #cust td, #cust th {
-    border: 0px solid;
-    padding: 3px;
-    font-size:10px;
-    text-align:right;
+    #copy_cust tr:hover {
+      background-color: #ffffff
+    }
 
-  }
+    #copy_cust th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 4px;
+    }
 
-  #cust tr:nth-child(even){background-color: #ffffff;}
 
-  #cust tr:hover {background-color: #ddd;}
+    #copy_cust {
+      font-family: Arial, Helvetica, sans-serif;
+      border-collapse: collapse;
+      width: 50%;
+      font-size: 12px;
 
-  #cust th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align:right;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
 
-  #cust {
-  margin-left: auto;
-  margin-right: 0;
-}
+    }
 
+    #copy_cust td,
+    #copy_cust th {
+      border: 1px solid #ddd;
+      padding: 2px;
+      font-size: 10px;
+      text-align: right;
+      width: 10%;
 
+    }
 
+    #copy_cust {
+      margin-right: 0px;
+      margin-left: auto
+    }
 
-</style>
 
 
 
 
+    #inside tr:nth-child(even) {
+      background-color: #ffffff;
+    }
 
+    #inside tr:hover {
+      background-color: #ddd;
+    }
 
+    #inside th {
+      padding-top: 12px;
+      padding-bottom: 12px;
+      text-align: center;
+      background-color: #d9deda;
+      color: black;
+      padding: 4px;
+    }
+  </style>
+</head>
 
 
 
 
 
-<style>
-  hr.new1 {
-    border-top: 1px dotted black;
-  }
-  .khazanah{
-    border:1px solid black;
-    margin-left:20px;
-    padding:10px;
-    width : 250px;
-    transform: rotate(-90deg);
-    font-size:12px;
-  }
+<table>
 
-  #inside {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    font-size:15px;
-  }
+  <td rowspan="4" style="width:50px;"> <img src="{{ asset('argon/img/brand/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center"> </td>
+  <td rowspan="4" style="width:50px;"><img src="{{ asset('argon/img/brand/pkb.png') }}" style="width:50px" alt="User Image" class="center"> </td>
+  <td></td>
 
-  #inside td, #inside th {
-    border: none;
-    padding: 2px;
-  }
 
-  #inside tr:nth-child(even){background-color: #ffffff;}
 
-  #inside tr:hover {background-color: #ddd;}
 
-  #inside th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: left;
-    background-color: #4CAF50;
-    color: white;
-  }
+</table>
 
+<table id="cust">
+  <tr>
+    <th>Cetakan Atas Talian Ar-Rahn Pay</th>
+  </tr>
+  <tr>
+    <td> RESIT BAYARAN </td>
 
+  </tr>
 
-
-  #semakan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    margin-top:40px;
-    font-size:12px;
-  }
-
-  #semakan td, #semakan th {
-    border: none;
-    padding: 2px;
-    text-align: center;
-  }
-
-  #semakan tr:nth-child(even){background-color: #ffffff;}
-
-  #semakan tr:hover {background-color: #ddd;}
-
-  #semakan th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: left;
-    background-color: #4CAF50;
-    color: white;
-  }
-
-
-
-
-
-
-
-
-
-
-  #salinan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:100%;
-    font-size:12px;
-  }
-
-  #salinan td, #salinan th {
-    padding: 2px;
-  }
-
-
-  #salinan tr:nth-child(even){background-color: #ffffff;}
-
-  #salinan tr:hover {background-color: #ffffff;}
-
-  #salinan th {
-    padding-top: 12px;
-    padding-bottom: 10px;
-    text-align: right;
-    background-color: #ffffff;
-    color: black;
-    padding:2px;
-  }
-  #perjanjian {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 100%;
-    font-size:12px;
-
-  }
-
-  #perjanjian td, #perjanjian th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:10px;
-  }
-
-  #perjanjian tr:nth-child(even){background-color:#ffffff}
-
-  #perjanjian tr:hover {background-color: #ddd;}
-
-  #perjanjian th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:5px;
-  }
-  #keuntungan {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 100%;
-    font-size:12px;
-
-  }
-
-  #keuntungan td, #keuntungan th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:10px;
-  }
-
-  #keuntungan tr:nth-child(even){background-color: #ffffff;}
-
-  #keuntungan tr:hover {background-color: #ddd;}
-
-  #keuntungan th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
-
-  #payment {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 60%;
-    font-size:12px;
-    border: 1px solid black;
-
-  }
-
-  #payment td, #payment th {
-    border: 0px solid;
-    padding: 3px;
-    font-size:15px;
-    text-align: left;
-
-  }
-
-  #payment tr:nth-child(even){background-color: #ffffff;}
-
-  #payment tr:hover {background-color: #ddd;}
-
-  #payment th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align:left;
-    background-color: #d9deda;
-    color: black;
-    padding:2px;
-  }
-
-  #payment {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-  #akuan td, #akuan th {
-    padding: 7px;
-    font-size:10px;
-    padding:4px;
-  }
-
-  #akuan tr:nth-child(even){background-color:#ffffff;}
-
-  #akuan tr:hover {background-color: #ddd;}
-
-  #akuan th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:3px;
-  }
-  .page-break{
-    page-break-before:always;
-  }
-  
-  .formula{
-    font-family: Arial, Helvetica, sans-serif;
-    font-size:12px;
-  }
-  
-  #copy_cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width:10%;
-    font-size:12px;
-
-  }
-
-
-
-  #copy_cust tr:nth-child(even){background-color: #ffffff;}
-
-  #copy_cust tr:hover {background-color:#ffffff}
-
-  #copy_cust th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:4px;
-  }
-
-
-  #copy_cust {
-    font-family: Arial, Helvetica, sans-serif;
-    border-collapse:collapse;
-    width: 50%;
-    font-size:12px;
-
-
-  }
-
-  #copy_cust td, #copy_cust th {
-    border: 1px solid #ddd;
-    padding: 2px;
-    font-size:10px;
-    text-align:right;
-    width: 10%;
-
-  }
-
-  #copy_cust {
-    margin-right:0px;margin-left:auto
-}
-
-
-
-
-
-  #inside tr:nth-child(even){background-color: #ffffff;}
-
-  #inside tr:hover {background-color: #ddd;}
-
-  #inside th {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    text-align: center;
-    background-color: #d9deda;
-    color: black;
-    padding:4px;
-  }
- 
-</style>
-
-
-
-
-
-
-
-  <table>
-
-      <td rowspan="4" style="width:50px;"> <img src="{{ asset('argon/img/brand/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
-      <td rowspan="4"  style="width:50px;"><img src="{{ asset('argon/img/brand/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
-      <td></td>
-
-
-
-
-  </table>
-
-  <table id="cust">
-<tr>
- <th style="width:5px;"> Salinan Pelanggan</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
-
-</tr>
-
-  </table>
+</table>
 
 <br>
 
-  <table id="inside">
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <table id="inside">
 
- <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
- </tr>
- <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
- </tr>
+        <tr>
+          <td colspan="3" width="50%">Marhun</td>
+          <td>: {{ $gadai['marhun'] }} </td>
+        </tr>
+        <tr>
+          <td colspan="3">Nama</td>
+          <td>: {{ $customers_info['nama'] }} </td>
+        </tr>
 
- <tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp</td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
- </tr>
+        <tr>
+          <td colspan="3">No K/P </td>
+          <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp</td>
+        </tr>
 
- <tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
- </tr>
+        <tr>
+          <td colspan="3">Nama Wakil </td>
+          <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td>
+        </tr>
 
- <tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
- </tr>
-  </table>
-  <br>
+        <tr>
+          <td colspan="3">No K/P Wakil </td>
+          <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td>
+        </tr>
+      </table>
+    </div>
+    <div class="col-md-6">
+      <table id="inside">
 
-  <h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
+        <tr>
+          <td width="50%"> <b>No SAG</b></td>
+          <td><b>: {{ $gadai['norujukan'] }} </b></td>
+        </tr>
+        <tr>
+          <td> Tarikh Bayar</td>
+          <td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+        </tr>
+
+        <tr>
+          <td><b> Tempoh Simpan</b></td>
+          <td>:<b> {{ $gadai['tempoh'] }} </b></td>
+        </tr>
+
+
+      </table>
+      <h1>T</h1>
+
+    </div>
+  </div>
+</div>
+<br>
+
+<!-- <h1 style="float:left;position:absolute;margin-left:100px;">T</h1> -->
 
 <table id="payment">
   <tr>
@@ -449,38 +524,40 @@ hr.new5 {
   </tr>
 </table>
 
+<p style="margin-top: 4rem;">*Paparan terbaik resit menggunakan paparan web.</p>
 <br>
 
 
 
 
 
-  <table id="semakan">
-      <tr>
-      <td colspan="3">.................................................... </td> 
-      <td></td>    
-      <td colspan="3">.................................................... </td>
-      <td></td> 
-      <td colspan="3">.................................................... </td>
-      <td></td> 
-      <td colspan="3">.................................................... </td>
-</tr>
-<tr>
+{{-- <table id="semakan">
+  <tr>
+    <td colspan="3">.................................................... </td>
+    <td></td>
+    <td colspan="3">.................................................... </td>
+    <td></td>
+    <td colspan="3">.................................................... </td>
+    <td></td>
+    <td colspan="3">.................................................... </td>
+  </tr>
+  <tr>
 
-<td colspan="3">DiSemak </td> 
-      <td></td>    
-      <td colspan="3"> Cagaran Di Keluarkan</td>
-      <td></td> 
-      <td colspan="3">Cagaran Diterima </td>
-      <td></td> 
-      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+    <td colspan="3">DiSemak </td>
+    <td></td>
+    <td colspan="3"> Cagaran Di Keluarkan</td>
+    <td></td>
+    <td colspan="3">Cagaran Diterima </td>
+    <td></td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
-  </table>
-  <br>
-  <br>
-  <hr class="new2"></hr>
+</table>
+<br>
+<br>
+<hr class="new2">
+</hr>
 
 <br>
 <br>
@@ -489,40 +566,74 @@ hr.new5 {
 
 
 <table id="cust">
-<tr>
-<th style="width:5px;"> Salinan Pejabat</th>
-</tr>
-<tr>
-<td  style="width:5px;"> RESIT BAYARAN  </td>
+  <tr>
+    <th style="width:5px;"> Salinan Pejabat</th>
+  </tr>
+  <tr>
+    <td style="width:5px;"> RESIT BAYARAN </td>
 
-</tr>
+  </tr>
 
 </table>
 
 <br>
 <table id="inside">
 
-<tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
-</tr>
-<tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
-</tr>
+  <tr>
+    <td colspan="3">Marhun</td>
+    <td>: {{ $gadai['marhun'] }} </td>
+    <td colspan="3">
+      <t /d>
+    <td> </td>
+    <td> </td>
+    <td> No SAG</td>
+    <td>: {{ $gadai['norujukan'] }} </td>
+  </tr>
+  <tr>
+    <td colspan="3">Nama</td>
+    <td>: {{ $customers_info['nama'] }} </td>
+    <td colspan="3">
+      <t /d>
+    <td> </td>
+    <td> </td>
+    <td> Tarikh Bayar</td>
+    <td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
+  </tr>
 
-<tr>
-<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
-</tr>
+  <tr>
+    <td colspan="3">No K/P </td>
+    <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td>
+    <td colspan="3">
+      <t /d>
+    <td> </td>
+    <td> </td>
+    <td><b> Tempoh Simpan</b></td>
+    <td>:<b> {{ $gadai['tempoh'] }} </b></td>
+  </tr>
 
 
 
-<tr>
-<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> </td><td> </td>
-</tr>
+  <tr>
+    <td colspan="3">Nama Wakil </td>
+    <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td>
+    <td colspan="3">
+      <t /d>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
 
 
-<tr>
-<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td>  </td><td> </td><td> </td><td> </td>
-</tr>
+  <tr>
+    <td colspan="3">No K/P Wakil </td>
+    <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td>
+    <td colspan="3">
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
 </table>
 <br>
 
@@ -558,26 +669,26 @@ hr.new5 {
 
 
 <table id="semakan">
-    <tr>
-    <td colspan="3">.................................................... </td> 
-    <td></td>    
+  <tr>
     <td colspan="3">.................................................... </td>
-    <td></td> 
+    <td></td>
     <td colspan="3">.................................................... </td>
-    <td></td> 
+    <td></td>
     <td colspan="3">.................................................... </td>
-</tr>
-<tr>
+    <td></td>
+    <td colspan="3">.................................................... </td>
+  </tr>
+  <tr>
 
-<td colspan="3">DiSemak </td> 
-    <td></td>    
+    <td colspan="3">DiSemak </td>
+    <td></td>
     <td colspan="3"> Cagaran Di Keluarkan</td>
-    <td></td> 
+    <td></td>
     <td colspan="3">Cagaran Diterima </td>
-    <td></td> 
+    <td></td>
     <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
-</tr>
+  </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resittebusautotawarruq.blade.php b/resources/views/resit/resittebusautotawarruq.blade.php
index 03dce05..052b373 100644
--- a/resources/views/resit/resittebusautotawarruq.blade.php
+++ b/resources/views/resit/resittebusautotawarruq.blade.php
@@ -425,7 +425,7 @@ hr.new5 {
   </tr>
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -562,4 +562,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resittebussebelum.blade.php b/resources/views/resit/resittebussebelum.blade.php
index 451287e..955f8b3 100644
--- a/resources/views/resit/resittebussebelum.blade.php
+++ b/resources/views/resit/resittebussebelum.blade.php
@@ -447,7 +447,7 @@ hr.new5 {
 
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -570,4 +570,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
+<br> --}}
diff --git a/resources/views/resit/resittebusseparuh.blade.php b/resources/views/resit/resittebusseparuh.blade.php
index bbfa8fb..61800b9 100644
--- a/resources/views/resit/resittebusseparuh.blade.php
+++ b/resources/views/resit/resittebusseparuh.blade.php
@@ -452,7 +452,7 @@ hr.new5 {
 
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -587,4 +587,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/resources/views/resit/resittebusseparuhbelum.blade.php b/resources/views/resit/resittebusseparuhbelum.blade.php
index 827ba3b..aba4a61 100644
--- a/resources/views/resit/resittebusseparuhbelum.blade.php
+++ b/resources/views/resit/resittebusseparuhbelum.blade.php
@@ -436,7 +436,7 @@ hr.new5 {
 
 </table>
 
-<br>
+{{-- <br>
 
 
 
@@ -562,4 +562,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br> --}}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 3a3ded7..53b001c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -33,7 +33,22 @@ Route::get('/firsttime', function () {
     return view('/includes/login/firsttime');
 });
 Route::get('/portalhome', function () {
-    return view('/includes/home');
+
+	$harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();
+
+	$hargaemasterdahulu = array();
+
+	foreach($harga_emas as $index=>$harga)
+	{
+		$hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json();
+
+		$percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100;
+
+		array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]);
+
+	}
+
+	return view('includes.home',compact('hargaemasterdahulu'));
 });
 Route::get('/portalprofile', function () {
     return view('/includes/profile');
@@ -57,7 +72,22 @@ Route::get('/bayarsag', function () {
 
 Route::get('/', function () {
 	// return view('dashboard');
-	return view('includes.home');
+
+	$harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json();
+
+	$hargaemasterdahulu = array();
+
+	foreach($harga_emas as $index=>$harga)
+	{
+		$hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json();
+
+		$percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100;
+
+		array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]);
+
+	}
+
+	return view('includes.home',compact('hargaemasterdahulu'));
 })->middleware(['auth','verified']);
 
 // Route::get('/home', 'HomeController@index');