diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index f79e166..a4f7f0d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2011,7 +2011,6 @@ class KhazanahController extends Controller
             $totalhartasemasa += $hs['amaun'];
         }
         
-
         $tanggungansemasa = [];
 
         // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index 482329b..5df17b3 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -29,9 +29,10 @@ class PenebusanController extends Controller
         $nama = $customerdetail[0]['nama'];
 
         $gadai = $gadaidetail[0][0];
-        
 
-        return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama'));
+        $nilaihargasemasa = $this->tukaranhargaemas($norujukan);
+
+        return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
     }
 
     public function bayaransuransTawarruq(Request $request)
@@ -509,10 +510,10 @@ class PenebusanController extends Controller
             return 0;
     }
 
-    public function tukaranhargaemas(Request $request)
+    public function tukaranhargaemas($norujukan)
     {
 
-       $marhunsaglama = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+       $marhunsaglama = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
 
        $marhunsaglama = $marhunsaglama[0];
        $totalnilaimarhun = 0;
@@ -528,7 +529,7 @@ class PenebusanController extends Controller
 
        }
 
-       return response($totalnilaimarhun);
+       return $totalnilaimarhun;
 
     }
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index e47c520..42f7ef1 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -4,20 +4,24 @@
 
 <!-- Modal -->
 <div class="modal fade" id="forgotpasswordmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel">Modal title</h5>
+          <h5 class="modal-title" id="exampleModalLabel">Forgot Password</h5>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
-          ...
+          
+            <h4 class="font-weight-bold mb-4">Sila Hubungi Bahagian IT</h4>
+
+            <h5><b>Phone:</b> it</h5> 
+            <h5><b>Email:</b> it</h5> 
+
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-          <button type="button" class="btn btn-primary">Save changes</button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
         </div>
       </div>
     </div>
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 086c1a9..a199037 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -11,7 +11,15 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
-            <h3 class="text-center text-uppercase">gadaian</h3>
+            
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item"><a href="#">Pelanggan</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Gadaian</li>
+                </ol>
+              </nav>
+
             <div class="form-group row col-12">
                 <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
                 <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
@@ -22,7 +30,7 @@
                     <div class="col-6 text-left">
                             <div class="form-group row">
                                 <div class="col-md-4">
-                                    No Rujukan
+                                    <b>No Rujukan</b>
                                 </div>
                                 <div class="col-md-8">
                                     <input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
@@ -36,8 +44,8 @@
             </div>
             <div class="card">
                 <div class="card-body">
-                    <table class="table" id="myTable">
-                        <thead>
+                    <table class="table table-striped table-hover" id="myTable">
+                        <thead class="thead-dark">
                             <tr>
                                 <th>Bil</th>
                                 <th>Recno</th>
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 62872fb..fbc1672 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -15,7 +15,7 @@
             <div class="modal-body">
                 <h4>Marhun</h4>
                 <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
-                    <thead>
+                    <thead class="thead-dark">
                         <tr>
                             <th>Bil</th>
                             <th>Jenis Marhun</th>
@@ -64,7 +64,7 @@
             <div class="modal-body">
                 <h4>Marhun</h4>
                 <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
-                    <thead>
+                    <thead class="thead-dark">
                         <tr>
                             <th>Bil</th>
                             <th>Jenis Marhun</th>
diff --git a/resources/views/layouts/login.blade.php b/resources/views/layouts/login.blade.php
index c47aab9..e1441b1 100644
--- a/resources/views/layouts/login.blade.php
+++ b/resources/views/layouts/login.blade.php
@@ -16,6 +16,10 @@
     <link rel="dns-prefetch" href="//fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
 
+
+    <script src="{{ asset('js/jquery.min.js') }}"></script>
+    <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
+
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
     <link href="{{ asset('css/main.css') }}" rel="stylesheet">
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index ab40143..d094457 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -105,10 +105,12 @@
                             <tr>
                                 <th>Bil</th>
                                 <th>Marhun</th>
-                                <th>Nilai Marhun</th>
+                                <th>N. Marhun</th>
+                                <th>N. Marhun Semasa</th>
                                 <th>Berat/gram</th>
                                 <th>Karat</th>
                                 <th>Harga</th>
