Merge remote-tracking branch 'origin' into afiqhamzah-feat-mykad-reader-registration
This commit is contained in:
afiq.hamzah
@@ -128,7 +128,7 @@
|
||||
@else
|
||||
@php
|
||||
$cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
|
||||
echo ucwords($cawangan_staff['details_caw']);
|
||||
echo ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test';
|
||||
@endphp
|
||||
@endif
|
||||
</td>
|
||||
@@ -136,16 +136,18 @@
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<a href="{{ route('kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
|
||||
<a href="{{ route('kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
|
||||
<a href="{{ route('operasi.kakitangan.edit',['id'=>$staff->id]) }}" class="btn btn-success" title="Edit Maklumat"><i class="material-icons">settings</i></a>
|
||||
<button type="button" class="btn btn-danger btn-delete" data-roles="{{ $auth_user->roles }}" data-staff-id="{{ $staff->id }}" data-token="{{ csrf_token() }}" title="Delete Kakitangan"><i class="material-icons">delete</i></button>
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<form method="post" action="{{ route('admin.kakitangan.delete') }}">
|
||||
{{ @csrf_field() }}
|
||||
{{-- <form method="post" action="{{ route('admin.kakitangan.delete') }}">
|
||||
{{ @csrf_field() }} --}}
|
||||
<input type="hidden" name="staff_id" value="{{ $staff->id }}"/>
|
||||
<a href="{{ route('admin.kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
|
||||
<a href="{{ route('admin.kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
|
||||
<a href="{{ route('admin.kakitangan.edit',['id'=>$staff->id]) }}" class="btn btn-success" title="Edit Maklumat"><i class="material-icons">settings</i></a>
|
||||
<a href="{{ route('admin.kakitangan.resetcredentials',['id'=>$staff->id]) }}" class="btn btn-primary" title="Reset Password"><i class="material-icons">restore</i></a>
|
||||
<button type="button" class="btn btn-danger btn-delete" data-staff-id="{{ $staff->id }}" data-token="{{ csrf_token() }}" title="Delete Kakitangan"><i class="material-icons">delete</i></button>
|
||||
</form>
|
||||
{{-- </form> --}}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@@ -165,20 +167,57 @@
|
||||
var tablerekod = $('#rekod_kakitangan').DataTable();
|
||||
|
||||
$('.btn-delete').on('click', function(){
|
||||
var form = $(this).closest('form');
|
||||
Swal.fire(
|
||||
{
|
||||
title: 'Are you sure?',
|
||||
text: "You won't be able to revert this!",
|
||||
// var form = $(this).closest('form');
|
||||
var roles = $(this).data('roles');
|
||||
var staff_id = $(this).data('staff-id');
|
||||
|
||||
var url_redirected = (roles == 'operasi') ? "{{ route('operasi.kakitangan.delete') }}" : "{{ route('admin.kakitangan.delete') }}";
|
||||
|
||||
Swal.fire({
|
||||
title: 'Padam Kakitangan Ini?',
|
||||
text: "Anda tidak boleh mengembalikan data ini balik selepas dipadamkan!",
|
||||
type: 'warning',
|
||||
showCancelButton: true,
|
||||
confirmButtonClass: 'btn btn-danger',
|
||||
cancelButtonClass: 'btn btn-warning',
|
||||
confirmButtonText: 'Yes, delete it!',
|
||||
confirmButtonText: 'Padam!',
|
||||
cancelButtonText: 'Batal!',
|
||||
buttonsStyling: false
|
||||
}
|
||||
).then(function() {
|
||||
form.submit();
|
||||
}).then(function(result) {
|
||||
if (result.isConfirmed) {
|
||||
|
||||
$.ajax({
|
||||
method:'post',
|
||||
url: url_redirected,
|
||||
data: {
|
||||
"_token": "{{ csrf_token() }}",
|
||||
"staff_id" : staff_id
|
||||
},
|
||||
success:function(data){
|
||||
if(data == 'success')
|
||||
{
|
||||
if(roles == 'operasi')
|
||||
window.location.href = "{{ route('daftar.kakitangan') }}";
|
||||
else
|
||||
window.location.href = "{{ route('admin.daftar.kakitangan') }}";
|
||||
|
||||
Swal.fire({
|
||||
title: 'Memuatkan...',
|
||||
allowEscapeKey : false,
|
||||
allowOutsideClick: false,
|
||||
didOpen: function () {
|
||||
Swal.showLoading();
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
var err = eval("(" + xhr.responseText + ")");
|
||||
alert(xhr.responseText);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}).catch(swal.noop)
|
||||
});
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
<nav aria-label="breadcrumb">
|
||||
<ol class="breadcrumb pb-3">
|
||||
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('admin.daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ (Auth::user()->roles == 'admin') ? route('admin.daftar.kakitangan') : route('daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
<li class="breadcrumb-item active" aria-current="page">Edit Maklumat Kakitangan</li>
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
<form action="{{ route('admin.kakitangan.edit.store') }}" method="post">
|
||||
<form action="{{ (Auth::user()->roles == 'admin') ? route('admin.kakitangan.edit.store') : route('operasi.kakitangan.edit.store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
|
||||
<div class='row form-group'>
|
||||
|
||||
@@ -2464,7 +2464,7 @@
|
||||
sumberat += parseFloat(value);
|
||||
});
|
||||
|
||||
var jenistebus = $('#sltjenistebus').find(":selected").val();
|
||||
var jenistebus = $('#sltjenistebus').find(":selected").val();
|
||||
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
|
||||
var jbg = "{{ $gadai['tempoh'] }}";
|
||||
var kadarupah = "{{ $gadai['kadarupah'] }}";
|
||||
|
||||
@@ -25,6 +25,13 @@
|
||||
margin-top: -70px;
|
||||
}
|
||||
|
||||
@media print {
|
||||
.khazanah {
|
||||
margin-top: -60%;
|
||||
page-break-before: always;
|
||||
}
|
||||
}
|
||||
|
||||
.khazanah-copy{
|
||||
border:1px solid black;
|
||||
padding:10px;
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-12">
|
||||
<h3 class="text-center text-uppercase">maklumat pengguna</h3>
|
||||
<div class="card">
|
||||
<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" class="form-control"></div>
|
||||
<div class="col-md-6">NO TELEFON</div>
|
||||
<div class="col-md-6"><input type="text" class="form-control"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="row form-group">
|
||||
<div class="col-md-6">NO KP</div>
|
||||
<div class="col-md-6"><input type="text" class="form-control"></div>
|
||||
<div class="col-md-6">JAWATAN</div>
|
||||
<div class="col-md-6"><input type="text" class="form-control"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="{{ asset('js/pusher.min.js') }}"></script>
|
||||
<script>
|
||||
|
||||
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
|
||||
cluster: 'ap1',
|
||||
encrypted: true
|
||||
});
|
||||
|
||||
var channel = pusher.subscribe('action-channel-one');
|
||||
channel.bind('my-actionevent', function(data) {
|
||||
|
||||
alert('asdas');
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
Reference in New Issue
Block a user