Merge remote-tracking branch 'origin/new-super' into afiqhamzah-feat-mykad-reader-registration

2022-12-26 11:56:00 +08:00
parent 6c40b6eec6 c744e23288
commit 18c066c2f1
24 changed files with 1278 additions and 34 deletions
@@ -8,13 +8,17 @@
@if($countproses > 0)
 <script>
    Swal.fire({
-        title: 'Memuatkan...',
-        allowEscapeKey: false,
+        title: 'Tunggu Pengesahan Daripada Khazanah.',
+        icon: 'info',
+        width: 600,
+        padding: '3em',
+        background: '#fffff',
+        showCancelButton: false,
+        showConfirmButton: false,
        allowOutsideClick: false,
-        didOpen: () => {
-            Swal.showLoading()
-        }
-    });
+        allowEscapeKey: false,
+        allowEnterKey: false
+    })
 </script>
@endif

@@ -31,7 +35,7 @@
                  <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                  <li class="breadcrumb-item active" aria-current="page">Aliran Tunai</li>
                </ol>
-              </nav>
+            </nav>

            
        <div class="row justify-content-center">  
@@ -561,7 +565,6 @@

    function cetakserahankeseluruhan()
    {
-        console.log('ets');
        let urlroute = '{{ route("laporan.serahanteller") }}';

        window.open(urlroute, '_blank');
@@ -260,6 +260,7 @@
 <script>
    var api_url = "<?php echo $api_url ?>";
    var cawangan = "{{ Auth::user()->cawangan }}";
+    var teller = "{{ Auth::user()->name }}";

    var total_marhun_pilih = 0;

@@ -630,10 +631,9 @@
                });