+                                <th>Harga Semasa</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -121,9 +123,21 @@
                             @endphp
                             <td>{{ $marhunperibadi['descpt'] }}</td>
                             <td>RM {{ number_format($m['n_marhun'],2) }}</td>
+                            <td>@php
+                             $karatbaru = str_replace('.','-',$m['karat']);
+                             $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+                                $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']);
+
+                                echo "RM " . number_format($hargaemassemasa,2);
+                            @endphp</td>
                             <td>{{ $m['berat'] }}</td>
                             <td>{{ $m['karat'] }}</td>
                             <td>RM {{ $m['harga'] }}</td>
+                            <td>RM {{ number_format(floatval($hargabaru['harga']),2) }} @php  if($m['harga'] > $hargabaru['harga']) echo '<span class="fas fa-arrow-down text-danger"></span>'; if($m['harga'] < $hargabaru['harga']) echo '<span class="fas fa-arrow-up text-success"></span>';
+                            if($m['harga'] === $hargabaru['harga']) echo '<span class="fas fa-minus text-info"></span>';
+                            
+                            @endphp</td>
                             </tr>
                             @php $count++; @endphp
                             @endforeach
@@ -131,8 +145,9 @@
                         <tr>
                             <td colspan="2"><b>JUMLAH</b></td>
                             <td id="nilai_marhun_total">RM {{ number_format($gadai['nilaimarhun'],2) }}</td>
+                            <td id="nilai_marhun_total">RM {{ number_format($nilaihargasemasa,2) }}</td>
                             <td id="berat_marhun_total">{{ number_format($gadai['berat'],2) }}</td>
-                            <td colspan="2"></td>
+                            <td colspan="3"></td>
                           </tr>
                         </tfoot>
                     </table>
@@ -191,13 +206,14 @@
                                     <div class="col-4">
                                         PEMBIAYAAN HARGA SEMASA (RM)
                                     </div>
-                                    {{-- @php
-                                        $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
-                                    @endphp --}}
+                                    @php
+
+                                        $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
+                                    @endphp
                                     <div class="col-8 input-group mb-5">
-                                        <input type="text" id="hargapembiayaansemasa" class="form-control" aria-describedby="basic-hargaemas" readonly/>
+                                        <input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($gadai['bakipjm'],2) }}" aria-describedby="basic-hargaemas" readonly/>
                                         <div class="input-group-append">
-                                            <span class="input-group-text" id="basic-hargaemas">40.88</span>
+                                            <span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_hargaemassemasa,2) }}</span>
                                         </div>
                                     </div>
                                 </diV>
@@ -272,7 +288,7 @@
                                         <span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span>
                                           </div>
                                     </div>
-                                </diV>
+                                </div>
                             </div>
                             <div class="col-6" id="divbayaranditerima">
                                 <div class="form-group row">
@@ -282,7 +298,7 @@
                                     <div class="col-4">
                                         <input type="text" id="bayaranditerima" class="form-control" readonly/>
                                     </div>
-                                </diV>
+                                </div>
 
                             </div>
 
@@ -377,8 +393,9 @@
     function tebusan(){
         if(hargajualan != null ){   
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
+            let maxgadaipembiayaanbaru = "{{ $maxgadaipemb = ($nilaihargasemasa * 0.7) - $gadai['bakipjm'] }}";
                                 
-            $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
+            $('#tambahpinjamsebenar').val(Number(maxgadaipembiayaanbaru).toFixed(2));                            
 
             $('#divpembiayaanasal').hide();
             $('#divbakihargajualan').show();
@@ -761,21 +778,32 @@
         var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
         var pinjambaru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
         var pinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,""));
+        var pembiayaanbaru = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); //pembiayaan yang baru
+
         var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+
         const percentpinj = parseFloat("{{ $percent_asal }}");
+        const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru
+
+        console.log(percentpemb);
 
         var totalpinjbaru=0;
 
         totalpinjbaru = pinjam + parseFloat(e.value);
 
         $(e).val() == ''  ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
