Merge branch 'new-master' of https://gitlab.com/online-sistem1/kaunter into pipiv2
This commit is contained in:
@@ -52,13 +52,13 @@ class KhazanahController extends Controller
|
||||
$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();
|
||||
$customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
|
||||
$customer_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
|
||||
|
||||
if($customers_info){
|
||||
$customer_info = $customers_info[0];
|
||||
}else{
|
||||
$customer_info = $customers_info;
|
||||
}
|
||||
// if($customers_info){
|
||||
// $customer_info = $customers_info[0];
|
||||
// }else{
|
||||
// $customer_info = $customers_info;
|
||||
// }
|
||||
$request->session()->forget('page_reload');
|
||||
$request->session()->forget('norujukan');
|
||||
|
||||
@@ -76,12 +76,12 @@ class KhazanahController extends Controller
|
||||
$auth_user = Auth::user();
|
||||
$api_url = config('api.url');
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
$customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
|
||||
if($customers_info){
|
||||
$customer_info = $customers_info[0];
|
||||
}else{
|
||||
$customer_info = $customers_info;
|
||||
}
|
||||
$customer_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
|
||||
// if($customers_info){
|
||||
// $customer_info = $customers_info[0];
|
||||
// }else{
|
||||
// $customer_info = $customers_info;
|
||||
// }
|
||||
|
||||
$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();
|
||||
|
||||
Reference in New Issue
Block a user