-                var channel = pusher.subscribe('status-liked');
-                channel.bind('my-event', function(data) {
-
-                    if(cawangan == data.cawangan)
+                var channel = pusher.subscribe('notice-ubahhapus');
+                channel.bind('my-ubahhapus', function(data) {
+                    if(norujukan == data.norujukan && teller == data.teller && data.kelulusan == 'lulus')
                    {
                        Swal.fire({
                        icon: 'success',
@@ -641,6 +641,12 @@
                        }).then(function(){
                            $("#print_submit_belum_serah").submit();
                        });
+                    }else{
+                        Swal.fire({
+                        icon: 'error',
+                        title: 'Tidak Berjaya',
+                        text: data.komen
+                        });
                    }

                });
@@ -11,7 +11,7 @@
                    <a class="btn btn-info btn-lg" href="#" onclick="pelangganclick()">PELANGGAN</a>
                    <a class="btn btn-info btn-lg" href="{{ url('/harga_emas') }}">HARGA EMAS</a>
                    <a class="btn btn-info btn-lg" href="{{ url('/aliran_tunai') }}">ALIRAN TUNAI</a>
-                    <a class="btn btn-info btn-lg" href="#">TETAPAN</a>
+                    {{-- <a class="btn btn-info btn-lg" href="#">TETAPAN</a> --}}
                </div>
            </div>
        </div>
@@ -155,6 +155,7 @@
                                        <th>Margin</th>
                                        <th>Tempoh</th>
                                        <th>Keuntungan</th>
+					<th>Lelong</th>
                                    </tr>
                                </thead>
                            </table>
@@ -170,6 +171,7 @@
                                        <th>Pembiayaan</th>
                                        <th>Margin</th>
                                        <th>Tempoh</th>
+					<th>Lelong</th>
                                    </tr>
                                </thead>
                            </table>
@@ -507,6 +509,11 @@
                    if(jenistebus == "belum_tebus"){
                        var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
                        urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+                        if(gadai_detail['taglel'] == 1){
+                                var taglel = 'Akan Dilelong';
+                            }else{
+                                var taglel = '';
+                        }
                        if(gadai_detail["bakihargajualan"] == null){
                            xtawarruq.row.add([
                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
@@ -515,7 +522,8 @@
                                gadai_detail['t_matang'],
                                'RM '+formatter.format(gadai_detail['pinjaman']),
                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                                gadai_detail['tempoh']
+                                gadai_detail['tempoh'],
+				taglel
                            ]).draw();
                        }else{
                            if(gadai_detail['lelong_tawarruq'] == 0){
@@ -532,7 +540,8 @@
                                'RM '+formatter.format(gadai_detail['bakipjm']),
                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                                gadai_detail['tempoh'],
-                                'RM '+ upahsemasa
+                                'RM '+ upahsemasa,
+				taglel
                            ]).draw();
                        }
                    }else if(jenistebus == "sudah_tebus"){
@@ -0,0 +1,81 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Imbang Duga Akru</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                  @if(session()->has('error'))
+                  <div class="alert alert-danger">
+                      {{ session()->get('error') }}
+                  </div>
+                  @endif
+                  <div class="row form-group">
+                    <div class="col-md-2"></div>
+                    <div class="col-md-15"></div>
+                  </div>
+                  <div class="container">
+                  <form method="post" onsubmit="loadingmodal()">
+                    @csrf
+                    <div class="row">
+                      <div class="col-sm-2">Tarikh</div>
+                      <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2"    autocomplete="off"  aria-describedby="basic-addon1"></div>
+                    </div>
+                    <br>
+                    <div class="row">
+                      <div class="col-sm-3"></div>
+                      <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangdugaakru.cetak')}}"></div>
+                    </div>
+                  </form>
+                  </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    $(document).ready( function () {
+        var dateToday = new Date();
+        $('#datetimepicker2').datepicker({
+            format: 'dd-mm-yyyy',
+        });
+        $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,19));
+        $('#datetimepicker2').datepicker('setEndDate', new Date());
+
+    });
+
+    function loadingmodal()
+    {
+      Swal.fire({
+        title: 'Memuatkan...',
+        allowEscapeKey : false,
+        allowOutsideClick: false,
+        didOpen: function () {
+            Swal.showLoading()
+        }
+        });
+    }
+
+</script>
+
+@endsection
+
+
+
@@ -111,6 +111,9 @@
                            {{-- <div class="row">
                                <a href="{{ route('laporan.auditcustomer') }}" class="btn btn-dark btn-lg btn-block mb-3">Audit Customer</a>
                            </div> --}}
+                            <div class="row">
+                                <a href="{{ route('laporan.imbangdugaakru') }}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga Akru</a>
+                            </div>
                        </div>
                    </div>
                </div>
@@ -550,7 +550,7 @@ function ubahwakil(e)
        }

                    
-        let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
+        let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val().replace(/[^0-9.-]+/g,"");
        let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
        let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");