+        $(e).val() == ''  ? $('#hargapembiayaansemasa').val(pinjam.toFixed(2)) : $('#hargapembiayaansemasa').val(totalpinjbaru.toFixed(2));
 
         // if(parseFloat($(e).val()) > maxpinjam)
         //     $(e).val(maxpinjam);
 
         var total = totalpinjbaru/nm * 100;
+        var totalsemasa = totalpinjbaru/nmsemasa * 100;
 
         $(e).val() == ''  ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
+        $(e).val() == ''  ? $('#basic-hargaemas').text(percentpemb.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
+
     }
 
     let teller = "{{ Auth::user()->name }}";
@@ -1203,7 +1231,7 @@
             ///////////
         
         }else if($('#sltjenistebus').find(":selected").val() == 'P'){
-            let pinjamanbaru = $('#pinjamanbaru').val();
+            let pinjamanbaru = $('#hargapembiayaansemasa').val();
             let jenisbayarantebus = '';
             if(hargajualan == null){
                 jenisbayarantebus = "nottawarruq";
@@ -1221,7 +1249,7 @@
                 return false;
             }  
 
-            if(parseFloat($('#basic-addon2').text()) > 70 && parseFloat($('#basic-addon2').text()) <= 75){
+            if(parseFloat($('#basic-hargaemas').text()) > 70 && parseFloat($('#basic-hargaemas').text()) <= 75){
                 const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
                         confirmButton: 'btn btn-success',
@@ -1241,9 +1269,9 @@
                 }).then((result) => {
                     if (result.isConfirmed) {
                         
-                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text();
+                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
                         let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
-                        let jumpinjam = $('#pinjamanbaru').val();
+                        let jumpinjam = $('#hargapembiayaansemasa').val();
                         let teller = "{{ Auth::user()->name }}";
 
                         Swal.fire({
@@ -1329,7 +1357,7 @@
                 event.preventDefault();
                 return false;  
 
-        }else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){
+        }else if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80) || pinjamanbaru >= 10000){
 
                 const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
@@ -1340,7 +1368,7 @@
                 });
 
                 let text = '';
-                if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80))
+                if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
                 {
                     text  = 'Tetapan margin melebihi 75% untuk Operasi!';
                 }else if(pinjamanbaru >= 10000)
@@ -1360,9 +1388,9 @@
                 }).then((result) => {
                     if (result.isConfirmed) {
                     
-                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text();
+                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
                         let komen = '';
-                        if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80))
+                        if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
                         {
                             komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
                         }else if(pinjamanbaru >= 10000)
@@ -1370,7 +1398,7 @@
                             komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
                         }
 
-                        let jumpinjam = $('#pinjamanbaru').val();
+                        let jumpinjam = $('#hargapembiayaansemasa').val();
                         let teller = "{{ Auth::user()->name }}";
 
                         Swal.fire({
@@ -1459,7 +1487,7 @@
                 event.preventDefault();
                 return false;
 
-            }else if(parseFloat($('#basic-addon2').text()) > 80){
+            }else if(parseFloat($('#basic-hargaemas').text()) > 80){
                 $("#terima_transaksi").prop('disabled', false);
                 Swal.fire(
                     'Amaran!',
@@ -1484,27 +1512,15 @@
         }
 
 
-        //Buat Harga Baru Emas Semasa
-        $.ajax({
-            method: "get",
-            url: "{{ route('tukaran.hargaemas') }}",
-            data: {
-                'norujukan' : norujukan
-            },
-            success:function(data){
-                console.log(data);
-            }
-        });
-
         return;
 
         var nopelanggan = "{{ $gadai['nopelanggan'] }}";
         var jenistebus = $('#sltjenistebus').find(":selected").val();
         var jbg = "{{ $gadai['tempoh'] }}";
         var kadarupah = "{{ $gadai['kadarupah'] }}";
-        var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+        var nilai_marhun = "{{ $nilaihargasemasa }}";
         var pinjaman_lama = "{{ $gadai['bakipjm'] }}";
-        var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
+        var pinjaman = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""));
         var ansuran = 0;
         var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,""));
         var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,""));