From 6d3f52ad507f25ee563365d34eca6dc3ccbc0835 Mon Sep 17 00:00:00 2001
From: AmalinTamizi <84703825+amalintamizi@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:33:54 +0800
Subject: [PATCH] update error

---
 .../views/account/listbayaranonline.blade.php |  7 ++++
 .../views/account/sahsagonline.blade.php      | 19 ++++++++--
 .../views/account/senarailelongan.blade.php   |  2 +-
 resources/views/home.blade copy.php           |  6 +--
 resources/views/home.blade.php                |  6 +--
 resources/views/includes/header.blade.php     | 12 +++++-
 resources/views/includes/sidebar.blade.php    |  4 +-
 .../views/jananotis/notislelong.blade.php     |  4 +-
 .../views/jurulelong/listcawangan.blade.php   | 38 +++++++++----------
 .../views/jurulelong/listpemenang.blade.php   | 38 +++++++++----------
 .../jurulelong/senaraipemenangbycaw.blade.php |  9 +++--
 .../views/lelong/brgleldetails.blade.php      |  4 +-
 .../lelong/indexbrgleldetailscaw.blade.php    |  6 +--
 .../lelong/indexbrglelpembidacaw.blade.php    |  2 +-
 .../views/lelong/indexlelfullcaw.blade.php    |  2 +-
 .../lelong/indexnamapembidacaw.blade.php      |  2 +-
 .../lelong/lapbrglelpembidaindex.blade.php    |  2 +-
 .../views/lelong/laplelongindex.blade.php     |  2 +-
 .../views/lelong/laporanbidaanindex.blade.php |  4 +-
 .../views/lelong/laporancawindex.blade.php    |  2 +-
 .../views/lelong/laporanlelong.blade.php      |  2 +-
 .../views/lelong/senaraimarhun.blade.php      |  2 +-
 .../lelong/senaraimarhunsimulasi.blade.php    | 11 ++++--
 .../views/lelong/senaraipemenang.blade.php    |  9 +++--
 .../views/lelong/senaraisagpemenang.blade.php | 20 ++++++++--
 resources/views/lelong/showsimulasi.blade.php |  1 +
 .../views/marhun/semakanmarhun.blade.php      |  2 +-
 .../marhun/senarailelongmarhun.blade.php      |  2 +-
 resources/views/marhun/senlelmarhun.blade.php |  2 +-
 resources/views/pdf/brglelcaw.blade.php       |  2 +-
 .../pdf/laporanbrgleldetailscaw.blade.php     |  4 +-
 .../pdf/laporanbrglelpembidacaw.blade.php     |  2 +-
 .../views/pdf/laporanlelfullcaw.blade.php     |  2 +-
 .../views/pdf/laporannamapembidacaw.blade.php |  2 +-
 resources/views/pdf/listlelong.blade.php      |  2 +-
 .../views/pdf/listlelongdetails.blade.php     |  2 +-
 .../views/pdf/pdflapbrglelpembida.blade.php   |  2 +-
 resources/views/pdf/pdflaplelong.blade.php    |  2 +-
 .../views/pdf/pdfsenarailapbidaan.blade.php   |  2 +-
 .../pembayaran/pengesahanPembayaran.blade.php |  6 +--
 .../pembayaran/senarailelongbayaran.blade.php |  2 +-
 resources/views/pembida/kemaskini.blade.php   | 12 ++++--
 .../views/pembida/senaraipembida.blade.php    |  6 +--
 .../senaraipembidakeseluruhan.blade.php       |  6 +--
 .../pembida/senlelpembayaranbidaan.blade.php  |  4 ++
 .../views/pengesahan/lelbidmarhun.blade.php   |  9 +++--
 .../pengesahan/perubahanmutumarhun.blade.php  |  7 +++-
 .../senarailelongubahmutu.blade.php           |  2 +-
 .../pengesahan/senaraitangguhlelong.blade.php |  8 ++--
 .../views/pengurusandatabase/show.blade.php   |  6 +++
 .../views/pengurusanpengguna/index.blade.php  | 31 +++++++++++----
 .../views/serahan/laporanserahan.blade.php    |  4 +-
 resources/views/serahan/pembayaran.blade.php  |  2 +-
 .../views/simulasi/senaraisimulasi.blade.php  |  4 +-
 .../simulasi/senaraitempsimulasi.blade.php    |  2 +-
 .../views/tangguhlelong/sensahpc.blade.php    |  6 ++-
 56 files changed, 226 insertions(+), 135 deletions(-)

diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index 30d5e756..f868397c 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -5,6 +5,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div><br>
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -21,8 +24,12 @@
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Pembayaran(RM)</th>
+<<<<<<< Updated upstream
                         <th>Jumlah Bidaan(RM)</th>
                         <th class="text-center">Action</th>
+=======
+                        <th class="text-center">Tindakan</th>
+>>>>>>> Stashed changes
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index 605f435a..ae227450 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -5,6 +5,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -32,7 +35,7 @@
                                 <th>Harga Asas (RM)</th>
                                 <th>Harga Bida (RM)</th>
                                 <th>Masa Bidaan</th>