@@ -0,0 +1,486 @@
+<html>
+<head>
+
+  <script src="{{ asset('js/jquery.min.js') }}"></script>
+
+<style>
+  #header {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+
+  #header td, #customers th {
+  
+    padding:4px;
+    font-size:12px;
+  }
+
+  #header tr:nth-child(even){background-color: #ffffff;}
+
+  #header tr:hover {background-color: #ddd;}
+
+  #header th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #loading {
+    position: fixed;
+    display: block;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    text-align: center;
+    opacity: 0.7;
+    background-color: #fff;
+    z-index: 99;
+  }
+
+  #loading-image {
+    position: absolute;
+    top: 100px;
+    left: 240px;
+    z-index: 100;
+  }
+
+  #scan {
+    font-family: Arial, Helvetica, sans-serif;
+
+    width: 100%;
+    border: 1px solid #ddd;
+  }
+
+  #scan td, #scan th {
+  
+    padding: 8px;
+    font-size:20px;
+  }
+
+  #scan tr:nth-child(even){background-color: #ffffff;}
+
+  #scan tr:hover {background-color: #ddd;}
+
+  #scan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #scan {
+    font-family: Arial, Helvetica, sans-serif;
+
+    width: 100%;
+  }
+
+  #scan td, #scan th {
+    
+    padding: 8px;
+    font-size:12px;
+  }
+
+
+  #scan tr:nth-child(even){background-color: #ffffff;}
+
+  #scan tr:hover {background-color: #ddd;}
+
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #details {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 50%;
+  }
+
+  #details td, #details th {
+  
+    padding: 8px;
+    font-size:16px;
+  }
+
+  #details tr:nth-child(even){background-color: #ffffff;}
+
+  #details tr:hover {background-color: #ffffff;}
+
+  #details th {
+    padding-top: 12px;
+  font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #sign {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+
+  #sign td, #sign th {
+
+    padding: 8px;
+    font-size:11px;
+    text-align: center;
+  }
+
+  #sign tr:nth-child(even){background-color: #ffffff;}
+
+  #sign tr:hover {background-color: #ddd;}
+
+  #sign th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #title {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 50%;
+  }
+
+  #title td, #title th {
+  
+    padding:4px;
+    font-size:12px;
+    border: 0px solid #fff;
+  }
+
+  #title tr:nth-child(even){background-color: #ffffff;}
+
+  #title tr:hover {background-color: #ddd;}
+
+  #title th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+
+  }
+
+  #details {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:80%;
+
+  }
+
+  #details td, #details th {
+  
+    padding:4px;
+    font-size:16px;
+    border: 1px solid #ddd;
+  }
+
+  #details tr:nth-child(even){background-color: #ffffff;}
+
+  #details tr:hover {background-color: #ddd;}
+
+  #details th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+
+  }
+
+  #tarikh_cetak {
+
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 50%;
+  }
+
+
+  #tarikh_cetak  td, #tarikh_cetak th {
+  
+    padding:4px;
+    font-size:10px;
+
+  }
+
+  #tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
+
+  #tarikh_cetak  tr:hover {background-color: #ddd;}
+
+  #tarikh_cetak  th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+
+  }
+
+  #data {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 80%;
+
+
+  }
+
+  #data td, #data th {
+  
+    padding:4px;
+    font-size:16px;
+  }
+
+
+  #data tr:nth-child(even){background-color: #ffffff;}
+
+  #data tr:hover {background-color: #ddd;}
+
+  #data th {
+    padding-top: 11px;
+    padding-bottom: 11px;
+    text-align: left;
+    padding:4px;
+    color:black;
+    font-size:14px;
+
+
+  }
+
+  #tarikh_ib {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:45%;
+  }
+
+  #tarikh_ib td, #tarikh_ib th {
+  
+    padding:4px;
+    font-size:12px;
+  }
+
+  #tarikh_ib tr:nth-child(even){background-color: #ffffff;}
+
+  #tarikh_ib tr:hover {background-color: #ddd;}
+
+  #tarikh_ib th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #GL {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:100%;
+  }
+
+  #GL td, #GL th {
+  
+    padding:4px;
+    font-size:12px;
+    border: 1px solid #ddd;
+  }
+
+  #GL tr:nth-child(even){background-color: #ffffff;}
+
+  #GL tr:hover {background-color: #ddd;}
+
+  #GL th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #GL_dtl {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:100%;
+  }
+
+  #GL_dtl td, #GL_dtl th {
+  
+    padding:4px;
+    font-size:12px;
+    border: 1px solid #ddd;
+  }
+
+  #GL_dtl tr:nth-child(even){background-color: #ffffff;}
+
+  #GL_dtl tr:hover {background-color: #ddd;}
+
+  #GL_dtl th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #dtl_ib {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:100%;
+  }
+
+  #dtl_ib td, #dtl_ib th {
+  
+    padding:4px;
+    font-size:12px;
+    border: 1px solid #ddd;
+  }
+
+  #dtl_ib tr:nth-child(even){background-color: #ffffff;}
+
+  #dtl_ib tr:hover {background-color: #ddd;}
+
+  #dtl_ib th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+
+  #total_harta {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:100%;
+  }
+
+  #total_harta td, #total_harta th {
+  
+    padding:4px;
+    font-size:12px;
+    border: 1px solid #ddd;
+  }
+
+  #total_harta tr:nth-child(even){background-color: #ffffff;}
+
+  #total_harta tr:hover {background-color: #ddd;}
+
+  #total_harta th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+</style>
+</head>
+<body>
+<table id="header">
+  <tr>
+    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr>
+</table>
+<br>
+
+
+<table id="tarikh_ib">
+<tr>
+ <td cospan="2" > <B><U>LAPORAN IMBANGAN DUGA CAWANGAN</U></B></td>
+
+
+</tr>
+</table>
+
+<table id="tarikh_ib">
+
+
+<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}}  </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td    style="width:25px"    > {{$tarikh_cetak}} </td> </tr>
+
+
+
+</table>
+<br>
+
+<table id="GL_dtl"> 
+
+  <tr>
+    <th width="20%"> Kod GL </th>    
+    <th colspan="1" width="60%">Keterangan </th>   
+    <th width="20%">Amaun</th>
+  </tr>
+
+  <tr>
+    <th colspan="3"><b> HARTA SEMASA</b> </th>
+  </tr>
+
+  @foreach($hartasemasa as $index => $assets)
+  @if($assets->amaun != 0)
+    <tr>
+      <td>{{ $assets->glcode }}</td>
+      <td>{{ $assets->descpt }}</td>
+      <td>{{ number_format($assets->amaun,2) }}</td>
+    </tr>
+  @endif
+  @endforeach
+
+  <tr>
+    <td><b>JUMLAH </b></td>
+    <td colspan="1"></td>
+    <td><b>{{ number_format($totalhartasemasa,2) }}</b></td>
+  </tr>
+
+</table>
+<br>
+<table id="GL_dtl"> 
+  <tr>
+    <th colspan="3"><b> TANGGUNGAN SEMASA</b> </th>
+  </tr>
+
+  @foreach($tanggungansemasa as $index => $liabilities)
+  @if($liabilities->amaun != 0)
+    <tr>
+      <td width="20%">{{ $liabilities->glcode }}</td>
+      <td colspan="1" width="60%">{{ $liabilities->descpt }}</td>
+      <td width="20%">{{ number_format($liabilities->amaun,2) }}</td>
+    </tr>
+  @endif
+  @endforeach
+
+  <tr>
+    <td ><b>JUMLAH </b></td>
+    <td colspan="1"></td>
+    <td><b>{{ number_format($totaltanggungansemasa,2) }}</b></td>
+  </tr>
+
+</table>
+<br>
+
+<br>
+<br>
+
+</body>
+</html>
@@ -89,8 +89,8 @@

            @endphp
            <tr>
