antv/thankcard-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: render card purchase history and fix validation in admin edit user form

Browse Source
This commit is contained in:
antv
2026-07-09 09:44:16 +07:00
parent badc453389
commit 3a33c86346
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/AdminController.php
+24 -6
View File
@@ -97,15 +97,33 @@ class AdminController extends Controller
public function update(Request $request, $msnv) public function update(Request $request, $msnv)
{ {
$user = User::where('msnv', $msnv)->firstOrFail();
$request->validate([ $request->validate([
'card' => 'required|integer|min:0', 'card' => 'nullable|integer|min:0',
'role' => 'required|in:' . config('constants.ROLE_MEMBER') . ',' . config('constants.ROLE_ADMIN'), 'num_card' => 'nullable|integer|min:1',
'status' => 'required|in:' . config('constants.STATUS_INACTIVE') . ',' . config('constants.STATUS_ACTIVE'), 'role' => 'nullable|in:' . config('constants.ROLE_MEMBER') . ',' . config('constants.ROLE_ADMIN'),
'flag_send' => 'required|in:' . config('constants.FLAG_SEND_DISABLED') . ',' . config('constants.FLAG_SEND_ENABLED'), 'status' => 'nullable|in:' . config('constants.STATUS_INACTIVE') . ',' . config('constants.STATUS_ACTIVE'),
'first_login' => 'required|in:' . config('constants.FIRST_LOGIN_FALSE') . ',' . config('constants.FIRST_LOGIN_TRUE'), 'flag_send' => 'nullable|in:0,1',
'first_login' => 'nullable|in:' . config('constants.FIRST_LOGIN_FALSE') . ',' . config('constants.FIRST_LOGIN_TRUE'),
]); ]);
$this->adminService->updateUser($msnv, $request->only('card', 'role', 'status', 'flag_send', 'first_login')); $cardValue = $user->card;
if ($request->has('num_card') && !is_null($request->num_card)) {
$cardValue = $user->card + intval($request->num_card);
} elseif ($request->has('card')) {
$cardValue = intval($request->card);
}
$data = [
'card' => $cardValue,
'role' => $request->input('role', $user->role),
'status' => $request->input('status', $user->status),
'flag_send' => $request->has('flag_send') ? config('constants.FLAG_SEND_ENABLED') : config('constants.FLAG_SEND_DISABLED'),
'first_login' => $request->input('first_login', $user->first_login),
];
$this->adminService->updateUser($msnv, $data);
return redirect()->back()->with('success', __('messages.user_update_success')); return redirect()->back()->with('success', __('messages.user_update_success'));
} }
resources/views/admin/users/edit.blade.php
+1 -1
View File
@@ -13,5 +13,5 @@
</div> </div>
</div> </div>
<x-user-page mode="edit" :user="$user" :administrations="$administrations" :selectedMonth="$selectedMonth" /> <x-user-page mode="edit" :user="$user" :administrations="$administrations" :selectedMonth="$selectedMonth" :addCards="$addCards" :admins="$admins" />
@endsection @endsection