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

Merge branch 'main' of https://git.so-manager-dev.com/so-manager/krgm.so-manager-dev.com
All checks were successful
Deploy main / deploy (push) Successful in 23s
Details

Browse Source
This commit is contained in:
kin.rinzen 2025-10-10 16:36:31 +09:00
commit 3b7ae71d56
7 changed files with 291 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/UsingStatusController.php
View File

@ -160,7 +160,7 @@ class UsingStatusController extends Controller
foreach ($stats as $stat) { foreach ($stats as $stat) {
$rows[] = [ $rows[] = [
(string) $stat->park_name, (string) $stat->park_name,
(string) $stat->ptype_subject, (string) $stat->psection_subject,
(string) $stat->park_limit, (string) $stat->park_limit,
(string) $stat->current_count, (string) $stat->current_count,
(string) $stat->available, (string) $stat->available,

26
app/Services/UsingStatusService.php
View File

@ -25,26 +25,30 @@ class UsingStatusService
* @param int|null $parkId 駐輪場ID（null の場合は全て） * @param int|null $parkId 駐輪場ID（null の場合は全て）
* @return Collection * @return Collection
*/ */
public function getUtilizationStats(?int $parkId = null): Collection public function getUtilizationStats(?int $parkId = null): \Illuminate\Support\Collection
{ {
// park_number に車種IDが ptype_id で入っている前提 // park_number に車種IDが ptype_id で入っている前提
// 異なる場合は 'pn.ptype_id' 部分を実テーブル定義に合わせて変更してください // 異なる場合は 'pn.ptype_id' 部分を実テーブル定義に合わせて変更してください
$query = DB::table('park as p')
// ✅ Laravel 12対応：psectionテーブルから車種を取得するように変更
$query = \DB::table('park as p')
->join('park_number as pn', 'p.park_id', '=', 'pn.park_id') ->join('park_number as pn', 'p.park_id', '=', 'pn.park_id')
->join('ptype as pt', 'pn.ptype_id', '=', 'pt.ptype_id') // 旧: join('ptype as pt', 'pn.ptype_id', '=', 'pt.ptype_id')
->leftJoin('psection as ps', 'pn.psection_id', '=', 'ps.psection_id') // ✅ 新しい車種取得方法
->select([ ->select([
'p.park_id', 'p.park_id',
'p.park_name', 'p.park_name',
'pt.ptype_id', // 'pt.ptype_id',
'pt.ptype_subject', // 'pt.ptype_subject',
'ps.psection_subject', // 車種（psection_subject）に変更
// 限界収容台数 // 限界収容台数
'pn.park_limit', 'pn.park_limit',
// 現在収容台数 // 現在収容台数
DB::raw('COALESCE(pn.park_number, 0) as current_count'), \DB::raw('COALESCE(pn.park_number, 0) as current_count'),
// 空き = 収容上限 - 現在 // 空き = 収容上限 - 現在
DB::raw('GREATEST(0, COALESCE(pn.park_limit, 0) - COALESCE(pn.park_number, 0)) as available'), \DB::raw('GREATEST(0, COALESCE(pn.park_limit, 0) - COALESCE(pn.park_number, 0)) as available'),
// 利用率 = 現在 / 上限 * 100 // 利用率 = 現在 / 上限 * 100
DB::raw("CASE \DB::raw("CASE
WHEN COALESCE(pn.park_limit, 0) > 0 WHEN COALESCE(pn.park_limit, 0) > 0
THEN ROUND((COALESCE(pn.park_number, 0) / pn.park_limit) * 100, 1) THEN ROUND((COALESCE(pn.park_number, 0) / pn.park_limit) * 100, 1)
ELSE 0 ELSE 0
@ -58,12 +62,12 @@ class UsingStatusService
$results = $query $results = $query
// 表示順：自転車 → 原付 → その他 // 表示順：自転車 → 原付 → その他
->orderByRaw("CASE pt.ptype_subject WHEN '自転車' THEN 1 WHEN '原付' THEN 2 ELSE 3 END") ->orderByRaw("CASE ps.psection_subject WHEN '自転車' THEN 1 WHEN '原付' THEN 2 ELSE 3 END")
->orderBy('p.park_name') ->orderBy('p.park_name')
->get(); ->get();
return $results; return $results;
} }
/** /**
* 駐輪場一覧を取得（選択用） * 駐輪場一覧を取得（選択用）

4
resources/views/admin/tag_issue/list.blade.php
View File

@ -41,7 +41,7 @@
alert('1件以上選択してください。'); alert('1件以上選択してください。');
return; return;
} }
if (confirm('未発送のタグ発送用宛名を印刷してよろしいですか？')) { if (confirm('タグ発送用宛名を印刷してよろしいですか？')) {
// 送信用form生成 // 送信用form生成
var form = document.createElement('form'); var form = document.createElement('form');
form.method = 'POST'; form.method = 'POST';
@ -174,7 +174,7 @@
<td>{{ $user->user_tag_issue }}</td> <td>{{ $user->user_tag_issue }}</td>
<td> <td>
@if(!empty($user->user_seq)) @if(!empty($user->user_seq))
<a href="{{ route('user_edit', ['seq' => $user->user_seq]) }}" target="_blank"> <a href="{{ route('users_edit', ['seq' => $user->user_seq]) }}" target="_blank">
{{ $user->user_name }} {{ $user->user_name }}
</a> </a>
@else @else

2
resources/views/admin/using_status/index.blade.php
View File

@ -155,7 +155,7 @@ Laravel 12移行対応：区画別利用率状況ページ
{{-- 車種 --}} {{-- 車種 --}}
<td class="text-center align-middle"> <td class="text-center align-middle">
{{ $stat->ptype_subject ?? 'その他' }} {{ $stat->psection_subject }}
</td> </td>
{{-- 限界収容台数 --}} {{-- 限界収容台数 --}}

27
resources/views/auth/forgot-password.blade.php
View File

@ -10,9 +10,10 @@
<div class="card"> <div class="card">
<div class="card-body login-card-body"> <div class="card-body login-card-body">
<p class="login-box-msg" style="font-size:1rem;"> <p class="login-box-msg" style="font-size:1rem;">
パスワード再発行に関するメールを送信します。登録済みユーザIDおよびメールアドレスを入力してください。 パスワード再発行に関するメールを送信します。<br>登録済みメールアドレスを入力してください。
</p> </p>
{{-- ★ここからエラー表示を追加★ --}}
{{-- ★全体エラー表示（任意）★ --}}
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger">
<ul class="mb-0"> <ul class="mb-0">
@ -22,24 +23,33 @@
</ul> </ul>
</div> </div>
@endif @endif
{{-- ★ここまでエラー表示を追加★ --}}
{{-- ★成功メッセージ表示★ --}}
@if (session('status')) @if (session('status'))
<div class="alert alert-success">{{ session('status') }}</div> <div class="alert alert-success">{{ session('status') }}</div>
@endif @endif
<form method="POST" action="{{ route('forgot_password.send') }}">
<form method="POST" action="{{ route('forgot_password.send') }}" novalidate>
@csrf @csrf
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="メールアドレス" required autofocus> {{-- メールアドレス --}}
<div class="input-group mb-1">
<input type="email" name="email" class="form-control @error('email') @enderror"
placeholder="メールアドレス" autofocus value="{{ old('email') }}">
<div class="input-group-append"> <div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span> <span class="fa fa-envelope input-group-text"></span>
</div> </div>
</div> </div>
<div class="input-group mb-3">
<input type="email" name="email_confirmation" class="form-control" placeholder="メールアドレス（確認）" required> {{-- メールアドレス（確認） --}}
<div class="input-group mb-1">
<input type="email" name="email_confirmation" class="form-control @error('email_confirmation') @enderror"
placeholder="メールアドレス（確認）" value="{{ old('email_confirmation') }}">
<div class="input-group-append"> <div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span> <span class="fa fa-envelope input-group-text"></span>
</div> </div>
</div> </div>
<div class="row mt40"> <div class="row mt40">
<div class="col-12"> <div class="col-12">
<button type="submit" class="btn btn-lg btn-primary btn-block btn-flat"> <button type="submit" class="btn btn-lg btn-primary btn-block btn-flat">
@ -48,6 +58,7 @@
</div> </div>
</div> </div>
</form> </form>
<p class="mb-1 mt50"> <p class="mb-1 mt50">
<a href="{{ route('login') }}">{{ __('ログイン画面に戻る') }}</a> <a href="{{ route('login') }}">{{ __('ログイン画面に戻る') }}</a>
</p> </p>

22
resources/views/auth/reset-password.blade.php
View File

@ -10,6 +10,7 @@
<div class="card"> <div class="card">
<div class="card-body login-card-body"> <div class="card-body login-card-body">
<p class="login-box-msg">新しいパスワードを入力してください。</p> <p class="login-box-msg">新しいパスワードを入力してください。</p>
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger">
<ul class="mb-0"> <ul class="mb-0">
@ -19,16 +20,32 @@
</ul> </ul>
</div> </div>
@endif @endif
<form method="POST" action="{{ route('password.update') }}"> <form method="POST" action="{{ route('password.update') }}">
@csrf @csrf
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">
<input type="hidden" name="email" value="{{ $email }}"> <input type="hidden" name="email" value="{{ $email }}">
{{-- パスワード --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="新しいパスワード" required> <input type="password" name="password" id="password"
class="form-control @error('password') is-invalid @enderror"
placeholder="新しいパスワード" required>
</div> </div>
@error('password')
<div class="text-danger mb-3">{{ $message }}</div>
@enderror
{{-- パスワード（確認） --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password_confirmation" class="form-control" placeholder="新しいパスワード（確認）" required> <input type="password" name="password_confirmation" id="password_confirmation"
class="form-control @error('password_confirmation') is-invalid @enderror"
placeholder="新しいパスワード（確認）" required>
</div> </div>
@error('password_confirmation')
<div class="text-danger mb-3">{{ $message }}</div>
@enderror
<div class="row mt40"> <div class="row mt40">
<div class="col-12"> <div class="col-12">
<button type="submit" class="btn btn-lg btn-primary btn-block btn-flat"> <button type="submit" class="btn btn-lg btn-primary btn-block btn-flat">
@ -37,6 +54,7 @@
</div> </div>
</div> </div>
</form> </form>
<p class="mb-1 mt50"> <p class="mb-1 mt50">
<a href="{{ route('login') }}">ログイン画面に戻る</a> <a href="{{ route('login') }}">ログイン画面に戻る</a>
</p> </p>

130
resources/views/layouts/app.blade.php
View File

@ -51,9 +51,11 @@
<li class="nav-item d-lg-none"> <li class="nav-item d-lg-none">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a> <a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
</li> </li>
<li class="nav-item d-none d-sm-inline-block"> <li class="nav-item d-none d-sm-inline-block">
<a class="nav-link">{{ __('ようこそ、:ope_name様', ['ope_name' => Auth::user()->ope_name]) }}</a> <a class="nav-link" style="margin-left:20px;">
</li> {{ __('ようこそ、:ope_name様', ['ope_name' => Auth::user()->ope_name]) }}
</a>
</li>
</ul> </ul>
<!-- SEARCH FORM --> <!-- SEARCH FORM -->
@ -91,8 +93,8 @@
</span> </span>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@foreach($latestHards as $hq) @foreach($latestHards as $hq)
<a href="{{ route('information', ['type'=>'hard','status'=>'untreated','period'=>'all']) }}" class="dropdown-item" <a href="{{ route('information', ['type' => 'hard', 'status' => 'untreated', 'period' => 'all']) }}"
style="white-space:normal;"> class="dropdown-item" style="white-space:normal;">
{{ Str::limit($hq->que_comment ?? 'ハード異常', 40) }} {{ Str::limit($hq->que_comment ?? 'ハード異常', 40) }}
<span class="float-right text-muted text-sm"> <span class="float-right text-muted text-sm">
{{ \Carbon\Carbon::parse($hq->created_at)->diffForHumans() }} {{ \Carbon\Carbon::parse($hq->created_at)->diffForHumans() }}
@ -100,7 +102,8 @@
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@endforeach @endforeach
<a href="{{ route('information', ['type'=>'hard','period'=>'all']) }}" class="dropdown-item dropdown-footer"> <a href="{{ route('information', ['type' => 'hard', 'period' => 'all']) }}"
class="dropdown-item dropdown-footer">
すべてを見る すべてを見る
</a> </a>
</div> </div>
@ -126,8 +129,8 @@
</span> </span>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@foreach($latestTasks as $tq) @foreach($latestTasks as $tq)
<a href="{{ route('information', ['type'=>'task','status'=>'untreated','period'=>'all']) }}" class="dropdown-item" <a href="{{ route('information', ['type' => 'task', 'status' => 'untreated', 'period' => 'all']) }}"
style="white-space:normal;"> class="dropdown-item" style="white-space:normal;">
{{ Str::limit($tq->que_comment ?? 'タスク', 40) }} {{ Str::limit($tq->que_comment ?? 'タスク', 40) }}
<span class="float-right text-muted text-sm"> <span class="float-right text-muted text-sm">
{{ \Carbon\Carbon::parse($tq->created_at)->diffForHumans() }} {{ \Carbon\Carbon::parse($tq->created_at)->diffForHumans() }}
@ -135,7 +138,8 @@
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@endforeach @endforeach
<a href="{{ route('information', ['type'=>'task','period'=>'all']) }}" class="dropdown-item dropdown-footer"> <a href="{{ route('information', ['type' => 'task', 'period' => 'all']) }}"
class="dropdown-item dropdown-footer">
過去のタスクを全て見る 過去のタスクを全て見る
</a> </a>
</div> </div>
@ -184,35 +188,31 @@
data-accordion="false"> data-accordion="false">
<!-- OU START --> <!-- OU START -->
<!-- ホーム（親） --> <!-- ホーム（親） -->
<li class="nav-item has-treeview menu-open"> <li class="nav-item has-treeview {{ request()->routeIs('information') ? 'menu-open' : '' }}">
<a href="/home" class="nav-link active"> <a href="#" class="nav-link {{ request()->routeIs('information') ? 'active' : '' }}">
<i class="nav-icon fa fa-home"></i> <i class="nav-icon fa fa-home"></i>
<p> <p>
ホーム ホーム
<i class="right fa fa-angle-down"></i> <i class="right fa fa-angle-down"></i>
</p> </p>
</a> </a>
<ul class="nav nav-treeview" style="display:block;"> <ul class="nav nav-treeview"
style="{{ request()->routeIs('information') ? 'display:block;' : 'display:none;' }}">
<li class="nav-item"> <li class="nav-item">
<a href="#" class="nav-link"> <a href="#" class="nav-link">
<i class="fa fa-circle-o nav-icon"></i> <span style="margin-left:20px;">ハードウェア異常表示</span>
<p>ハードウェア異常表示</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('information') }}" <a href="{{ route('information') }}"
class="nav-link {{ request()->routeIs('information') ? 'active' : '' }}"> class="nav-link {{ request()->routeIs('information') ? 'active' : '' }}">
<i class="nav-icon fa fa-info-circle"></i> <span style="margin-left:20px;">常時表示インフォメーション</span>
<p>常時表示インフォメーション</p>
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>
@php @php
// <!-- タグ・シール管理 --> // <!-- タグ・シール管理 -->
$webRoutes = [ $webRoutes = [
@ -224,14 +224,15 @@
class="nav-item has-treeview @if(in_array(app('router')->currentRouteName(), $webRoutes)) menu-open @endif"> class="nav-item has-treeview @if(in_array(app('router')->currentRouteName(), $webRoutes)) menu-open @endif">
<a href="#" <a href="#"
class="nav-link @if(in_array(app('router')->currentRouteName(), $webRoutes)) active @endif"> class="nav-link @if(in_array(app('router')->currentRouteName(), $webRoutes)) active @endif">
<i class="nav-icon fa fa-tags"></i> <i class="nav-icon fa fa-repeat"></i>
<p>タグ・シール管理</p> <p>タグ・シール管理
<i class="right fa fa-angle-down"></i>
</p>
</a> </a>
<ul class="nav nav-treeview"> <ul class="nav nav-treeview">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('tagissue') }}" <a href="{{ route('tagissue') }}"
class="nav-link @if(app('router')->currentRouteName() === 'tagissue') active @endif"> class="nav-link @if(app('router')->currentRouteName() === 'tagissue') active @endif">
<span style="margin-left:20px;">タグ発行キュー処理、履歴表示</span> <span style="margin-left:20px;">タグ発行キュー処理、履歴表示</span>
</a> </a>
</li> </li>
@ -459,59 +460,71 @@
<i class="right fa fa-angle-down"></i> <i class="right fa fa-angle-down"></i>
</p> </p>
</a> </a>
<ul class="nav nav-treeview" style="display: @if(in_array($current, $parkingRoutes)) block @else none @endif;"> <ul class="nav nav-treeview"
style="display: @if(in_array($current, $parkingRoutes)) block @else none @endif;">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('parks') }}" class="nav-link @if($current === 'parks') active @endif"> <a href="{{ route('parks') }}"
class="nav-link @if($current === 'parks') active @endif">
<span style="margin-left:20px;">{{ __("駐輪場マスタ") }}</span> <span style="margin-left:20px;">{{ __("駐輪場マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('city') }}" class="nav-link @if($current === 'city') active @endif"> <a href="{{ route('city') }}"
class="nav-link @if($current === 'city') active @endif">
<span style="margin-left:20px;">{{ __("市区マスタ") }}</span> <span style="margin-left:20px;">{{ __("市区マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('pricelist') }}" class="nav-link @if($current === 'pricelist') active @endif"> <a href="{{ route('pricelist') }}"
class="nav-link @if($current === 'pricelist') active @endif">
<span style="margin-left:20px;">{{ __("料金一覧表") }}</span> <span style="margin-left:20px;">{{ __("料金一覧表") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('prices') }}" class="nav-link @if($current === 'prices') active @endif"> <a href="{{ route('prices') }}"
class="nav-link @if($current === 'prices') active @endif">
<span style="margin-left:20px;">{{ __("駐輪場所、料金マスタ") }}</span> <span style="margin-left:20px;">{{ __("駐輪場所、料金マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('psections') }}" class="nav-link @if($current === 'psections') active @endif"> <a href="{{ route('psections') }}"
class="nav-link @if($current === 'psections') active @endif">
<span style="margin-left:20px;">{{ __("車種区分マスタ") }}</span> <span style="margin-left:20px;">{{ __("車種区分マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('ptypes') }}" class="nav-link @if($current === 'ptypes') active @endif"> <a href="{{ route('ptypes') }}"
class="nav-link @if($current === 'ptypes') active @endif">
<span style="margin-left:20px;">{{ __("駐輪分類マスタ") }}</span> <span style="margin-left:20px;">{{ __("駐輪分類マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('zones') }}" class="nav-link @if($current === 'zones') active @endif"> <a href="{{ route('zones') }}"
class="nav-link @if($current === 'zones') active @endif">
<span style="margin-left:20px;">{{ __("ゾーンマスタ") }}</span> <span style="margin-left:20px;">{{ __("ゾーンマスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('pplaces') }}" class="nav-link @if($current === 'pplaces') active @endif"> <a href="{{ route('pplaces') }}"
class="nav-link @if($current === 'pplaces') active @endif">
<span style="margin-left:20px;">{{ __("駐輪車室マスタ") }}</span> <span style="margin-left:20px;">{{ __("駐輪車室マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('stations') }}" class="nav-link @if($current === 'stations') active @endif"> <a href="{{ route('stations') }}"
class="nav-link @if($current === 'stations') active @endif">
<span style="margin-left:20px;">{{ __("近傍駅マスタ") }}</span> <span style="margin-left:20px;">{{ __("近傍駅マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('regular_types') }}" class="nav-link @if($current === 'regular_types') active @endif"> <a href="{{ route('regular_types') }}"
class="nav-link @if($current === 'regular_types') active @endif">
<span style="margin-left:20px;">{{ __("定期種別マスタ") }}</span> <span style="margin-left:20px;">{{ __("定期種別マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('terms') }}" class="nav-link @if($current === 'terms') active @endif"> <a href="{{ route('terms') }}"
class="nav-link @if($current === 'terms') active @endif">
<span style="margin-left:20px;">{{ __("利用規約マスタ") }}</span> <span style="margin-left:20px;">{{ __("利用規約マスタ") }}</span>
</a> </a>
</li> </li>
@ -521,17 +534,20 @@
</a> </a>
</li> --> </li> -->
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('print_areas') }}" class="nav-link @if($current === 'print_areas') active @endif"> <a href="{{ route('print_areas') }}"
class="nav-link @if($current === 'print_areas') active @endif">
<span style="margin-left:20px;">{{ __("シール印刷範囲マスタ") }}</span> <span style="margin-left:20px;">{{ __("シール印刷範囲マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('contract_allowable_cities') }}" class="nav-link @if($current === 'contract_allowable_cities') active @endif"> <a href="{{ route('contract_allowable_cities') }}"
class="nav-link @if($current === 'contract_allowable_cities') active @endif">
<span style="margin-left:20px;">{{ __("契約許容市区マスタ") }}</span> <span style="margin-left:20px;">{{ __("契約許容市区マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('managers') }}" class="nav-link @if($current === 'managers') active @endif"> <a href="{{ route('managers') }}"
class="nav-link @if($current === 'managers') active @endif">
<span style="margin-left:20px;">{{ __("駐輪場管理者マスタ") }}</span> <span style="margin-left:20px;">{{ __("駐輪場管理者マスタ") }}</span>
</a> </a>
</li> </li>
@ -558,10 +574,10 @@
</p> </p>
</a> </a>
<ul class="nav nav-treeview" style="display: @if(in_array($current, $paymentRoutes)) block @else none @endif;"> <ul class="nav nav-treeview"
style="display: @if(in_array($current, $paymentRoutes)) block @else none @endif;">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('tax') }}" <a href="{{ route('tax') }}" class="nav-link @if($current === 'tax') active @endif">
class="nav-link @if($current === 'tax') active @endif">
<span style="margin-left:20px;">{{ __('消費税マスタ') }}</span> <span style="margin-left:20px;">{{ __('消費税マスタ') }}</span>
</a> </a>
</li> </li>
@ -602,31 +618,37 @@
<i class="right fa fa-angle-down"></i> <i class="right fa fa-angle-down"></i>
</p> </p>
</a> </a>
<ul class="nav nav-treeview" style="display: @if(in_array($current, $systemRoutes)) block @else none @endif;"> <ul class="nav nav-treeview"
style="display: @if(in_array($current, $systemRoutes)) block @else none @endif;">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('opes') }}" class="nav-link @if($current === 'opes') active @endif"> <a href="{{ route('opes') }}"
class="nav-link @if($current === 'opes') active @endif">
<span style="margin-left:20px;">{{ __("オペレータマスタ") }}</span> <span style="margin-left:20px;">{{ __("オペレータマスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('devices') }}" class="nav-link @if($current === 'devices') active @endif"> <a href="{{ route('devices') }}"
class="nav-link @if($current === 'devices') active @endif">
<span style="margin-left:20px;">{{ __("デバイス管理マスタ") }}</span> <span style="margin-left:20px;">{{ __("デバイス管理マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('operator_ques') }}" class="nav-link @if($current === 'operator_ques') active @endif"> <a href="{{ route('operator_ques') }}"
class="nav-link @if($current === 'operator_ques') active @endif">
<i class="nav-icon"></i> <i class="nav-icon"></i>
<span style="margin-left:20px;">{{ __("オペレータキュー") }}</span> <span style="margin-left:20px;">{{ __("オペレータキュー") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('settings') }}" class="nav-link @if($current === 'settings') active @endif"> <a href="{{ route('settings') }}"
class="nav-link @if($current === 'settings') active @endif">
<i class="nav-icon"></i> <i class="nav-icon"></i>
<span style="margin-left:20px;">{{ __("設定マスタ") }}</span> <span style="margin-left:20px;">{{ __("設定マスタ") }}</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('mail_templates') }}" class="nav-link @if($current === 'mail_templates') active @endif"> <a href="{{ route('mail_templates') }}"
class="nav-link @if($current === 'mail_templates') active @endif">
<span style="margin-left:20px;">{{ __("メール送信テンプレート") }}</span> <span style="margin-left:20px;">{{ __("メール送信テンプレート") }}</span>
</a> </a>
</li> </li>
@ -650,9 +672,11 @@
<i class="right fa fa-angle-down"></i> <i class="right fa fa-angle-down"></i>
</p> </p>
</a> </a>
<ul class="nav nav-treeview" style="display: @if(in_array($current, $masterRoutes)) block @else none @endif;"> <ul class="nav nav-treeview"
style="display: @if(in_array($current, $masterRoutes)) block @else none @endif;">
<li class="nav-item"> <li class="nav-item">
<a href="{{ route('inv_settings') }}" class="nav-link @if($current === 'inv_settings') active @endif"> <a href="{{ route('inv_settings') }}"
class="nav-link @if($current === 'inv_settings') active @endif">
<span style="margin-left:20px;">{{ __("インボイス設定") }}</span> <span style="margin-left:20px;">{{ __("インボイス設定") }}</span>
</a> </a>
</li> </li>
@ -794,6 +818,16 @@
<!-- Scripts --> <!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script> <script src="{{ asset('js/app.js') }}" defer></script>
<style>
.main-sidebar {
width: 280px;
}
.content-wrapper {
margin-left: 280px;
}
</style>
</body> </body>
</html> </html>