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

定期契約有無の判定を修正
All checks were successful
Deploy preview (main_higashide) / deploy (push) Successful in 11s
Details

Browse Source
This commit is contained in:
Yuka Higashide 2025-09-01 17:07:55 +09:00
parent 84b13a70da
commit b3d48f8608
4 changed files with 119 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,46 +75,35 @@ class UserEditController extends Controller
$today_time = date('H:i'); $today_time = date('H:i');
$in_grace = false; $in_grace = false;
// 契約月の猶予期間判定 // 契約終了月のみ猶予期間判定
if ($end_day < $start_day) { if ((int)$today_year === (int)$contract_year) {
// 例：20～翌月5日 // 開始日 < 終了日：契約終了月の開始日～終了日
if ((int)$today_day > $start_day && (int)$today_month == (int)$contract_month) { if ($start_day < $end_day && (int)$today_month === (int)$contract_month) {
$start_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $start_day) . ' ' . $start_time; $start_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$end_datetime = date('Y-m-t', strtotime($contract_periode)) . ' 23:59'; $end_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) { if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }
} else { // 開始日 > 終了日：契約終了月の開始日～翌月の終了日
// 通常：開始日～終了日（時間含む） if ($start_day > $end_day && (int)$today_month === (int)$contract_month) {
if ((int)$today_day >= $start_day && (int)$today_day <= $end_day && (int)$today_month == (int)$contract_month) { $start_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$start_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $start_day) . ' ' . $start_time; $end_year = date('Y', strtotime($contract_periode . ' +1 month'));
$end_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $end_day) . ' ' . $end_time; $end_month = date('m', strtotime($contract_periode . ' +1 month'));
$end_datetime = $end_year . '-' . $end_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) { if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }
} // 開始日 > 終了日：契約終了月の翌月の終了日（翌月分）
if ($start_day > $end_day && (int)$today_month === (int)date('m', strtotime($contract_periode . ' +1 month'))) {
// 契約月の翌月の猶予期間判定（追加） $end_year = date('Y', strtotime($contract_periode . ' +1 month'));
$next_month = date('m', strtotime($contract_periode . ' +1 month')); $end_month = date('m', strtotime($contract_periode . ' +1 month'));
$next_year = date('Y', strtotime($contract_periode . ' +1 month')); $end_datetime = $end_year . '-' . $end_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if ((int)$today_month == (int)$next_month && (int)$today_year == (int)$next_year) {
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if ($end_day < $start_day) { if (strtotime($today_datetime) <= strtotime($end_datetime)) {
// 例：20～翌月5日（翌月分）
$start_datetime = $next_year . '-' . $next_month . '-01 00:00';
$end_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true;
}
} else {
// 通常：開始日～終了日（翌月分）
$start_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$end_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }
@ -279,46 +268,35 @@ class UserEditController extends Controller
$today_time = date('H:i'); $today_time = date('H:i');
$in_grace = false; $in_grace = false;
// 契約月の猶予期間判定 // 契約終了月のみ猶予期間判定
if ($end_day < $start_day) { if ((int)$today_year === (int)$contract_year) {
// 例：20～翌月5日 // 開始日 < 終了日：契約終了月の開始日～終了日
if ((int)$today_day > $start_day && (int)$today_month == (int)$contract_month) { if ($start_day < $end_day && (int)$today_month === (int)$contract_month) {
$start_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $start_day) . ' ' . $start_time; $start_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$end_datetime = date('Y-m-t', strtotime($contract_periode)) . ' 23:59'; $end_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) { if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }
} else { // 開始日 > 終了日：契約終了月の開始日～翌月の終了日
// 通常：開始日～終了日（時間含む） if ($start_day > $end_day && (int)$today_month === (int)$contract_month) {
if ((int)$today_day >= $start_day && (int)$today_day <= $end_day && (int)$today_month == (int)$contract_month) { $start_datetime = $contract_year . '-' . $contract_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$start_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $start_day) . ' ' . $start_time; $end_year = date('Y', strtotime($contract_periode . ' +1 month'));
$end_datetime = date('Y-m-', strtotime($contract_periode)) . sprintf('%02d', $end_day) . ' ' . $end_time; $end_month = date('m', strtotime($contract_periode . ' +1 month'));
$end_datetime = $end_year . '-' . $end_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) { if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }
} // 開始日 > 終了日：契約終了月の翌月の終了日（翌月分）
if ($start_day > $end_day && (int)$today_month === (int)date('m', strtotime($contract_periode . ' +1 month'))) {
// 契約月の翌月の猶予期間判定（追加） $end_year = date('Y', strtotime($contract_periode . ' +1 month'));
$next_month = date('m', strtotime($contract_periode . ' +1 month')); $end_month = date('m', strtotime($contract_periode . ' +1 month'));
$next_year = date('Y', strtotime($contract_periode . ' +1 month')); $end_datetime = $end_year . '-' . $end_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if ((int)$today_month == (int)$next_month && (int)$today_year == (int)$next_year) {
$today_datetime = date('Y-m-d') . ' ' . $today_time; $today_datetime = date('Y-m-d') . ' ' . $today_time;
if ($end_day < $start_day) { if (strtotime($today_datetime) <= strtotime($end_datetime)) {
// 例：20～翌月5日（翌月分）
$start_datetime = $next_year . '-' . $next_month . '-01 00:00';
$end_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true;
}
} else {
// 通常：開始日～終了日（翌月分）
$start_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $start_day) . ' ' . $start_time;
$end_datetime = $next_year . '-' . $next_month . '-' . sprintf('%02d', $end_day) . ' ' . $end_time;
if (strtotime($today_datetime) >= strtotime($start_datetime) && strtotime($today_datetime) <= strtotime($end_datetime)) {
$in_grace = true; $in_grace = true;
} }
} }

73
resources/views/regular_contract/info.blade.php
View File

@ -32,44 +32,51 @@ return null;
$start_hm = $contract->update_grace_period_start_time; $start_hm = $contract->update_grace_period_start_time;
$end_dd = $contract->update_grace_period_end_date; $end_dd = $contract->update_grace_period_end_date;
$end_hm = $contract->update_grace_period_end_time; $end_hm = $contract->update_grace_period_end_time;
// dd→今月のdd日, HH:mm→HH:mm:00 でCarbon化 $contract_end_dt = $contract->contract_periode ? \Carbon\Carbon::parse($contract->contract_periode) : null;
$start_dt = safeCarbonFromDDHM($start_dd, $start_hm); $periode_month = $contract_end_dt ? $contract_end_dt->month : null;
// $start_dd > $end_ddなら$end_ddは次月扱い $periode_year = $contract_end_dt ? $contract_end_dt->year : null;
if (is_numeric($start_dd) && is_numeric($end_dd) && $start_dd > $end_dd) {
$next_month = $now->copy()->addMonth();
$end_date = $next_month->format('Y-m-') . str_pad($end_dd, 2, '0', STR_PAD_LEFT);
$end_time = $end_hm . ':00';
try {
$end_dt = \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $end_date . ' ' . $end_time);
} catch (Exception $e) {
$end_dt = null;
}
} else {
$end_dt = safeCarbonFromDDHM($end_dd, $end_hm);
}
$month_end = $now->copy()->endOfMonth();
$bg = 'alert-warning'; $bg = 'alert-warning';
$btn_text = '更新する'; $btn_text = '更新する';
$btn_active = true; $btn_active = true;
// 追加: contract_periodeの月より現在月が前なら一律「ご契約中」 // 契約終了月以外は「ご契約中」
$periode_month = $contract->contract_periode ? \Carbon\Carbon::parse($contract->contract_periode)->month : null; if ($periode_month && $periode_year && ($now->month != $periode_month || $now->year != $periode_year)) {
if (!empty($contract->contract_periode)) { $bg = 'bg-white';
$periode_month = \Carbon\Carbon::parse($contract->contract_periode)->month; $btn_text = 'ご契約中';
} $btn_active = false;
if ($periode_month && $now->month < $periode_month) {
$bg='bg-white' ;
$btn_text='ご契約中' ;
$btn_active=false;
} else { } else {
// 猶予期間のCarbon生成
if (is_numeric($start_dd) && is_numeric($end_dd)) {
// 開始日
$start_date = $contract_end_dt->format('Y-m-') . str_pad($start_dd, 2, '0', STR_PAD_LEFT);
$start_time = ($start_hm && preg_match('/^\d{2}:\d{2}$/', $start_hm)) ? $start_hm : '00:00';
$start_dt = \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $start_date . ' ' . $start_time . ':00');
// 終了日
if ($start_dd < $end_dd) {
// 終了月も契約終了月
$end_date=$contract_end_dt->format('Y-m-') . str_pad($end_dd, 2, '0', STR_PAD_LEFT);
$end_time = ($end_hm && preg_match('/^\d{2}:\d{2}$/', $end_hm)) ? $end_hm : '23:59';
$end_dt = \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $end_date . ' ' . $end_time . ':00');
} else {
// 終了日は契約終了月の翌月
$next_month_dt = $contract_end_dt->copy()->addMonth();
$end_date = $next_month_dt->format('Y-m-') . str_pad($end_dd, 2, '0', STR_PAD_LEFT);
$end_time = ($end_hm && preg_match('/^\d{2}:\d{2}$/', $end_hm)) ? $end_hm : '23:59';
$end_dt = \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $end_date . ' ' . $end_time . ':00');
}
} else {
$start_dt = null;
$end_dt = null;
}
// 以降は既存のボタン・背景色判定ロジック
if ($update_flag===0) { if ($update_flag===0) {
$bg='bg-white' ; $bg='bg-white';
$btn_text='手続き中' ; $btn_text='手続き中';
$btn_active=false; $btn_active=false;
} }
elseif ($update_flag===1) { elseif ($update_flag===1) {
$bg='bg-white' ; $bg='bg-white';
$btn_text='更新済' ; $btn_text='更新済';
$btn_active=false; $btn_active=false;
} }
elseif (!is_null($end_dt) && $end_dt->gt($start_dt)) { elseif (!is_null($end_dt) && $end_dt->gt($start_dt)) {
@ -78,9 +85,8 @@ return null;
$btn_text = 'ご契約中'; $btn_text = 'ご契約中';
$btn_active = false; $btn_active = false;
} else { } else {
// 修正: 契約終了日を過ぎていて、更新可能期間内は赤背景 // 契約終了日を過ぎていて、更新可能期間内は赤背景
$periode_dt = $contract->contract_periode ? \Carbon\Carbon::parse($contract->contract_periode) : null; if ($contract_end_dt && $now->gt($contract_end_dt) && $start_dt && $end_dt && $now->between($start_dt, $end_dt)) {
if ($periode_dt && $now->gt($periode_dt) && $start_dt && $end_dt && $now->between($start_dt, $end_dt)) {
$bg = 'alert-danger'; $bg = 'alert-danger';
$btn_text = '更新する'; $btn_text = '更新する';
$btn_active = true; $btn_active = true;
@ -96,7 +102,7 @@ return null;
$bg = 'bg-white'; $bg = 'bg-white';
$btn_text = 'ご契約中'; $btn_text = 'ご契約中';
$btn_active = false; $btn_active = false;
} elseif ($now->gte($start_dt) && $now->lte($month_end)) { } elseif ($now->gte($start_dt) && $now->lte($contract_end_dt->copy()->endOfMonth())) {
$bg = 'alert-warning'; $bg = 'alert-warning';
$btn_text = '更新する'; $btn_text = '更新する';
$btn_active = true; $btn_active = true;
@ -108,6 +114,7 @@ return null;
} }
} }
@endphp @endphp
@endphp
@if($bg == 'bg-white') @if($bg == 'bg-white')
<div class="card border-success"> <div class="card border-success">
@elseif($bg == 'alert-warning') @elseif($bg == 'alert-warning')