-                <td>di <b>{{ strtoupper($daerah['namadaerah']) }} </b> </td>
-                <td class="tableright">)</td>
+                <td></td>
+                <td class="tableright"></td>
                <td></td>
            </tr>
            <tr>
@@ -0,0 +1,53 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item"><a href="{{ route('profile') }}">Maklumat Pengguna</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Ubah Maklumat Pengguna</li>
+                </ol>
+            </nav>
+            <div class="card">
+                <form method="post" name="frmedit" action="{{ route('profile.editstore') }}">
+                @csrf
+                <div class="card-body text-center">
+                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
+                        <div class="row form-group">
+                            <div class="col-md-6">
+                                <div class="row form-group">
+                                    <div class="col-md-6">Nama</div>
+                                    <div class="col-md-6"><input type="text" name="nama" class="form-control @error('nama') is-invalid @enderror" value="{{ strtoupper($auth_user->name) }}">
+                                        @error('nama') <span class="text-danger">{{ $message }}</span> @enderror
+                                    </div>
+                                    <div class="col-md-6">No Telefon</div>
+                                    <div class="col-md-6"><input type="text" name="notel" class="form-control @error('notel') is-invalid @enderror" value="{{ $auth_user->no_telefon }}">
+                                        @error('notel') <span class="text-danger">{{ $message }}</span> @enderror
+                                    </div>
+                                    <div class="col-md-6">Email</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->email }}"></div>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="row form-group">
+                                    <div class="col-md-6">No Kad Pengenalan</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
+                                    <div class="col-md-6">Jawatan</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ strtoupper($auth_user->role_harian) }}"></div>
+                                    <div class="col-md-6">Baki Perubatan</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ 'RM '. number_format($auth_user->perubatan,2) }}"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Kemaskini Profil</button>
+                </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
@@ -0,0 +1,49 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item"><a href="{{ route('profile') }}">Maklumat Pengguna</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Ubah Maklumat Pengguna</li>
+                </ol>
+            </nav>
+            <div class="card">
+                <div class="card-body text-center">
+                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
+                        <form action="{{ route('profile.editstore') }}" method="post">
+                        @csrf
+                        <div class="row form-group">
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NAMA</div>
+                                    <div class="col-md-6"><input type="text" name="nama" class="form-control @error('nama') is-invalid @enderror" value="{{ $auth_user->name }}">
+                                        @error('nama') <span class="text-danger">{{ $message }}</span> @enderror
+                                    </div>
+                                    <div class="col-md-6">NO TELEFON</div>
+                                    <div class="col-md-6"><input type="text" name="notel" class="form-control @error('notel') is-invalid @enderror" value="{{ $auth_user->no_telefon }}">
+                                        @error('notel') <span class="text-danger">{{ $message }}</span> @enderror
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NO KP</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
+                                    <div class="col-md-6">JAWATAN</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->roles }}"></div>
+                                </div>
+                            </div>
+                        </div>
+                            <button type="submit" class="btn btn-primary">Kemaskini Profil</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
@@ -13,6 +13,10 @@
            <div class="card">
                <div class="card-body text-center">
                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
