diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 2a36898..5f081f2 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -59,8 +59,21 @@ class LoginController extends Controller
if (Auth::attempt($credentials)) {
$auth_user = Auth::user();
- $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
- return view('homepage.home',compact('cawangan_info'));
+ if($auth_user['roles'] == 'teller'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }elseif($auth_user['roles'] == 'penilai'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
+ elseif($auth_user['roles'] == 'khazanah'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
+ elseif($auth_user['roles'] == 'operasi'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
}
return redirect('login')->with('error', 'Oppes! You have entered invalid credentials');
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 080bfe0..ce03ad7 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -28,7 +28,20 @@ class HomeController extends Controller
public function index()
{
$auth_user = Auth::user();
- $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
- return view('homepage.home',compact('cawangan_info'));
+ if($auth_user['roles'] == 'teller'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }elseif($auth_user['roles'] == 'penilai'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
+ elseif($auth_user['roles'] == 'khazanah'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
+ elseif($auth_user['roles'] == 'operasi'){
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+ }
}
}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 5f6bd3d..9ddd1ea 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -64,5 +64,9 @@ class Kernel extends HttpKernel
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+ 'teller' => 'App\Http\Middleware\Teller',
+ 'penilai' => 'App\Http\Middleware\Penilai',
+ 'khazanah' => 'App\Http\Middleware\Khazanah',
+ 'operasi' => 'App\Http\Middleware\Operasi',
];
}
diff --git a/app/Http/Middleware/Khazanah.php b/app/Http/Middleware/Khazanah.php
new file mode 100644
index 0000000..5e8e0d1
--- /dev/null
+++ b/app/Http/Middleware/Khazanah.php
@@ -0,0 +1,24 @@
+roles == 'khazanah'){
+ return $next($request);
+ }
+
+ return redirect('/login');
+ }
+}
diff --git a/app/Http/Middleware/Operasi.php b/app/Http/Middleware/Operasi.php
new file mode 100644
index 0000000..4297bf3
--- /dev/null
+++ b/app/Http/Middleware/Operasi.php
@@ -0,0 +1,24 @@
+roles == 'operasi'){
+ return $next($request);
+ }
+
+ return redirect('/login');
+ }
+}
diff --git a/app/Http/Middleware/Penilai.php b/app/Http/Middleware/Penilai.php
new file mode 100644
index 0000000..f432ebb
--- /dev/null
+++ b/app/Http/Middleware/Penilai.php
@@ -0,0 +1,24 @@
+roles == 'penilai'){
+ return $next($request);
+ }
+
+ return redirect('/login');;
+ }
+}
diff --git a/app/Http/Middleware/Teller.php b/app/Http/Middleware/Teller.php
new file mode 100644
index 0000000..710785d
--- /dev/null
+++ b/app/Http/Middleware/Teller.php
@@ -0,0 +1,24 @@
+roles == 'teller'){
+ return $next($request);
+ }
+
+ return redirect('/login');
+ }
+}
diff --git a/config/app.php b/config/app.php
index 0a2e7da..6a26eb4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -67,7 +67,7 @@ return [
|
*/
- 'timezone' => 'UTC',
+ 'timezone' => 'Asia/Kuala_Lumpur',
/*
|--------------------------------------------------------------------------
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 43075e6..7c24c58 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -122,7 +122,7 @@
gadai_detail['t_gadai'],
'RM '+formatter.format(gadai_detail['pinjaman']),
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
- '0',
+ gadai_detail['jbg'],
'RM '+ formatter.format((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']),
gadai_detail['t_matang'],
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 942d52a..8f2faa8 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -11,7 +11,6 @@
-
Nama
@@ -247,7 +246,7 @@
$.ajax({
method:'GET',
- url:'http://localhost:8000/api/jemas/'+ $('#kodcaw').val(),
+ url:'http://localhost:8000/api/jemas',
success:function(data){
$.each(data,function(index,jemas){
$("#marhun").append(new Option(jemas['descpt'], jemas['marhun']));
@@ -362,10 +361,10 @@
success:function(data){
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
- pinjaman_teller = pinjaman['max'];
+ pinjaman_teller = Number(pinjaman['max']);
}
if(pinjaman['user_type'] == 'ppc'){
- pinjaman_pelulus = pinjaman['max'];
+ pinjaman_pelulus = Number(pinjaman['max']);
}
});
$('.span-pinjaman-max-pelulus').text(pinjaman_pelulus + ' %');
@@ -375,10 +374,8 @@
var max_teller = total_nilai_marhun * (pinjaman_teller/100);
var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
-
-
- $('#pinjaman_max_teller').val(formatter.format(max_teller.toFixed(2)));
- $('#pinjaman_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
+ $('#pinjaman_max_teller').val(max_teller.toFixed(2));
+ $('#pinjaman_max_pelulus').val(max_pelulus.toFixed(2));
}
$('#pinjaman').change(function(){
@@ -395,7 +392,7 @@
var upah_sebulan = pinjaman * kadarupah;
var upah_6bln = upah_sebulan * 6;
- percent_pinjaman = Number(pinjaman)/Number(total_nilai_marhun);
+ percent_pinjaman = (Number(pinjaman)/Number(total_nilai_marhun))*100;
$('.span-pinjaman').text(percent_pinjaman.toFixed(2) + ' %');
$('#upah_sebulan').val(formatter.format(upah_sebulan.toFixed(2)));
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
new file mode 100644
index 0000000..175c52e
--- /dev/null
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+
+@endsection
diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php
new file mode 100644
index 0000000..f3c0289
--- /dev/null
+++ b/resources/views/homepage/operasi/home.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+
+@endsection
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
new file mode 100644
index 0000000..3a57be1
--- /dev/null
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+
+@endsection
diff --git a/resources/views/homepage/home.blade.php b/resources/views/homepage/teller/home.blade.php
similarity index 100%
rename from resources/views/homepage/home.blade.php
rename to resources/views/homepage/teller/home.blade.php
diff --git a/routes/web.php b/routes/web.php
index df0ceae..0323066 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,9 +17,6 @@ Route::get('/',['as'=>'login','uses'=>'HomeController@index']);
// Auth::routes();
-Route::middleware(['auth:juruwang,penilai,khazanah,PPC'])->group(function(){
-});
-
Route::post('logout', ['as' => 'logout', 'uses' => 'Auth\LoginController@logout']);
// Route::get('register', 'Auth\RegisterController@register');
@@ -30,14 +27,14 @@ Route::post('login', 'Auth\LoginController@authenticate');
Route::get('/', 'HomeController@index')->name('home');
Route::get('/home', 'HomeController@index')->name('home');
-Route::get('/pelanggan','CustomersController@index');
-Route::get('/customer_info',['as'=>'customer_info','uses'=>'CustomersController@info']);
-Route::get('/gadaian',['as'=>'gadaian','uses'=>'GadaianController@index']);
-Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@index']);
-Route::get('/penebusan','PenebusanController@index');
-Route::get('/aliran_tunai','AliranTunaiController@index');
-Route::get('/harga_emas','HargaEmasController@index');
-Route::get('/profile',['as'=>'profile','uses'=>'UserController@index']);
-Route::get('{user_type}/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search']);
-Route::post('{user_type}/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store']);
+Route::get('/pelanggan','CustomersController@index')->middleware('auth','teller');
+Route::get('/customer_info',['as'=>'customer_info','uses'=>'CustomersController@info'])->middleware('auth','teller');
+Route::get('/gadaian',['as'=>'gadaian','uses'=>'GadaianController@index'])->middleware('auth','teller');
+Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@index'])->middleware('auth','teller');
+Route::get('/penebusan','PenebusanController@index')->middleware('auth','teller');
+Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
+Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
+Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth','teller');
+Route::get('{user_type}/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
+Route::post('{user_type}/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
Route::get('/test',['as'=>'test','uses'=>'CustomersController@test']);
\ No newline at end of file