38
resources/views/user/confirm.blade.php
View File

@ -39,7 +39,17 @@
<label for="user_regident_zip">居住所</label> <label for="user_regident_zip">居住所</label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<h3>{{ ($input['user_regident_zip_1'] ?? $user->user_regident_zip_1 ?? '') }}-{{ ($input['user_regident_zip_2'] ?? $user->user_regident_zip_2 ?? '') }}{{ ($input['user_regident_pre'] ?? $user->user_regident_pre ?? '') }}{{ ($input['user_regident_city'] ?? $user->user_regident_city ?? '') }}{{ ($input['user_regident_add'] ?? $user->user_regident_add ?? '') }}</h3> <h3>
@php
$zip1 = $input['user_regident_zip_1'] ?? $user->user_regident_zip_1 ?? '';
$zip2 = $input['user_regident_zip_2'] ?? $user->user_regident_zip_2 ?? '';
$pre = $input['user_regident_pre'] ?? $user->user_regident_pre ?? '';
$city = $input['user_regident_city'] ?? $user->user_regident_city ?? '';
$add = $input['user_regident_add'] ?? $user->user_regident_add ?? '';
$zip = ($zip1 && $zip2) ? $zip1.'-'.$zip2 : (($zip1 || $zip2) ? $zip1.$zip2 : '');
@endphp
{{ $zip }}{{ $pre }}{{ $city }}{{ $add }}
</h3>
<input type="hidden" name="user_regident_zip_1" value="{{ $input['user_regident_zip_1'] ?? $user->user_regident_zip_1 ?? '' }}"> <input type="hidden" name="user_regident_zip_1" value="{{ $input['user_regident_zip_1'] ?? $user->user_regident_zip_1 ?? '' }}">
<input type="hidden" name="user_regident_zip_2" value="{{ $input['user_regident_zip_2'] ?? $user->user_regident_zip_2 ?? '' }}"> <input type="hidden" name="user_regident_zip_2" value="{{ $input['user_regident_zip_2'] ?? $user->user_regident_zip_2 ?? '' }}">
<input type="hidden" name="user_regident_pre" value="{{ $input['user_regident_pre'] ?? $user->user_regident_pre ?? '' }}"> <input type="hidden" name="user_regident_pre" value="{{ $input['user_regident_pre'] ?? $user->user_regident_pre ?? '' }}">
@ -67,7 +77,12 @@
<label for="user_homephone">自宅電話番号</label> <label for="user_homephone">自宅電話番号</label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<h3>{{ implode('-', $input['user_homephone']) }}</h3> <h3>
@php
$home = array_filter($input['user_homephone'] ?? []);
@endphp
{{ $home ? implode('-', $home) : '' }}
</h3>
@foreach ($input['user_homephone'] as $val) @foreach ($input['user_homephone'] as $val)
<input type="hidden" name="user_homephone[]" value="{{ $val }}"> <input type="hidden" name="user_homephone[]" value="{{ $val }}">
@endforeach @endforeach
@ -77,7 +92,12 @@
<label for="user_mobile">携帯電話番号</label> <label for="user_mobile">携帯電話番号</label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<h3>{{ implode('-', $input['user_mobile']) }}</h3> <h3>
@php
$mobile = array_filter($input['user_mobile'] ?? []);
@endphp
{{ $mobile ? implode('-', $mobile) : '' }}
</h3>
@foreach ($input['user_mobile'] as $val) @foreach ($input['user_mobile'] as $val)
<input type="hidden" name="user_mobile[]" value="{{ $val }}"> <input type="hidden" name="user_mobile[]" value="{{ $val }}">
@endforeach @endforeach
@ -145,7 +165,17 @@
<label for="user_relate">住所</label> <label for="user_relate">住所</label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<h3>{{ ($input['user_relate_zip_1'] ?? $user->user_relate_zip_1 ?? '') }}-{{ ($input['user_relate_zip_2'] ?? $user->user_relate_zip_2 ?? '') }}{{ ($input['user_relate_pre'] ?? $user->user_relate_pre ?? '') }}{{ ($input['user_relate_city'] ?? $user->user_relate_city ?? '') }}{{ ($input['user_relate_add'] ?? $user->user_relate_add ?? '') }}</h3> <h3>
@php
$zip1 = $input['user_relate_zip_1'] ?? $user->user_relate_zip_1 ?? '';
$zip2 = $input['user_relate_zip_2'] ?? $user->user_relate_zip_2 ?? '';
$pre = $input['user_relate_pre'] ?? $user->user_relate_pre ?? '';
$city = $input['user_relate_city'] ?? $user->user_relate_city ?? '';
$add = $input['user_relate_add'] ?? $user->user_relate_add ?? '';
$zip = ($zip1 && $zip2) ? $zip1.'-'.$zip2 : (($zip1 || $zip2) ? $zip1.$zip2 : '');
@endphp
{{ $zip }}{{ $pre }}{{ $city }}{{ $add }}
</h3>
<input type="hidden" name="user_relate_zip_1" value="{{ $input['user_relate_zip_1'] ?? $user->user_relate_zip_1 ?? '' }}"> <input type="hidden" name="user_relate_zip_1" value="{{ $input['user_relate_zip_1'] ?? $user->user_relate_zip_1 ?? '' }}">
<input type="hidden" name="user_relate_zip_2" value="{{ $input['user_relate_zip_2'] ?? $user->user_relate_zip_2 ?? '' }}"> <input type="hidden" name="user_relate_zip_2" value="{{ $input['user_relate_zip_2'] ?? $user->user_relate_zip_2 ?? '' }}">
<input type="hidden" name="user_relate_pre" value="{{ $input['user_relate_pre'] ?? $user->user_relate_pre ?? '' }}"> <input type="hidden" name="user_relate_pre" value="{{ $input['user_relate_pre'] ?? $user->user_relate_pre ?? '' }}">

