user-management UI fixed
This commit is contained in:
parent
57167e64d7
commit
598b2238ca
|
|
@ -88,20 +88,30 @@ class CardMemberController extends Controller
|
|||
}
|
||||
|
||||
public function lockedAccounts(Request $request)
|
||||
{
|
||||
{
|
||||
try {
|
||||
// Force a log to confirm the method is reached
|
||||
Log::debug('Entering lockedAccounts method', ['request' => $request->all()]);
|
||||
|
||||
$user = Session::get('user');
|
||||
$accessToken = $user['access_token'] ?? null;
|
||||
|
||||
if (!$accessToken) {
|
||||
Log::info('No access token found, redirecting to login from locked-account');
|
||||
Log::warning('No access token found, redirecting to login from locked-account');
|
||||
return redirect()->route('login')->with('error', 'Please log in to view locked accounts.');
|
||||
}
|
||||
|
||||
Log::debug('Access token found', ['access_token' => $accessToken]);
|
||||
|
||||
$page = $request->input('page', 1);
|
||||
$pageSize = 5; // Fixed at 5 per page as per sample
|
||||
$pageSize = 5;
|
||||
$search = $request->input('_search', null);
|
||||
|
||||
Log::debug('Making API call to fetch locked accounts', [
|
||||
'url' => "{$this->apiBaseUrl}/cms/member",
|
||||
'params' => ['page' => $page, 'page_size' => $pageSize, '_search' => $search, '_locked' => 1],
|
||||
]);
|
||||
|
||||
$response = Http::withHeaders([
|
||||
'Accept' => 'application/json',
|
||||
'Authorization' => 'Bearer ' . $accessToken,
|
||||
|
|
@ -109,21 +119,25 @@ class CardMemberController extends Controller
|
|||
'page' => $page,
|
||||
'page_size' => $pageSize,
|
||||
'_search' => $search,
|
||||
'_locked' => 1, // Fetch only locked accounts
|
||||
'_locked' => 1,
|
||||
]);
|
||||
|
||||
Log::debug('API response received', [
|
||||
'status' => $response->status(),
|
||||
'body' => $response->body(),
|
||||
]);
|
||||
|
||||
if ($response->status() === 401 || $response->status() === 403) {
|
||||
Log::warning('Unauthorized or Forbidden API response: ', $response->json());
|
||||
Log::warning('Unauthorized or Forbidden API response', ['response' => $response->json()]);
|
||||
return redirect()->route('login')->with('error', 'Your session has expired. Please log in again.');
|
||||
}
|
||||
|
||||
$json = $response->json();
|
||||
|
||||
Log::info("Locked Account API Response (Page {$page}): ", $json);
|
||||
Log::info('Locked Account API Raw Response', ['response' => $json]);
|
||||
|
||||
if ($response->successful() && isset($json['data']) && is_array($json['data'])) {
|
||||
$members = array_map(function ($member) {
|
||||
Log::info('Processing locked account record: ', $member);
|
||||
Log::info('Processing locked account record', ['member' => $member]);
|
||||
return [
|
||||
'id' => $member['lcard_uuid'] ?? null,
|
||||
'cardNumber' => $member['card_number'] ?? '',
|
||||
|
|
@ -132,19 +146,26 @@ class CardMemberController extends Controller
|
|||
'birthday' => $member['birthdate'] ?? '',
|
||||
'cardType' => $member['card_type'] ?? '',
|
||||
'status' => $member['status'] ? 'Active' : 'Inactive',
|
||||
'is_locked' => $member['is_locked'] ?? 0, // Add is_locked field
|
||||
'is_locked' => $member['is_locked'] ?? 0,
|
||||
];
|
||||
}, $json['data']);
|
||||
|
||||
$total = $json['meta']['total'] ?? count($members);
|
||||
$lastPage = $json['meta']['last_page'] ?? ceil($total / $pageSize);
|
||||
} else {
|
||||
Log::warning('No locked account data found or invalid API response: ', $json);
|
||||
Log::warning('No locked account data found or invalid API response', ['response' => $json]);
|
||||
$members = [];
|
||||
$total = 0;
|
||||
$lastPage = 1;
|
||||
}
|
||||
|
||||
Log::debug('Rendering view with data', [
|
||||
'members' => $members,
|
||||
'currentPage' => $page,
|
||||
'lastPage' => $lastPage,
|
||||
'total' => $total,
|
||||
]);
|
||||
|
||||
return view('pages.member management.locked-account', [
|
||||
'members' => $members,
|
||||
'currentPage' => $page,
|
||||
|
|
@ -153,7 +174,10 @@ class CardMemberController extends Controller
|
|||
'search' => $search,
|
||||
]);
|
||||
} catch (\Exception $e) {
|
||||
Log::error('Error fetching locked account data: ' . $e->getMessage());
|
||||
Log::error('Error in lockedAccounts method', [
|
||||
'message' => $e->getMessage(),
|
||||
'trace' => $e->getTraceAsString(),
|
||||
]);
|
||||
return view('pages.member management.locked-account', [
|
||||
'members' => [],
|
||||
'currentPage' => 1,
|
||||
|
|
@ -162,7 +186,7 @@ class CardMemberController extends Controller
|
|||
'search' => $search,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function show($uuid)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
@section('content')
|
||||
<div class="container-fluid py-4">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header border-0 bg-transparent">
|
||||
<h5 class="mb-0">Add New User</h5>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
@section('content')
|
||||
<div class="container-fluid py-4">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header border-0 bg-transparent">
|
||||
<h5 class="mb-0">Edit User</h5>
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
```blade
|
||||
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid py-4">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header border-0 bg-transparent">
|
||||
<h5 class="mb-0">View User Details</h5>
|
||||
|
|
@ -46,8 +46,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
```
|
||||
Loading…
Reference in New Issue