From 4c76a6c845c5f60971c68c9625e6b120a0645f7f Mon Sep 17 00:00:00 2001 From: afiq Date: Mon, 9 Aug 2021 12:09:28 +0800 Subject: [PATCH] fix admin customer --- app/Http/Controllers/KhazanahController.php | 46 +++++++++++++++++++ .../views/admin/customer_index.blade.php | 28 +---------- routes/web.php | 4 +- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c7e2df5..664ac3b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -84,6 +84,52 @@ class KhazanahController extends Controller } } + public function searchAdmin(Request $request){ + $noic = $request->noic; + $idtype = $request->customerIDType; + Session::put('noic', $noic); + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $bank = Http::get(config('api.url') . '/api/bank')->json(); + $customer_info = Http::get(config('api.url') . '/api/admin/customers/nokp/search',[ + 'ic' => $noic + ])->json(); + + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + $search = true; + + if($customer_info){ + Session::put('customer_info_khazanah',$customer_info); + return redirect()->route('admin.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + }else{ + return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype')); + } + } + + public function infoAdmin(Request $request){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $customer_info = Http::get(config('api.url') . '/api/admin/customers/nokp/search',[ + 'ic' => Session::get('noic') + ])->json(); + + $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json(); + $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json(); + + $negeri = Http::get(config('api.url') . '/api/negeri/')->json(); + + + + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + return view('admin.customer_info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','negeri')); + } + public function info(Request $request){ $auth_user = Auth::user(); $api_url = config('api.url'); diff --git a/resources/views/admin/customer_index.blade.php b/resources/views/admin/customer_index.blade.php index 8e3c1ca..f413087 100644 --- a/resources/views/admin/customer_index.blade.php +++ b/resources/views/admin/customer_index.blade.php @@ -827,33 +827,7 @@ return false; } }else if(id_type=='passport'){ - if(nokp.length < 5){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Periksa Passport Pelanggan' - }); - event.preventDefault(); - return false; - } - if(nokp.indexOf(' ') > 0){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)' - }); - event.preventDefault(); - return false; - } - if(regex.test(nokp) == false){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Periksa Passport Pelanggan' - }); - event.preventDefault(); - return false; - } + } } diff --git a/routes/web.php b/routes/web.php index 7a192a6..34cb0d3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -279,6 +279,6 @@ Route::get('admin/kakitangan/edit',['as'=>'admin.kakitangan.edit','uses'=>'Kakit 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'); Route::get('admin/pelanggan',['as'=>'admin.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','admin'); -Route::get('admin/customer_info',['as'=>'admin.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','admin'); -Route::get('admin/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','admin'); +Route::get('admin/customer_info',['as'=>'admin.customer_info','uses'=>'KhazanahController@infoAdmin'])->middleware('auth','admin'); +Route::get('admin/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@searchAdmin'])->middleware('auth','admin'); Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']); \ No newline at end of file