so-manager/so-manager-dev.com
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main_higashide #3

Merged
go.unhi merged 10 commits from main_higashide into main 2025-09-02 10:31:06 +09:00
Conversation 0 Commits 10 Files Changed 60 +11 -8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 000c8f5693 - Show all commits

3
app/Http/Controllers/UserEditController.php
View File

@ -330,7 +330,8 @@ class UserEditController extends Controller
'user_birthdate', 'user_birthdate',
'user_workplace', 'user_workplace',
'user_school', 'user_school',
'user_graduate' 'user_graduate',
'ward_residents'
]; ];
if (!$is_update_period) { if (!$is_update_period) {

16
app/Http/Controllers/UserInfoController.php
View File

@ -15,14 +15,16 @@ class UserInfoController extends Controller
} }
$user = DB::table('user')->where('user_id', $user_id)->first(); $user = DB::table('user')->where('user_id', $user_id)->first();
// 利用者区分の表示変換 // 利用者区分の表示変換（取得できなければ空欄）
$ward_residents_label = ''; $ward_residents_label = '';
if ($user->ward_residents == 0) { if (isset($user->ward_residents)) {
$ward_residents_label = '一般'; if ($user->ward_residents == 0) {
} elseif ($user->ward_residents == 1) { $ward_residents_label = '一般';
$ward_residents_label = '学生'; } elseif ($user->ward_residents == 1) {
} elseif ($user->ward_residents == 2) { $ward_residents_label = '学生';
$ward_residents_label = '減免'; } elseif ($user->ward_residents == 2) {
$ward_residents_label = '減免';
}
} }
return view('user.info', [ return view('user.info', [