-                                <th>Remark</th>
+                                <th>Nota</th>
                                 <th class="text-center">Status</th>
                             </tr>
                     </thead>
@@ -44,16 +47,26 @@
                                 <td>@php
                                     $myDateTime = DateTime::createFromFormat('Y-m-d', $sag['t_lelong'] );
                                     $t_lelong =  $myDateTime->format('d-m-Y');
+<<<<<<< Updated upstream
                                 echo($t_lelong);
                                 @endphp</td>
                                 <td>{{ number_format($sag['hargaasas'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($sag['hargabida'], 2, '.', ',') }}</td>
+=======
+                                    echo($t_lelong);
+                                @endphp</td>
+                                <td>{{ number_format($sag['hargaasas'], 2, '.', ',')}}</td>
+                                <td>{{ number_format($sag['hargabida'], 2, '.', ',')}}</td>
+                                {{-- <td>{{ $sag['t_lelong'] }}</td> --}}
+                                {{-- <td>{{ $sag['hargaasas'] }}</td>
+                                <td>{{ $sag['hargabida'] }}</td> --}}
+>>>>>>> Stashed changes
                                 <td>{{ $sag['masa_bidaan'] }}</td>
                                 <td>
                                     <button class="btn btn-outline-success btn-sm" disabled><b>{{ $sag['remark'] }}</b></button>
                                 </td>
                                 <td>
-                                    <span class="btn btn-success btn-sm hovernone-success" disabled>PAID</span>                        
+                                    <span class="btn btn-success btn-sm hovernone-success" disabled>TELAH DIBAYAR</span>                        
                                 </td>
                                 </tr>
                         @endforeach
@@ -75,7 +88,7 @@
                 </tr>
                 </table>
                 <div class="modal-footer" style="margin-top:2%;">
-                    <a  href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a>
+                    {{-- <a  href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a> --}}
                     @if($checking)
                         <button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
                     @else
diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php
index 2f7f6801..5ace0585 100644
--- a/resources/views/account/senarailelongan.blade.php
+++ b/resources/views/account/senarailelongan.blade.php
@@ -18,7 +18,7 @@
                         <th>Cawangan</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php
index d73f6b0f..36e85f03 100644
--- a/resources/views/home.blade copy.php	
+++ b/resources/views/home.blade copy.php	
@@ -32,16 +32,16 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>T.Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
                             <th>Status</th>
                             <th>Masa Tamat</th>
                             <th>Harga Emas</th>
-                            <th>JBG</th>
+                            <th>Tempoh</th>
                             <!-- <th>Caj Lelong</th> -->
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index dcfaf735..bb161d30 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -32,16 +32,16 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>T.Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
                             <th>Status</th>
                             <th>Masa Tamat</th>
                             <th>Harga Emas</th>
-                            <th>JBG</th>
+                            <th>Tempoh</th>
                             <!-- <th>Caj Lelong</th> -->
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php
index d5a9c799..d7c07d53 100644
--- a/resources/views/includes/header.blade.php
+++ b/resources/views/includes/header.blade.php
@@ -22,12 +22,20 @@
         <div class="group">
           <button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {{ Auth::user()->name }} </button>
           <div class="dropdown-menu dropdown-menu-right mr-2">
-            <button class="dropdown-item" type="button"><i class="fa fa-user"></i> Profile</button>
+            <div class="dropdown">
+              <div class="dropdown-item">
+                <a class="far fa fa-user" href="editprofile">Profile</a>
+              </div>
+            </div> 
+
+            {{-- profile --}}
+            {{-- <button class="dropdown-item" type="button"><i class="far fa fa-user"></i> Profile</button> --}}
+
             {{-- logout --}}
             <a class="dropdown-item" href="{{ route('logout') }}"
               onclick="event.preventDefault();
                               document.getElementById('logout-form').submit();">
-              <i class="fa fa-sign-out"></i>{{ __('Logout') }}
+              <i class="fas fa-sign-out-alt"></i>{{ __('Logout') }}
             </a>
 
             <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index c0883429..5cb36584 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -109,7 +109,7 @@
         </ul>    
         <ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu" >
           <li class="{{ (request()->is('reportcaw/indexbrgleldetailscaw/*') || request()->is('reportcaw/indexbrgleldetailscaw') ) ? 'active' : '' }}">
-            <a href="{{url('reportcaw/indexbrgleldetailscaw')}}">Barang Lelong Details</a>
+            <a href="{{url('reportcaw/indexbrgleldetailscaw')}}">Butiran Barang Lelong</a>
           </li>
         </ul>  
         <ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu" >
@@ -225,7 +225,7 @@
         </ul>    
         <ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu" >
           <li class="{{ (request()->is('report/lapbrglelongdetailsindex/*') || request()->is('report/lapbrglelongdetailsindex') ) ? 'active' : '' }}">
-            <a href="{{url('report/lapbrglelongdetailsindex')}}">Barang Lelong Details</a>
+            <a href="{{url('report/lapbrglelongdetailsindex')}}">Butiran Barang Lelong</a>
           </li>
         </ul>
         <ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu" >
diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php
index a5b4763d..e253d5bc 100644
--- a/resources/views/jananotis/notislelong.blade.php
+++ b/resources/views/jananotis/notislelong.blade.php
@@ -16,9 +16,9 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php
index 912caf10..c96e62fe 100644
--- a/resources/views/jurulelong/listcawangan.blade.php
+++ b/resources/views/jurulelong/listcawangan.blade.php
@@ -16,13 +16,13 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Nama Cawangan</th>
                             <th>Harga Emas Asas</th>
-                            <th>JBG</th>
+                            <th>Tempoh</th>
                             <th>Caj Lelong</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -82,22 +82,22 @@
         buttons: [
             // 'copy', 'excel', 'pdf'
             // { text: 'copy', className: 'btn btn-primary' },
-            {
-                className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-                text: '<i class="fas fa-plus" id="test"></i>',
-                titleAttr: 'Tambah Simulasi',
-                action: function ( e, dt, node, config ) {
-                    alert( 'Button activated' );
-                }
-            },
-            {
-                className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                titleAttr: 'Export to CSV',
-                text: '<i class="fas fa-download"></i>',
-                action: function ( e, dt, node, config ) {
-                    $("#exportform").submit();
-                }
-            }
+            // {
+            //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
+            //     text: '<i class="fas fa-plus" id="test"></i>',
+            //     titleAttr: 'Tambah Simulasi',
+            //     action: function ( e, dt, node, config ) {
+            //         alert( 'Button activated' );
+            //     }
+            // },
+            // {
+            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //     titleAttr: 'Export to CSV',
+            //     text: '<i class="fas fa-download"></i>',
+            //     action: function ( e, dt, node, config ) {
+            //         $("#exportform").submit();
+            //     }
+            // }
         ]
     });
 