14
resources/views/user/edit.blade.php
View File

@ -155,14 +155,14 @@
</div> </div>
{{-- メールアドレス --}} {{-- メールアドレス --}}
<div class="col-12 col-md-3 offset-0 offset-md-2"> <div class="col-12 col-md-3 offset-0 offset-md-2">
<label for="user_primemail">メールアドレス</label> <label for="user_primemail">メールアドレス <span style="color:red;">*</span></label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<input type="email" class="form-control" id="user_primemail" name="user_primemail" value="{{ old('user_primemail', $user->user_primemail) }}" placeholder="name@example.com"> <input type="email" class="form-control" id="user_primemail" name="user_primemail" value="{{ old('user_primemail', $user->user_primemail) }}" placeholder="name@example.com">
</div> </div>
{{-- メールアドレス確認 --}} {{-- メールアドレス確認 --}}
<div class="col-12 col-md-3 offset-0 offset-md-2"> <div class="col-12 col-md-3 offset-0 offset-md-2">
<label for="user_primemail_confirmation">メールアドレスの確認</label> <label for="user_primemail_confirmation">メールアドレスの確認 <span style="color:red;">*</span></label>
</div> </div>
<div class="col-12 col-lg-6 mb10"> <div class="col-12 col-lg-6 mb10">
<input type="email" class="form-control" id="user_primemail2" name="user_primemail_confirmation" value="{{ old('user_primemail_confirmation') }}" placeholder="name@example.com"> <input type="email" class="form-control" id="user_primemail2" name="user_primemail_confirmation" value="{{ old('user_primemail_confirmation') }}" placeholder="name@example.com">
@ -196,18 +196,18 @@
<label for="user_workplace">勤務先名</label> <label for="user_workplace">勤務先名</label>
</div> </div>
<div class="col-12 col-lg-6 mb10 user_workplace_area {{ old('user_category', $user_category) == '学生' ? 'd-none' : '' }}"> <div class="col-12 col-lg-6 mb10 user_workplace_area {{ old('user_category', $user_category) == '学生' ? 'd-none' : '' }}">
<input type="text" class="form-control" id="user_workplace" name="user_workplace" value="{{ old('user_workplace', $user->user_workplace) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif> <input type="text" class="form-control" id="user_workplace" name="user_workplace" value="{{ old('user_workplace', $user->user_workplace) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif placeholder="マルバツ株式会社">
</div> </div>
{{-- 学校名（学生のみ表示） --}} {{-- 学校名（学生のみ表示） --}}
<div class="col-12 col-md-3 offset-0 offset-md-2 user_school_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}"> <div class="col-12 col-md-3 offset-0 offset-md-2 user_school_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}">
<label for="user_school">学校名</label> <label for="user_school">学校名<span style="color:red;">*</span></label>
</div> </div>
<div class="col-12 col-lg-6 mb10 user_school_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}"> <div class="col-12 col-lg-6 mb10 user_school_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}">
<input type="text" class="form-control" id="user_school" name="user_school" value="{{ old('user_school', $user->user_school) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif> <input type="text" class="form-control" id="user_school" name="user_school" value="{{ old('user_school', $user->user_school) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif>
</div> </div>
{{-- 卒業予定（学生のみ表示） --}} {{-- 卒業予定（学生のみ表示） --}}
<div class="col-12 col-md-3 offset-0 offset-md-2 user_graduate_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}"> <div class="col-12 col-md-3 offset-0 offset-md-2 user_graduate_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}">
<label for="user_graduate">卒業予定</label> <label for="user_graduate">卒業予定<span style="color:red;">*</span></label>
</div> </div>
<div class="col-12 col-lg-6 mb10 user_graduate_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}"> <div class="col-12 col-lg-6 mb10 user_graduate_area {{ old('user_category', $user_category) == '学生' ? '' : 'd-none' }}">
<input type="date" class="form-control" id="user_graduate" name="user_graduate" value="{{ old('user_graduate', $user->user_graduate) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif> <input type="date" class="form-control" id="user_graduate" name="user_graduate" value="{{ old('user_graduate', $user->user_graduate) }}" @if(!$is_update_period)readonly style="background:#eee;" @endif>
@ -269,8 +269,8 @@
<option value="鹿児島県" {{ old('user_relate_pre', $user->user_relate_pre) == '鹿児島県' ? 'selected' : '' }}>鹿児島県</option> <option value="鹿児島県" {{ old('user_relate_pre', $user->user_relate_pre) == '鹿児島県' ? 'selected' : '' }}>鹿児島県</option>
<option value="沖縄県" {{ old('user_relate_pre', $user->user_relate_pre) == '沖縄県' ? 'selected' : '' }}>沖縄県</option> <option value="沖縄県" {{ old('user_relate_pre', $user->user_relate_pre) == '沖縄県' ? 'selected' : '' }}>沖縄県</option>
</select> </select>
<input type="text" class="form-control d-inline-block" style="margin-top:8px; @if(!$is_update_period)background:#eee;@endif" name="user_relate_city" value="{{ old('user_relate_city', $user->user_relate_city) }}" @if(!$is_update_period)readonly @endif> <input type="text" class="form-control d-inline-block" style="margin-top:8px; @if(!$is_update_period)background:#eee;@endif" name="user_relate_city" value="{{ old('user_relate_city', $user->user_relate_city) }}" @if(!$is_update_period)readonly @endif placeholder="足立区">
<input type="text" class="form-control d-inline-block" style="margin-top:8px; @if(!$is_update_period)background:#eee;@endif" name="user_relate_add" value="{{ old('user_relate_add', $user->user_relate_add) }}" @if(!$is_update_period)readonly @endif> <input type="text" class="form-control d-inline-block" style="margin-top:8px; @if(!$is_update_period)background:#eee;@endif" name="user_relate_add" value="{{ old('user_relate_add', $user->user_relate_add) }}" @if(!$is_update_period)readonly @endif placeholder="六町1-1-1">
</div> </div>
{{-- 本人確認書類 --}} {{-- 本人確認書類 --}}
<div class="col-12 col-md-3 offset-0 offset-md-2"> <div class="col-12 col-md-3 offset-0 offset-md-2">