admin page
This commit is contained in:
@@ -23,11 +23,11 @@ class KakitanganController extends Controller
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$role = Role::get();
|
||||
$kakitangan = User::all();
|
||||
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
|
||||
return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan','auth_user'));
|
||||
}
|
||||
|
||||
public function registerStaff(Request $request){
|
||||
|
||||
$auth_user = Auth::user();
|
||||
$validated = $request->validate([
|
||||
'nama' => 'required',
|
||||
'email' => 'required|email',
|
||||
@@ -38,7 +38,7 @@ class KakitanganController extends Controller
|
||||
|
||||
if($request->role == 'operasi'){
|
||||
$new_dashboard = Dashboard::create([
|
||||
'name' => $request->nama,
|
||||
'name' => strtoupper($request->nama),
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->nokp),
|
||||
'no_kp' => $request->nokp,
|
||||
@@ -48,7 +48,7 @@ class KakitanganController extends Controller
|
||||
}
|
||||
|
||||
$new_staff = User::create([
|
||||
'name' => $request->nama,
|
||||
'name' => strtoupper($request->nama),
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->nokp),
|
||||
'no_kp' => $request->nokp,
|
||||
@@ -57,7 +57,11 @@ class KakitanganController extends Controller
|
||||
'cawangan' => $request->cawangan
|
||||
]);
|
||||
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
if($auth_user->roles == 'operasi'){
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
}else if($auth_user->roles == 'admin'){
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
}
|
||||
|
||||
public function kakitanganHarian(Request $request){
|
||||
@@ -126,7 +130,8 @@ class KakitanganController extends Controller
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$user = User::find($request->id);
|
||||
$role = Role::get();
|
||||
return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user'));
|
||||
|
||||
return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user','auth_user'));
|
||||
}
|
||||
|
||||
public function tukartarafUpdate(Request $request){
|
||||
@@ -144,7 +149,13 @@ class KakitanganController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
$auth_user = Auth::user();
|
||||
|
||||
if($auth_user->roles == 'operasi'){
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
}else if($auth_user->roles == 'admin'){
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
}
|
||||
|
||||
public function tukarcawangan(Request $request){
|
||||
@@ -153,7 +164,8 @@ class KakitanganController extends Controller
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$user = User::find($request->id);
|
||||
$role = Role::get();
|
||||
return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user'));
|
||||
|
||||
return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user','auth_user'));
|
||||
}
|
||||
|
||||
public function tukarcawanganUpdate(Request $request){
|
||||
@@ -162,7 +174,51 @@ class KakitanganController extends Controller
|
||||
$user->roles = $request->role;
|
||||
$user->role_harian = $request->role;
|
||||
$user->save();
|
||||
$auth_user = Auth::user();
|
||||
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
if($auth_user->roles == 'operasi'){
|
||||
return redirect()->route('daftar.kakitangan');
|
||||
}else if($auth_user->roles == 'admin'){
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
}
|
||||
|
||||
public function deleteKakitangan(Request $request){
|
||||
// dd($request->all());
|
||||
$user = User::find($request->staff_id);
|
||||
$user->delete();
|
||||
// dd($user_delete);
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
|
||||
public function editKakitangan(Request $request){
|
||||
$api_url = config('api.url');
|
||||
$auth_user = Auth::user();
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$user = User::find($request->id);
|
||||
$role = Role::get();
|
||||
|
||||
return view('operasi.edit_kakitangan',compact('cawangan_info','api_url','role','user','auth_user'));
|
||||
}
|
||||
|
||||
public function editStoreKakitangan(Request $request){
|
||||
// dd($request->all());
|
||||
$user = User::find($request->user_id);
|
||||
$user->name = strtoupper($request->nama);
|
||||
$user->email = $request->email;
|
||||
$user->no_kp = $request->nokp;
|
||||
$user->no_telefon = $request->telefon;
|
||||
$user->perubatan = $request->perubatan;
|
||||
$user->password = Hash::make($request->nokp);
|
||||
$user->save();
|
||||
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
|
||||
public function resetCredentials(Request $request){
|
||||
$user = User::find($request->id);
|
||||
$user->password = Hash::make(config('app.reset_password'));
|
||||
$user->save();
|
||||
return redirect()->route('admin.daftar.kakitangan');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -347,68 +347,57 @@ class KhazanahController extends Controller
|
||||
|
||||
$jum_bayaran=Http::get(config('api.url').'/api/transaction/one/'.$request->norujukan_barcode)->json();
|
||||
$jumlah_bayaran=$jum_bayaran['duit_masuk'];
|
||||
|
||||
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
|
||||
|
||||
if($tebus_detail['jenistebus'] == 'P')
|
||||
if($update == 'success'){
|
||||
if($tebus_detail['jenistebus'] == 'P')
|
||||
{
|
||||
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
|
||||
|
||||
|
||||
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
|
||||
'kodlaluan' => $tebus_detail['teller'],
|
||||
'keluar'=>$keluar,
|
||||
'masuk'=>$totalmasuk,
|
||||
'bakiakhir'=>$bakiakhir
|
||||
]);
|
||||
|
||||
if($updateTunai)
|
||||
{
|
||||
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if(empty($updateTunai)){
|
||||
dd('x masuk aliran tunai');
|
||||
}
|
||||
|
||||
|
||||
}else{
|
||||
|
||||
|
||||
if($tebus_detail['jenistebus'] == 'S')
|
||||
{
|
||||
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
|
||||
|
||||
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
|
||||
'kodlaluan' => $tebus_detail['teller'],
|
||||
'keluar'=>$keluar,
|
||||
'masuk'=>$totalmasuk,
|
||||
'bakiakhir'=>$bakiakhir
|
||||
]);
|
||||
|
||||
if($updateTunai)
|
||||
{
|
||||
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
|
||||
}
|
||||
else
|
||||
{
|
||||
dd('x masuk aliran tunai');
|
||||
}
|
||||
}else{
|
||||
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
|
||||
|
||||
|
||||
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
|
||||
'kodlaluan' => $tebus_detail['teller'],
|
||||
'keluar'=>$keluar,
|
||||
'masuk'=>$totalmasuk,
|
||||
'bakiakhir'=>$bakiakhir
|
||||
]);
|
||||
]);
|
||||
if(empty($updateTunai)){
|
||||
dd('x masuk aliran tunai');
|
||||
}
|
||||
}else{
|
||||
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
|
||||
|
||||
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
|
||||
'kodlaluan' => $tebus_detail['teller'],
|
||||
'keluar'=>$keluar,
|
||||
'masuk'=>$totalmasuk,
|
||||
'bakiakhir'=>$bakiakhir
|
||||
]);
|
||||
|
||||
if($updateTunai)
|
||||
{
|
||||
$update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
|
||||
}
|
||||
else
|
||||
{
|
||||
dd('x masuk aliran tunai');
|
||||
}
|
||||
if(empty($updateTunai)){
|
||||
dd('x masuk aliran tunai');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return redirect()->route('khazanah.tebus');
|
||||
}
|
||||
|
||||
@@ -1053,7 +1042,7 @@ class KhazanahController extends Controller
|
||||
public function barcodescanned(Request $request){
|
||||
|
||||
$auth_user = Auth::user();
|
||||
$gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
|
||||
$scan_barcode = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
|
||||
|
||||
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json();
|
||||
$gadai_detail = $gadai[0];
|
||||
@@ -1616,29 +1605,6 @@ class KhazanahController extends Controller
|
||||
}
|
||||
|
||||
public function cetakLaporanPenebusan(Request $request){
|
||||
<<<<<<< HEAD
|
||||
// dd($request);
|
||||
$api_url = config('api.url');
|
||||
$auth_user = Auth::user();
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
$tarikh_cetak = $current->toDateString();
|
||||
if($request->datetarikh == null){
|
||||
$tebus_date = $current->toDateString();
|
||||
}else{
|
||||
$split_date = explode('-',$request->datetarikh);
|
||||
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
|
||||
}
|
||||
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
|
||||
$tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
|
||||
$upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
|
||||
|
||||
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
|
||||
$cawangan_detail=$cawangan[0];
|
||||
// dd($gadai);
|
||||
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
|
||||
|
||||
=======
|
||||
// dd($request);
|
||||
$api_url = config('api.url');
|
||||
$auth_user = Auth::user();
|
||||
@@ -1660,7 +1626,6 @@ class KhazanahController extends Controller
|
||||
$cawangan_detail=$cawangan[0];
|
||||
// dd($gadai);
|
||||
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','ansuran','api_url','upahlama'));
|
||||
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
|
||||
}
|
||||
|
||||
public function laporanLelongan(){
|
||||
@@ -1854,22 +1819,6 @@ class KhazanahController extends Controller
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public function laporanStokAudit(){
|
||||
$auth_user = Auth::user();
|
||||
$api_url = config('api.url');
|
||||
@@ -2051,15 +2000,6 @@ class KhazanahController extends Controller
|
||||
return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
|
||||
}
|
||||
|
||||
public function laporanRingkasanTerkumpul(){
|
||||
$auth_user = Auth::user();
|
||||
$api_url = config('api.url');
|
||||
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
|
||||
return view('khazanah.laporan.ringkasanterkumpul',compact('cawangan_info','api_url'));
|
||||
}
|
||||
|
||||
public function cetakLaporanRingkasanHarian(Request $request){
|
||||
|
||||
$api_url = config('api.url');
|
||||
@@ -2643,12 +2583,8 @@ class KhazanahController extends Controller
|
||||
$upahsimpanxtra = $xtra['upahsimpan'];
|
||||
$bakilelongxtra = $xtra['bakilelong'];
|
||||
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
|
||||
<<<<<<< HEAD
|
||||
$rugilelongxtra = -($xtra['kerugianlelong']);
|
||||
=======
|
||||
$rugilelongxtra = -($xtra['kerugianlelong']);
|
||||
$peruntukanhapuskira = ($xtra['phapuskira']);
|
||||
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
|
||||
}
|
||||
|
||||
//Terkumpul
|
||||
@@ -2764,23 +2700,7 @@ class KhazanahController extends Controller
|
||||
else{
|
||||
$split_date = explode('-',$request->datetimepicker2);
|
||||
$tarikh_akhir = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
|
||||
//KIRAAN UNTUK LEJER_AM BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH
|
||||
|
||||
|
||||
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
|
||||
$cawangan_detail=$cawangan[0];
|
||||
$debit=Http::get(config('api.url').'/api/glejer/sumDebit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
|
||||
$kredit=Http::get(config('api.url').'/api/glejer/sumKredit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
|
||||
$data=Http::get(config('api.url').'/api/glejer/getdata/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
|
||||
|
||||
=======
|
||||
}
|
||||
>>>>>>> 27fa6fea0b75fd362cd3b571579fc9ce77c8d5ca
|
||||
|
||||
//Calculation Imbang Duga
|
||||
$imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
|
||||
|
||||
@@ -68,5 +68,8 @@ class Kernel extends HttpKernel
|
||||
'penilai' => 'App\Http\Middleware\Penilai',
|
||||
'khazanah' => 'App\Http\Middleware\Khazanah',
|
||||
'operasi' => 'App\Http\Middleware\Operasi',
|
||||
'admin' => 'App\Http\Middleware\Admin',
|
||||
'audit' => 'App\Http\Middleware\Audit',
|
||||
'masteradmin' => 'App\Http\Middleware\Masteradmin',
|
||||
];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Closure;
|
||||
|
||||
class Admin
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if(Auth::check() && Auth::user()->roles == 'admin'){
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
return redirect('/login');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Closure;
|
||||
|
||||
class Audit
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if(Auth::check() && Auth::user()->roles == 'audit'){
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
return redirect('/login');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Closure;
|
||||
|
||||
class Masteradmin
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if(Auth::check() && Auth::user()->roles == 'masteradmin'){
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
return redirect('/login');
|
||||
}
|
||||
}
|
||||
@@ -236,4 +236,6 @@ return [
|
||||
'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class,
|
||||
],
|
||||
|
||||
'reset_password' => env('RESET_PASSWORD', 'qwerty@12345'),
|
||||
|
||||
];
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'default' => env('LOG_CHANNEL', 'stack'),
|
||||
'default' => env('LOG_CHANNEL', 'daily'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
<a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
|
||||
<a href="{{ route('admin.daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<div class="col-2 justify-content-start">
|
||||
</div>
|
||||
<div class="col-8 justify-content-center">
|
||||
<form action="{{ route('barcode.scanned') }}" onsubmit="return checkserah(this)" method="post">
|
||||
<form action="{{ route('barcode.scanned') }}" method="post">
|
||||
@csrf
|
||||
<label>Scan Barcode Kemasukan Marhun Ke Peti Besi</label>
|
||||
<input type="text" class="form-control col-4 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"/>
|
||||
@@ -239,34 +239,34 @@
|
||||
|
||||
})
|
||||
|
||||
function checkserah(func){
|
||||
event.preventDefault();
|
||||
var norujukan = $('#norujukan_barcode').val();
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/check/serah/gadai',
|
||||
datatype:'json',
|
||||
data:{
|
||||
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
|
||||
'norujukan': norujukan
|
||||
},
|
||||
success:function(data){
|
||||
console.log(data);
|
||||
if(data == 'true'){
|
||||
Swal.fire({
|
||||
icon: 'error',
|
||||
title: 'Amaran',
|
||||
text: 'Gadaian Sudah Scan'
|
||||
});
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}else if(data == 'false'){
|
||||
$(func).attr("onSubmit","return true;");
|
||||
$(func).submit();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
// function checkserah(func){
|
||||
// event.preventDefault();
|
||||
// var norujukan = $('#norujukan_barcode').val();
|
||||
// $.ajax({
|
||||
// method:'get',
|
||||
// url: api_url + '/api/check/serah/gadai',
|
||||
// datatype:'json',
|
||||
// data:{
|
||||
// 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
|
||||
// 'norujukan': norujukan
|
||||
// },
|
||||
// success:function(data){
|
||||
// console.log(data);
|
||||
// if(data == 'true'){
|
||||
// Swal.fire({
|
||||
// icon: 'error',
|
||||
// title: 'Amaran',
|
||||
// text: 'Gadaian Sudah Scan'
|
||||
// });
|
||||
// event.preventDefault();
|
||||
// return false;
|
||||
// }else if(data == 'false'){
|
||||
// $(func).attr("onSubmit","return true;");
|
||||
// $(func).submit();
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<div class="col-2 justify-content-start">
|
||||
</div>
|
||||
<div class="col-8 justify-content-center">
|
||||
<form action="{{ route('barcodetebus.scanned') }}" onsubmit="return checkserah(this)" method="post">
|
||||
<form action="{{ route('barcodetebus.scanned') }}" method="post">
|
||||
@csrf
|
||||
<label>Scan Barcode Keluar Marhun Dari Peti Besi </label>
|
||||
<input type="text" class="form-control col-6 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG"/>
|
||||
@@ -205,35 +205,35 @@ var api_url = "<?php echo $api_url ?>";
|
||||
});
|
||||
});
|
||||
|
||||
function checkserah(func){
|
||||
event.preventDefault();
|
||||
var norujukan = $('#norujukan_barcode').val();
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/check/serah/tebus',
|
||||
datatype:'json',
|
||||
data:{
|
||||
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
|
||||
'norujukan': norujukan
|
||||
},
|
||||
success:function(data){
|
||||
console.log(data);
|
||||
if(data == 'true'){
|
||||
Swal.fire({
|
||||
icon: 'error',
|
||||
title: 'Amaran',
|
||||
text: 'Penebusan Sudah Scan'
|
||||
});
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}else if(data == 'false'){
|
||||
$(func).attr("onSubmit","return true;");
|
||||
$(func).submit();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
// function checkserah(func){
|
||||
// event.preventDefault();
|
||||
// var norujukan = $('#norujukan_barcode').val();
|
||||
// $.ajax({
|
||||
// method:'get',
|
||||
// url: api_url + '/api/check/serah/tebus',
|
||||
// datatype:'json',
|
||||
// data:{
|
||||
// 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
|
||||
// 'norujukan': norujukan
|
||||
// },
|
||||
// success:function(data){
|
||||
// console.log(data);
|
||||
// if(data == 'true'){
|
||||
// Swal.fire({
|
||||
// icon: 'error',
|
||||
// title: 'Amaran',
|
||||
// text: 'Penebusan Sudah Scan'
|
||||
// });
|
||||
// event.preventDefault();
|
||||
// return false;
|
||||
// }else if(data == 'false'){
|
||||
// $(func).attr("onSubmit","return true;");
|
||||
// $(func).submit();
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -14,7 +14,11 @@
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<form action="{{ route('kakitangan.baru') }}" method="post" onsubmit="return verifyregister()">
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<form action="{{ route('admin.kakitangan.baru') }}" method="post" onsubmit="return verifyregister()">
|
||||
@endif
|
||||
@csrf
|
||||
<div class='row form-group'>
|
||||
<div class='col-md-6'>
|
||||
@@ -113,6 +117,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($kakitangan as $index=>$staff)
|
||||
@if($staff->roles != 'admin')
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $staff->name }}</td>
|
||||
@@ -128,10 +133,23 @@
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<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>
|
||||
@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>
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<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>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -146,6 +164,24 @@
|
||||
|
||||
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!",
|
||||
type: 'warning',
|
||||
showCancelButton: true,
|
||||
confirmButtonClass: 'btn btn-danger',
|
||||
cancelButtonClass: 'btn btn-warning',
|
||||
confirmButtonText: 'Yes, delete it!',
|
||||
buttonsStyling: false
|
||||
}
|
||||
).then(function() {
|
||||
form.submit();
|
||||
}).catch(swal.noop)
|
||||
});
|
||||
|
||||
function verifyregister(){
|
||||
var cawangan = $('#cawangan').val();
|
||||
var role = $('#role').val();
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
@extends('layouts.app_operasi')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
|
||||
<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 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">
|
||||
@csrf
|
||||
<input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
|
||||
<div class='row form-group'>
|
||||
<div class='col-md-6'>
|
||||
<div class='form-group row col-md-12'>
|
||||
<div class='col-md-5'>
|
||||
<b>Nama</b>
|
||||
</div>
|
||||
<div class='col-md-7'>
|
||||
<input type="text" name='nama' id='nama' value="{{ $user->name }}" class='form-control'>
|
||||
</div>
|
||||
</div>
|
||||
<div class='form-group row col-md-12'>
|
||||
<div class='col-md-5'>
|
||||
<b>Email</b>
|
||||
</div>
|
||||
<div class='col-md-7'>
|
||||
<input type="text" name='email' id='email' value="{{ $user->email }}" class='form-control'>
|
||||
</div>
|
||||
</div>
|
||||
<div class='form-group row col-md-12'>
|
||||
<div class='col-md-5'>
|
||||
<b>Baki Perubatan</b>
|
||||
</div>
|
||||
<div class='col-md-7'>
|
||||
<input type="text" name='perubatan' id='perubatan' value="{{ number_format($user->perubatan,2) }}" class='form-control'>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='col-md-6'>
|
||||
<div class='form-group row col-md-12'>
|
||||
<div class='col-md-5'>
|
||||
<b>No KP</b>
|
||||
</div>
|
||||
<div class='col-md-7'>
|
||||
<input type="text" name='nokp' id='nokp' value="{{ $user->no_kp }}" class='form-control'>
|
||||
</div>
|
||||
</div>
|
||||
<div class='form-group row col-md-12'>
|
||||
<div class='col-md-5'>
|
||||
<b>No Telefon</b>
|
||||
</div>
|
||||
<div class='col-md-7'>
|
||||
<input type="text" name='telefon' id='telefon' value="{{ $user->no_telefon }}" class='form-control'>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='row justify-content-end'>
|
||||
<div class='col-md-12'>
|
||||
<input type="submit" class='btn btn-info float-right mr-5' value='Update'>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -8,14 +8,22 @@
|
||||
|
||||
<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('daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('admin.daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
@endif
|
||||
<li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<form action="{{ route('kakitangan.tukarcawangan.update') }}" method="post">
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<form action="{{ route('admin.kakitangan.tukarcawangan.update') }}" method="post">
|
||||
@endif
|
||||
@csrf
|
||||
<input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
|
||||
<div class='row form-group'>
|
||||
|
||||
@@ -8,14 +8,22 @@
|
||||
|
||||
<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('daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<li class="breadcrumb-item" aria-current="page"><a href="{{ route('admin.daftar.kakitangan') }}">Kakitangan</a></li>
|
||||
@endif
|
||||
<li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
@if($auth_user->roles == 'operasi')
|
||||
<form action="{{ route('kakitangan.tukartaraf.update') }}" method="post">
|
||||
@elseif($auth_user->roles == 'admin')
|
||||
<form action="{{ route('admin.kakitangan.tukartaraf.update') }}" method="post">
|
||||
@endif
|
||||
@csrf
|
||||
<input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
|
||||
<div class='row form-group'>
|
||||
|
||||
+16
-2
@@ -232,12 +232,12 @@ Route::get('/operasi/kelulusan','OperasiController@kelulusan')->name('operasi.ke
|
||||
Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=>'OperasiController@createkelulusan'])->middleware('auth','teller');
|
||||
Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller');
|
||||
Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');
|
||||
Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi');
|
||||
Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','operasi');
|
||||
Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter')->middleware('auth','operasi');
|
||||
Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
|
||||
Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
|
||||
Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');
|
||||
Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi');
|
||||
Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','operasi');
|
||||
Route::get('kakitangan/tukar_taraf',['as'=>'kakitangan.tukartaraf','uses'=>'KakitanganController@tukartaraf'])->middleware('auth','operasi');
|
||||
Route::post('kakitangan/tukar_taraf/update',['as'=>'kakitangan.tukartaraf.update','uses'=>'KakitanganController@tukartarafUpdate'])->middleware('auth','operasi');
|
||||
Route::get('kakitangan/tukar_cawangan',['as'=>'kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','operasi');
|
||||
@@ -264,3 +264,17 @@ route::post('/cetaklejer_am',['as'=>'cetak.lejer_am', 'uses'=>'KhazanahControlle
|
||||
|
||||
Route::get('laporan/dataimbangduga',['as'=> 'laporan.imbangduga' , 'uses'=>'KhazanahController@laporanImbangduga' ])->middleware('auth','khazanah');
|
||||
Route::post('/laporan/imbangduga',['as' =>'imbangduga.cetak', 'uses'=>'KhazanahController@cetakImbangDuga'])->middleware('auth', 'khazanah');
|
||||
|
||||
|
||||
//ADMIN
|
||||
|
||||
Route::get('admin/daftar/kakitangan',['as'=>'admin.daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','admin');
|
||||
Route::post('admin/daftar/kakitangan/baru',['as'=>'admin.kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','admin');
|
||||
Route::get('admin/kakitangan/tukar_taraf',['as'=>'admin.kakitangan.tukartaraf','uses'=>'KakitanganController@tukartaraf'])->middleware('auth','admin');
|
||||
Route::post('admin/kakitangan/tukar_taraf/update',['as'=>'admin.kakitangan.tukartaraf.update','uses'=>'KakitanganController@tukartarafUpdate'])->middleware('auth','admin');
|
||||
Route::get('admin/kakitangan/tukar_cawangan',['as'=>'admin.kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','admin');
|
||||
Route::post('admin/kakitangan/tukar_cawangan/update',['as'=>'admin.kakitangan.tukarcawangan.update','uses'=>'KakitanganController@tukarcawanganUpdate'])->middleware('auth','admin');
|
||||
Route::post('admin/kakitangan/delete',['as'=>'admin.kakitangan.delete','uses'=>'KakitanganController@deleteKakitangan'])->middleware('auth','admin');
|
||||
Route::get('admin/kakitangan/edit',['as'=>'admin.kakitangan.edit','uses'=>'KakitanganController@editKakitangan'])->middleware('auth','admin');
|
||||
Route::post('admin/kakitangan/edit/store',['as'=>'admin.kakitangan.edit.store','uses'=>'KakitanganController@editStoreKakitangan'])->middleware('auth','admin');
|
||||
Route::get('admin/kakitangan/resetcredentials',['as'=>'admin.kakitangan.resetcredentials','uses'=>'KakitanganController@resetCredentials'])->middleware('auth','admin');
|
||||
|
||||
Reference in New Issue
Block a user