diff --git a/resources/views/jurulelong/listpemenang.blade.php b/resources/views/jurulelong/listpemenang.blade.php
index efd73a03..511bbe92 100644
--- a/resources/views/jurulelong/listpemenang.blade.php
+++ b/resources/views/jurulelong/listpemenang.blade.php
@@ -16,13 +16,13 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Nama Cawangan</th>
                             <th>Harga Emas Asas</th>
-                            <th>JBG</th>
+                            <th>Tempoh</th>
                             <th>Caj Lelong</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -84,22 +84,22 @@
         buttons: [
             // 'copy', 'excel', 'pdf'
             // { text: 'copy', className: 'btn btn-primary' },
-            {
-                className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-                text: '<i class="fas fa-plus" id="test"></i>',
-                titleAttr: 'Tambah Simulasi',
-                action: function ( e, dt, node, config ) {
-                    alert( 'Button activated' );
-                }
-            },
-            {
-                className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                titleAttr: 'Export to CSV',
-                text: '<i class="fas fa-download"></i>',
-                action: function ( e, dt, node, config ) {
-                    $("#exportform").submit();
-                }
-            }
+            // {
+            //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
+            //     text: '<i class="fas fa-plus" id="test"></i>',
+            //     titleAttr: 'Tambah Simulasi',
+            //     action: function ( e, dt, node, config ) {
+            //         alert( 'Button activated' );
+            //     }
+            // },
+            // {
+            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //     titleAttr: 'Export to CSV',
+            //     text: '<i class="fas fa-download"></i>',
+            //     action: function ( e, dt, node, config ) {
+            //         $("#exportform").submit();
+            //     }
+            // }
         ]
     });
 
diff --git a/resources/views/jurulelong/senaraipemenangbycaw.blade.php b/resources/views/jurulelong/senaraipemenangbycaw.blade.php
index 8de1478d..119cff2a 100644
--- a/resources/views/jurulelong/senaraipemenangbycaw.blade.php
+++ b/resources/views/jurulelong/senaraipemenangbycaw.blade.php
@@ -5,6 +5,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -17,13 +20,13 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Lelong ID</th>
+                        <th>ID Lelong</th>
                         <th>Nama</th>
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Bidaan(RM)</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
@@ -44,7 +47,7 @@
             </tbody>
         </table>
         <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('lelong.listpemenang') }}" class="btn btn-primary">Kembali</a>
+            {{-- <a  href="{{ route('lelong.listpemenang') }}" class="btn btn-primary">Kembali</a> --}}
         </div>
         </div>
     </div>
diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php
index 762a13ef..09ab905d 100644
--- a/resources/views/lelong/brgleldetails.blade.php
+++ b/resources/views/lelong/brgleldetails.blade.php
@@ -4,7 +4,7 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            <h3 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong Details </h3>
+            <h3 class="pt-3" style="margin-left:1%;">Butiran Laporan Barang Lelong </h3>
 
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -17,7 +17,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
diff --git a/resources/views/lelong/indexbrgleldetailscaw.blade.php b/resources/views/lelong/indexbrgleldetailscaw.blade.php
index 53633c49..fccc46ac 100644
--- a/resources/views/lelong/indexbrgleldetailscaw.blade.php
+++ b/resources/views/lelong/indexbrgleldetailscaw.blade.php
@@ -5,7 +5,7 @@
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
             @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong Details: {{$cawname->caw_name}} </h4>