+
+                        @if(Session::has('success'))
+                        <div class="alert alert-success mt-2">{{ Session::get('success') }} </div>
+                        @endif
                        <div class="row form-group">
                            <div class="col-md-6">
                                <div class="row form-group">
@@ -36,6 +40,7 @@
                            </div>
                        </div>
                    </div>
+                    <a href="{{ route('profile.edit') }}" class="btn btn-primary">Kemaskini Profil</a>
                    <a href="{{ route('user.password') }}" class="btn btn-primary">Kemaskini Katalaluan</a>
                </div>
            </div>
@@ -32,6 +32,8 @@
                            </div>
                        </div>
                    </div>
+                    <a href="{{ route('profile.edit') }}" class="btn btn-primary">Kemaskini Profil</a>
+                    <a href="{{ route('user.password') }}" class="btn btn-primary">Kemaskini Katalaluan</a>
                </div>
            </div>
        </div>
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.app_operasi')
@section('content')
 <div class="container">
    <div class="row justify-content-center">
@@ -23,7 +23,7 @@
                         @endforeach 
  
                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">Current Password</label>
+                            <label for="password" class="col-md-4 col-form-label text-md-right">Kata Laluan Semasa</label>
  
                            <div class="col-md-6">
                                <input id="password" type="password" class="form-control" name="current_password" autocomplete="current-password">
@@ -31,7 +31,7 @@
                        </div>
  
                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">New Password</label>
+                            <label for="password" class="col-md-4 col-form-label text-md-right">Kata Laluan Baru</label>
  
                            <div class="col-md-6">
                                <input id="new_password" type="password" class="form-control" name="new_password" autocomplete="current-password">
@@ -39,7 +39,7 @@
                        </div>
  
                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">New Confirm Password</label>
+                            <label for="password" class="col-md-4 col-form-label text-md-right">Sahkan Kata Laluan Baru</label>
    
                            <div class="col-md-6">
                                <input id="new_confirm_password" type="password" class="form-control" name="new_confirm_password" autocomplete="current-password">