+            <h4 class="pt-3" style="margin-left:1%;">Butiran Laporan Barang Lelong: {{$cawname->caw_name}} </h4>
             @endforeach
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
@@ -18,7 +18,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th class="text-center">Muat Turun</th>
@@ -37,7 +37,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Laporan Barang Lelong Details" ><i class="fas fa-download"></i></a>
+                            <a  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Laporan Barang Lelong" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexbrglelpembidacaw.blade.php b/resources/views/lelong/indexbrglelpembidacaw.blade.php
index 997924fe..24f59b05 100644
--- a/resources/views/lelong/indexbrglelpembidacaw.blade.php
+++ b/resources/views/lelong/indexbrglelpembidacaw.blade.php
@@ -18,7 +18,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th class="text-center">Muat Turun</th>
diff --git a/resources/views/lelong/indexlelfullcaw.blade.php b/resources/views/lelong/indexlelfullcaw.blade.php
index 82900337..ad430d78 100644
--- a/resources/views/lelong/indexlelfullcaw.blade.php
+++ b/resources/views/lelong/indexlelfullcaw.blade.php
@@ -18,7 +18,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th class="text-center">Muat Turun</th>
diff --git a/resources/views/lelong/indexnamapembidacaw.blade.php b/resources/views/lelong/indexnamapembidacaw.blade.php
index 639c4f82..5d4b98aa 100644
--- a/resources/views/lelong/indexnamapembidacaw.blade.php
+++ b/resources/views/lelong/indexnamapembidacaw.blade.php
@@ -18,7 +18,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th class="text-center">Muat Turun</th>
diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php
index a2880084..d0da4697 100644
--- a/resources/views/lelong/lapbrglelpembidaindex.blade.php
+++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php
@@ -16,7 +16,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php
index 51235a1e..e4fa8424 100644
--- a/resources/views/lelong/laplelongindex.blade.php
+++ b/resources/views/lelong/laplelongindex.blade.php
@@ -16,7 +16,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php
index d633893f..58293928 100644
--- a/resources/views/lelong/laporanbidaanindex.blade.php
+++ b/resources/views/lelong/laporanbidaanindex.blade.php
@@ -17,11 +17,11 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php
index 8d23443a..bec7916c 100644
--- a/resources/views/lelong/laporancawindex.blade.php
+++ b/resources/views/lelong/laporancawindex.blade.php
@@ -18,7 +18,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th class="text-center">Muat Turun</th>
diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php
index 10a2f96a..9afa903a 100644
--- a/resources/views/lelong/laporanlelong.blade.php
+++ b/resources/views/lelong/laporanlelong.blade.php
@@ -17,7 +17,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index dc57847e..aed46e1b 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -47,7 +47,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No.</th>
-                            <th>Norujukan</th>
+                            <th>No rujukan</th>
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
                             <th>N. Marhun (RM)</th>
diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php
index 4132c732..56d8228e 100644
--- a/resources/views/lelong/senaraimarhunsimulasi.blade.php
+++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php
@@ -5,10 +5,13 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>             
         <span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Simulasi Lelong</b></span>
              @foreach ($arrayinfo as $laporan)
         
-            <span class="pt-3" style="margin-left:1%;"><b>Lelong ID : {{ $laporan['laporan']['lelong_id']}}</b></span>
+            <span class="pt-3" style="margin-left:1%;"><b>ID Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
             <span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php 
                 $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
                   $datez = $myDateTime->format('d-m-Y');
@@ -35,7 +38,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No.</th>
-                            <th>Norujukan</th>
+                            <th>No rujukan</th>
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun (RM)</th>
@@ -45,7 +48,7 @@
                             <th>Caj Lelong (%)</th>
                             <th>Rugi Lelong (RM)</th>
                             <th>Baki Lelong (RM)</th>
-                            <th>Action</th>
+                            <th>Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -87,7 +90,7 @@
                 </table>
                 <div class="text-right pt-4">
                     <a  href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a>
-                    <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Delete</button>
+                    <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Padam</button>
                 </div>
                 {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
                 
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php
index e520d6c8..46e67267 100644
--- a/resources/views/lelong/senaraipemenang.blade.php
+++ b/resources/views/lelong/senaraipemenang.blade.php
@@ -5,6 +5,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div><br>
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -14,13 +17,13 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Lelong ID</th>
+                        <th>ID Lelong</th>
                         <th>Nama</th>
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Bidaan(RM)</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
@@ -41,7 +44,7 @@
             </tbody>
         </table>
         <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('lelong.senarailelong') }}" class="btn btn-primary">Kembali</a>
+            {{-- <a  href="{{ route('lelong.senarailelong') }}" class="btn btn-primary">Kembali</a> --}}
         </div>
         </div>
     </div>
diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php
index dee51125..14587351 100644
--- a/resources/views/lelong/senaraisagpemenang.blade.php
+++ b/resources/views/lelong/senaraisagpemenang.blade.php
@@ -5,6 +5,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -26,16 +29,25 @@
                         <tr>
                         <td> {{ $loop->iteration }} </td>
                             <td>{{ $senaraisag['norujukan']}}</td>
-                            <td>{{ $senaraisag['t_lelong']}}</td>
-                            <td>{{ $senaraisag['hargaasas']}}</td>
-                            <td>{{ $senaraisag['hargabida']}}</td>
+                            <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $senaraisag['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
+                            <td>{{ number_format($senaraisag['hargaasas'], 2, '.', ',')}}</td>
+                            <td>{{ number_format($senaraisag['hargabida'], 2, '.', ',')}}</td>
                             <td>{{ $senaraisag['masa_bidaan']}}</td>
+                            {{-- <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $senaraisag['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td> --}}
                         </tr>
                 @endforeach
             </tbody>
         </table>
         <div class="modal-footer">
-            <a  href="{{ route('lelong.senaraipemenang', ['lelong_id'=>$lelong_id ]) }}" class="btn btn-primary">Kembali</a>
+            {{-- <a  href="{{ route('lelong.senaraipemenang', ['lelong_id'=>$lelong_id ]) }}" class="btn btn-primary">Kembali</a> --}}
         </div>
         </div>
     </div>
diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php
index bebce235..04a30e06 100644
--- a/resources/views/lelong/showsimulasi.blade.php
+++ b/resources/views/lelong/showsimulasi.blade.php
@@ -6,6 +6,7 @@
         <div class="col-md-11 mx-auto card p-4">
             <nav>
                 <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                    <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
                   <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
                   <!-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> -->
                 </div>
diff --git a/resources/views/marhun/semakanmarhun.blade.php b/resources/views/marhun/semakanmarhun.blade.php
index 4ac8d693..8db34407 100644
--- a/resources/views/marhun/semakanmarhun.blade.php
+++ b/resources/views/marhun/semakanmarhun.blade.php
@@ -16,7 +16,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <th>Nombor Rujukan</th>
+                            <th>No Rujukan</th>
                             <th>Tarikh Lelong</th>
                             <th class="text-center">Action</th>
                         </tr>
diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php
index 1e0c50e9..468374e6 100644
--- a/resources/views/marhun/senarailelongmarhun.blade.php
+++ b/resources/views/marhun/senarailelongmarhun.blade.php
@@ -19,7 +19,7 @@
                         <th>Batch Lelong</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/marhun/senlelmarhun.blade.php b/resources/views/marhun/senlelmarhun.blade.php
index 2528d9c1..2046c3f9 100644
--- a/resources/views/marhun/senlelmarhun.blade.php
+++ b/resources/views/marhun/senlelmarhun.blade.php
@@ -17,7 +17,7 @@
                         <th>Cawangan</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php
index 948f0115..b793aeed 100644
--- a/resources/views/pdf/brglelcaw.blade.php
+++ b/resources/views/pdf/brglelcaw.blade.php
@@ -91,7 +91,7 @@ tr:nth-child(even) {
                         <br>
                         <tr>
                           @foreach ($info as $info)
-                          <td>Lelong ID : {{$info['lelong_id']}}</td>
+                          <td>ID Lelong: {{$info['lelong_id']}}</td>
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
index 520157fe..1804796b 100644
--- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php
+++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
@@ -82,7 +82,7 @@ tr:nth-child(even) {
     </tr>
 
     <tr>
-      <td colspan="2"><u><b>LAPORAN BARANG LELONG DETAILS </b></u></td>
+      <td colspan="2"><u><b>BUTIRAN LAPORAN BARANG LELONG </b></u></td>
 
     </tr>
 </table>
@@ -92,7 +92,7 @@ tr:nth-child(even) {
     <br>
     <tr>
       @foreach ($arrayinfo as $laporan)
-      <td>Lelong ID : {{$laporan['laporan']['lelong_id']}}</td>
+      <td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
       <td>Tarikh Lelong : @php
         $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
         $t_lelong =  $myDateTime->format('d-m-Y');
diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
index 3fbb7190..d2a5677f 100644
--- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php
+++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
@@ -90,7 +90,7 @@ tr:nth-child(even) {
                       <thead>
                         <br>
                         <tr>
-                          <td>Lelong ID:  {{$lelong_id}}</td>
+                          <td>ID Lelong:  {{$lelong_id}}</td>
                           @foreach ($info as $info)                     
                                 
                           <td>Tarikh Lelong : @php
diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php
index 034954d5..900b0777 100644
--- a/resources/views/pdf/laporanlelfullcaw.blade.php
+++ b/resources/views/pdf/laporanlelfullcaw.blade.php
@@ -90,7 +90,7 @@ tr:nth-child(even) {
                       <thead>
                         <br>
                         <tr>
-                        <td>Lelong ID:  {{$lelong_id}}</td>
+                        <td>ID Lelong:  {{$lelong_id}}</td>
                         @foreach ($info as $info)                     
                               
                         <td>Tarikh Lelong : @php
diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php
index 76dc0263..cfd2428f 100644
--- a/resources/views/pdf/laporannamapembidacaw.blade.php
+++ b/resources/views/pdf/laporannamapembidacaw.blade.php
@@ -90,7 +90,7 @@ tr:nth-child(even) {
                       <thead>
                         <br>
                         <tr>
-                          <td>Lelong ID:  {{$lelong_id}}</td>
+                          <td>ID Lelong:  {{$lelong_id}}</td>
                           @foreach ($lelongid as $info)                        
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php
index c310e7f9..c5056900 100644
--- a/resources/views/pdf/listlelong.blade.php
+++ b/resources/views/pdf/listlelong.blade.php
@@ -91,7 +91,7 @@ tr:nth-child(even) {
                         <br>
                         <tr>
                           @foreach ($arrayinfo as $laporan)
-                          <td>Lelong ID : {{$laporan['laporan']['lelong_id']}}</td>
+                          <td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php
index 4fee9ba7..a0b782d8 100644
--- a/resources/views/pdf/listlelongdetails.blade.php
+++ b/resources/views/pdf/listlelongdetails.blade.php
@@ -91,7 +91,7 @@ tr:nth-child(even) {
     <br>
     <tr>
       @foreach ($arrayinfo as $laporan)
-      <td>Lelong ID : {{$laporan['laporan']['lelong_id']}}</td>
+      <td>ID Lelong : {{$laporan['laporan']['lelong_id']}}</td>
       <td>Tarikh Lelong : @php
         $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
         $t_lelong =  $myDateTime->format('d-m-Y');
diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php
index 38416ee6..8ef295fd 100644
--- a/resources/views/pdf/pdflapbrglelpembida.blade.php
+++ b/resources/views/pdf/pdflapbrglelpembida.blade.php
@@ -90,7 +90,7 @@ tr:nth-child(even) {
                       <thead>
                         <br>
                         <tr>
-                          <td>Lelong ID:  {{$lelong_id}}</td>
+                          <td>ID Lelong:  {{$lelong_id}}</td>
                           @foreach ($info as $info)                     
                                 
                           <td>Tarikh Lelong: @php
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 8e805fe9..0ceeccd6 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -98,7 +98,7 @@ tr:nth-child(even) {
                               $t_lelong =  $myDateTime->format('d-m-Y');
                               echo($t_lelong);
                           @endphp</td>
-                          <td>Lelong ID:  {{$info->fasa}}</td>
+                          <td>ID Lelong:  {{$info->fasa}}</td>
 
                         @endforeach
                         @foreach ($arrayinfocaw as $laporancaw)
diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php
index 1e3cb414..06e37379 100644
--- a/resources/views/pdf/pdfsenarailapbidaan.blade.php
+++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php
@@ -90,7 +90,7 @@ tr:nth-child(even) {
                       <thead>
                         <br>
                         <tr>
-                          <td>Lelong ID:  {{$lelong_id}}</td>
+                          <td>ID Lelong:  {{$lelong_id}}</td>
                           @foreach ($lelongid as $info)                        
                           <td>Tarikh Lelong:@php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
diff --git a/resources/views/pembayaran/pengesahanPembayaran.blade.php b/resources/views/pembayaran/pengesahanPembayaran.blade.php
index 47f7af6b..d54a2a27 100644
--- a/resources/views/pembayaran/pengesahanPembayaran.blade.php
+++ b/resources/views/pembayaran/pengesahanPembayaran.blade.php
@@ -16,7 +16,7 @@
                             <th>Jumlah Bayaran(RM)</th>
                             <th>Remark</th>
                             <th>Status Bayaran</th>
-                            <th>Action</th>
+                            <th>Tindakan</th>
                         </tr>
                 </thead>
                 <tbody>
@@ -31,9 +31,9 @@
                             <td></td>
                             <td>
                                 @if ($sahbayar->status_payment == 0)
-                                    <button class="btn btn-danger btn-sm" disabled>UNPAID</button>
+                                    <button class="btn btn-danger btn-sm" disabled>BELUM DIBAYAR</button>
                                 @elseif ($sahbayar->status_payment == 1)
-                                    <button class="btn btn-success btn-sm" disabled>PAID</button>
+                                    <button class="btn btn-success btn-sm" disabled>TELAH DIBAYAR</button>
                                 @endif
                             </td>
                             <td>
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php
index 43898653..587386c1 100644
--- a/resources/views/pembayaran/senarailelongbayaran.blade.php
+++ b/resources/views/pembayaran/senarailelongbayaran.blade.php
@@ -20,7 +20,7 @@
                         <th>Fasa</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Action</th>
+                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/pembida/kemaskini.blade.php b/resources/views/pembida/kemaskini.blade.php
index fc5a595b..10774656 100644
--- a/resources/views/pembida/kemaskini.blade.php
+++ b/resources/views/pembida/kemaskini.blade.php
@@ -4,6 +4,10 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
+              <br>
             @if ($message = Session::get('success'))
                             <div class="alert alert-success">
                                 <p>{{ $message }}</p>
@@ -18,17 +22,17 @@
                     <input type="text" value="{{$user->name}}" class="form-control" name="name" id="name" readonly>
                   </div>
                   <div class="form-group col-md-6">
-                    <label for="inputPassword4">Email</label>
+                    <label for="inputPassword4">Emel</label>
                     <input type="email" value="{{$user->email}}" class="form-control" name="email" id="email">
                   </div>
                 </div>
                 <div class="form-row">
                     <div class="form-group col-md-6">
-                        <label for="inputPassword4">Number Phone</label>
+                        <label for="inputPassword4">No Telefon</label>
                         <input type="text" value="{{$user->notelbimbit}}" class="form-control" name="notelbimbit" id="notelbimbit">
                     </div>
                     <div class="form-group col-md-6">
-                        <label for="inputPassword4">Identity Card/Passport Number</label>
+                        <label for="inputPassword4">Kad Pengenalan/No Passport</label>
                         <input type="text" value="{{$user->nokp}}" class="form-control" name="nokp" id="nokp">
                     </div>
                 </div>
@@ -53,7 +57,7 @@
                     </div>
                 </div>
                 <div class="form-row">
-                    <h4 class="col-md-3">Identity Card/Passport Picture</h4>
+                    <h4 class="col-md-3">Kad Pengenalan/Gambar Passport</h4>
                     <div class="form-group col-md-9">
                         @foreach ($files as $file)
                             <div class=".col-6 .col-sm-4 form-check form-check-inline">
diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php
index 5a5b9d2a..376e7091 100644
--- a/resources/views/pembida/senaraipembida.blade.php
+++ b/resources/views/pembida/senaraipembida.blade.php
@@ -21,10 +21,10 @@
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <th>Nama</th>
-                            <th>Number Phone</th>
-                            <th>Email</th>
+                            <th>No Telefon</th>
+                            <th>Emel</th>
                             <th>Status</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php
index cc7f977d..e7dcfb15 100644
--- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php
+++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php
@@ -21,10 +21,10 @@
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <th>Nama</th>
-                            <th>Number Phone</th>
-                            <th>Email</th>
+                            <th>No Telefon</th>
+                            <th>Emel</th>
                             <th>Status</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php
index ef6e1807..18bc8529 100644
--- a/resources/views/pembida/senlelpembayaranbidaan.blade.php
+++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php
@@ -21,6 +21,10 @@
                         <th>Tempoh</th>
                         <th>Caj Lelong</th>
                         <th>Status Lelong</th>
+<<<<<<< Updated upstream
+=======
+                        <th class="text-center">Tindakan</th>
+>>>>>>> Stashed changes
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index 0ac62def..c365cb53 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -4,7 +4,10 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
+
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -14,7 +17,7 @@
             <div class="container">
                 <div class="row mb-2">
                     <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
-                        <p> <b>Norujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
+                        <p> <b>No rujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
                         <p> <b>Pembiayaan : </b> {{ $tangguhlelong[0]['pinjaman'] }}</p>
                         <p> <b>Remark : </b> {{ $tangguhlelong[0]['tangguh_nota'] }}</p>
                     </div>
@@ -50,7 +53,7 @@
                 </table>
             </form>
             <div class="modal-footer" style="margin-top:2%;">
-                <a  href="{{ route('pengesahan.senaraitangguhlelong', [$id, 'caw_name'=>$caw_names->caw_name, 'caw_code'=>$caw_names->caw_code]) }}" class="btn btn-primary">Kembali</a>
+                {{-- <a  href="{{ route('pengesahan.senaraitangguhlelong', [$id, 'caw_name'=>$caw_names->caw_name, 'caw_code'=>$caw_names->caw_code]) }}" class="btn btn-primary">Kembali</a> --}}
             </div>
         </div>
         
diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php
index 5fcbb033..1606a0a1 100644
--- a/resources/views/pengesahan/perubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php
@@ -4,6 +4,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
             
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -18,7 +21,7 @@
                             <th>Cawangan</th>
                             <th>No Rujukan</th>
                             <th>Status</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -47,7 +50,7 @@
                     
                 </table>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('pengesahan.senarailelongubahmutu') }}" class="btn btn-primary">Kembali</a>
+            {{-- <a  href="{{ route('pengesahan.senarailelongubahmutu') }}" class="btn btn-primary">Kembali</a> --}}
             </div>
         </div>
     </div>
diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php
index 5031dc50..04e73feb 100644
--- a/resources/views/pengesahan/senarailelongubahmutu.blade.php
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -16,7 +16,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Cawangan</th>
                             <th>Tarikh Lelong</th>
                             <th>Harga Emas Asas</th>
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index eb5543fe..9b64f7c1 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -4,7 +4,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -18,7 +20,7 @@
                         <tr>
                             <th>Bil</th>
                             <th>Tarikh Tangguh</th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>No Rujukan</th>
                             <th>Nota</th>
                             <th class="text-center">Tindakan</th>
@@ -41,7 +43,7 @@
                 </table>
             </form>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('pengesahan.senarailelong') }}" class="btn btn-primary">Kembali</a>
+            {{-- <a  href="{{ route('pengesahan.senarailelong') }}" class="btn btn-primary">Kembali</a> --}}
             </div>
         </div>
         
diff --git a/resources/views/pengurusandatabase/show.blade.php b/resources/views/pengurusandatabase/show.blade.php
index 7b13bb8a..2bfa9170 100644
--- a/resources/views/pengurusandatabase/show.blade.php
+++ b/resources/views/pengurusandatabase/show.blade.php
@@ -126,3 +126,9 @@
     
 </script>
 @endsection
+
+
+
+
+
+
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index 1ecc1d68..e7c80f6c 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -2,8 +2,6 @@
 
 @section('content')
 
-
-
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
@@ -13,6 +11,11 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
             <?php
                 $totaluser = count($alluser);
             ?>
@@ -24,7 +27,8 @@
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <th>Nama</th>
-                            <th>Emails</th>
+                            <th>Nama Pengguna</th>
+                            <th>Emel</th>
                             <th>Taraf</th>
                             <th>Status</th>
                             <th class="text-center">Action</th>
@@ -36,6 +40,7 @@
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
                             <td>{{ $user->name }}</td>
+                            <td>{{ $user->username }}</td>
                             <td>{{ $user->email }}</td>
                             
                             <td>
@@ -60,11 +65,9 @@
                         </tr>
                         @endforeach
                     </tbody>
-                    
                 </table>
             </form>
         </div>
-        
     </div>
 </div>
 
@@ -87,7 +90,7 @@
                         <input type="text" class="form-control" name="name" id="name" required>
                       </div>
                       <div class="form-group col-md-6">
-                        <label for="username">Username</label>
+                        <label for="username">Nama Pengguna</label>
                         <input type="text" class="form-control" name="username" id="username" required>
                       </div>
                     </div>
@@ -105,10 +108,24 @@
                             </select>
                    </div>
                      <div class="form-group col-md-6">
-                          <label for="email">Email</label>
+                          <label for="email">Emel</label>
                           <input type="email" class="form-control" name="email" id="email" >
                         </div>
                       </div>
+                      
+                      <div class="form-row">
+                        <div class="form-group col-md-6">
+                        <label for="name">Taraf</label>
+                            <select required name="taraf" class="custom-select" name="allroles" id="allroles">
+                            <option value="">Pilih Taraf</option>
+                            @foreach ($allroles as $id =>$namataraf)
+                            <option value="{{$namataraf}}" {{(isset($roles['name']) && $roles['name'] == $id) ? 'selected' : ''}}>{{$namataraf}}</option>
+                            {{-- <option value="{{$namataraf}}">{{$namataraf}}</option> --}}
+                            {{-- <option value="{{$namataraf->name}}"></option> --}}
+                
+                            @endforeach
+                            </select>
+                   </div>                       
 
                     <!-- <div class="form-row">
                     <label for="name">Taraf Pengguna</label>
diff --git a/resources/views/serahan/laporanserahan.blade.php b/resources/views/serahan/laporanserahan.blade.php
index 05eabacc..751d8328 100644
--- a/resources/views/serahan/laporanserahan.blade.php
+++ b/resources/views/serahan/laporanserahan.blade.php
@@ -15,9 +15,9 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <th>Lelong ID</th>
+                            <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php
index dfd1875e..997420f7 100644
--- a/resources/views/serahan/pembayaran.blade.php
+++ b/resources/views/serahan/pembayaran.blade.php
@@ -17,7 +17,7 @@
                         {{-- <th>Penyata Bayaran</th> --}}
                         <th>Resit Bayaran</th>
                         <th>Barang Bidaan</th>
-                        <th>Action</th>
+                        <th>Tindakan</th>
 
                     </tr>
             </thead>
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 75b8e719..3d6fc96b 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -44,7 +44,7 @@
                              <td>{{ $info['info']['harga_emas_asas'] }}</td>
                             <td class="text-center">
                                 <a  href="{{ route('analisa.show',$info['info']['simulasi_id']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                                <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
+                                <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a>
                                     
                                     
                                 </td>
@@ -136,4 +136,4 @@
     }
 </script>
      
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index b623439f..92506c20 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -56,7 +56,7 @@
                             <th>Nilai Marhun</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Baki Pembiayaan (RM)</th>
-                            <th class="text-center">Action</th>
+                            <th class="text-center">Tindakan</th>
                         </tr>
                 </thead>
                 <tbody>
diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php
index bcb96fd0..46549755 100644
--- a/resources/views/tangguhlelong/sensahpc.blade.php
+++ b/resources/views/tangguhlelong/sensahpc.blade.php
@@ -4,7 +4,9 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+              </div>
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -57,7 +59,7 @@
                     </tbody>
                 </table>
                 <div class="modal-footer" style="margin-top:2%;">
-                    <a  href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a>
+                    {{-- <a  href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a> --}}
                     <button type="submit" class="btn btn-warning">Sahkan</button>
                 </div>
             </form>