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

main_ou #22

Merged
go.unhi merged 8 commits from main_ou into main 2025-09-01 14:06:38 +09:00
Conversation 0 Commits 8 Files Changed 58 +101 -85
5 changed files with 101 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3da61d072 - Show all commits

78
resources/views/admin/usertypes/_form.blade.php
View File

@ -19,55 +19,72 @@
@endif @endif
</div> </div>
<div class="col-lg-12 row sample03-wrapper no_padding_right mb20"> <div class="col-lg-12 row sample03-wrapper no_padding_right mb20">
<div class="col-xl-2 col-lg-2 col-md-2 col-sm-3 col-xs-3 table_left">
<div class="btn_action mb-3">
@if($isInfo)
<a href="{{route('usertype_add')}}" class="btn btn-sm btn-success">{{__('登録')}}</a>
<a href="{{route('usertype_edit',['id'=>$user_categoryid])}}" class="btn btn-sm btn-danger">{{__('編集')}}</a>
@else
<button type="submit" class="btn btn-sm btn-danger register" >{{__('保存')}}</button>
@endif
</div>
</div>
<div class="col-lg-10 col-xl-10 col-md-10 col-sm-9 col-xs-9 table_right no_padding_right"> <div class="col-lg-10 col-xl-10 col-md-10 col-sm-9 col-xs-9 table_right no_padding_right">
<div class="scroll"> <div class="scroll">
<form method="post"> <form method="post">
<div class="btn_action mt-3">
@if($isInfo)
<a href="{{route('usertype_add')}}" class="btn btn-sm btn-success">{{__('登録')}}</a>
<a href="{{route('usertype_edit', ['id' => $user_categoryid])}}"
class="btn btn-sm btn-danger">{{__('編集')}}</a>
@else
<button type="submit" class="btn btn-sm btn-success register">{{__(key: '登録')}}</button>
<button type="button" class="btn btn-sm btn-danger register">{{__(key: '削除')}}</button>
@endif
</div>
@csrf @csrf
<table class="table dataTable"> <table class="table dataTable">
<tbody> <tbody>
@if($isInfo || $isEdit) @if($isInfo || $isEdit)
<tr> <tr>
<th style="width:200px;">{{__('validation.attributes.user_categoryid')}}</th> <th style="width:200px; background-color:#fff;">{{__('validation.attributes.user_categoryid')}}</th>
<td> <td>
<input type="text" value="{{$user_categoryid}}" class="form-control" readonly/> <input type="text" value="{{$user_categoryid}}" class="form-control bg-white" readonly />
</td> </td>
</tr> </tr>
@endif @endif
<tr> <tr>
<th style="width:200px;">{{__('validation.attributes.print_name')}}</th> <th style="width:200px; background-color:#fff;">{{__('分類名')}}</th>
<td> <td>
<input type="text" value="{{$print_name}}" name="print_name" <input type="text" name="print_name" value="{{ old('print_name', $print_name ?? '') }}" class="form-control bg-white" placeholder="分類名" />
class="form-control"
@if($isInfo) readonly @endif
placeholder="{{__('validation.attributes.print_name')}}"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th style="width:200px;">{{__('validation.attributes.usertype_money')}}</th> <th style="width:200px; background-color:#fff;">{{__('適用料率')}}</th>
<td> <td>
<input type="text" value="{{$usertype_money}}" name="usertype_money" <input type="text" name="usertype_money" value="{{ old('usertype_money', $usertype_money ?? '') }}" class="form-control bg-white" placeholder="適用料率" />
class="form-control"
@if($isInfo) readonly @endif
placeholder="{{__('validation.attributes.usertype_money')}}"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th style="width:200px;">{{__('validation.attributes.usertype_remarks')}}</th> <th style="width:200px; background-color:#fff;">{{__('備考')}}</th>
<td> <td>
<input type="text" value="{{$usertype_remarks}}" name="usertype_remarks" <input type="text" name="usertype_remarks" value="{{ old('usertype_remarks', $usertype_remarks ?? '') }}" class="form-control bg-white" placeholder="備考" />
class="form-control" </td>
@if($isInfo) readonly @endif </tr>
placeholder="{{__('validation.attributes.usertype_remarks')}}"/> <!-- 必要なら下記も追加 -->
<tr>
<th style="width:200px; background-color:#fff;">{{__('ソートオーダー')}}</th>
<td>
<input type="text" name="sort_order" value="{{ old('sort_order', $sort_order ?? '') }}" class="form-control bg-white" placeholder="ソートオーダー" />
</td>
</tr>
<tr>
<th style="width:200px; background-color:#fff;">{{__('分類名1')}}</th>
<td>
<input type="text" name="category_name1" value="{{ old('category_name1', $category_name1 ?? '') }}" class="form-control bg-white" placeholder="分類名1" />
</td>
</tr>
<tr>
<th style="width:200px; background-color:#fff;">{{__('分類名2')}}</th>
<td>
<input type="text" name="category_name2" value="{{ old('category_name2', $category_name2 ?? '') }}" class="form-control bg-white" placeholder="分類名2" />
</td>
</tr>
<tr>
<th style="width:200px; background-color:#fff;">{{__('分類名3')}}</th>
<td>
<input type="text" name="category_name3" value="{{ old('category_name3', $category_name3 ?? '') }}" class="form-control bg-white" placeholder="分類名3" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -75,13 +92,14 @@
<div class="btn_action mt-3"> <div class="btn_action mt-3">
@if($isInfo) @if($isInfo)
<a href="{{route('usertype_add')}}" class="btn btn-sm btn-success">{{__('登録')}}</a> <a href="{{route('usertype_add')}}" class="btn btn-sm btn-success">{{__('登録')}}</a>
<a href="{{route('usertype_edit',['id'=>$user_categoryid])}}" class="btn btn-sm btn-danger">{{__('編集')}}</a> <a href="{{route('usertype_edit', ['id' => $user_categoryid])}}"
class="btn btn-sm btn-danger">{{__('編集')}}</a>
@else @else
<button type="submit" class="btn btn-sm btn-danger register" >{{__('保存')}}</button> <button type="submit" class="btn btn-sm btn-success register">{{__('登録')}}</button>
<button type="button" class="btn btn-sm btn-danger register">{{__('削除')}}</button>
@endif @endif
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>

6
resources/views/admin/usertypes/add.blade.php
View File

@ -40,12 +40,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid mb20">
<button type="submit" class="btn btn-sm btn-default mr10">{{__('削除')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('インポート')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('CSV出力')}}</button>
</div>
</div> </div>
</section> </section>
<!-- /.content --> <!-- /.content -->

45
resources/views/admin/usertypes/edit.blade.php
View File

@ -1,53 +1,40 @@
@extends('layouts.app') @extends('layouts.app')
@section('title', '[東京都|〇〇駐輪場] 利用者分類マスタ') @section('title', '編集 | 利用者分類マスタ')
@section('content') @section('content')
<!-- Content Header (Page header) --> <!-- Content Header -->
<div class="content-header"> <div class="content-header">
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-lg-6"> <div class="col-lg-6">
<h1 class="m-0 text-dark">[東京都|〇〇駐輪場] 利用者分類マスタ</h1> <h1 class="m-0 text-dark">編集</h1>
</div><!-- /.col --> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ol class="breadcrumb float-sm-right text-sm"> <ol class="breadcrumb float-sm-right text-sm">
<li class="breadcrumb-item"><a href="./index2.html">XX様info(ホーム)</a></li> <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
<li class="breadcrumb-item"><a href="./index3.html">[東京都|〇〇駐輪場]</a></li> <li class="breadcrumb-item"><a href="{{ route('usertypes') }}">利用者分類マスタ</a></li>
<li class="breadcrumb-item">利用者分類マスタ</li> <li class="breadcrumb-item active">編集</li>
<li class="breadcrumb-item active">利用者マスタ</li>
</ol> </ol>
</div><!-- /.col -->
</div><!-- /.row -->
</div><!-- /.container-fluid -->
</div> </div>
<!-- /.content-header --> </div>
</div>
</div>
<!-- Main content --> <!-- Main content -->
<section class="content"> <section class="content">
<div class="container-fluid"> <div class="container-fluid">
<!-- SELECT2 EXAMPLE -->
<div class="row"> {{-- 上部の操作ボタン（登録／削除） --}}
<div class="col-lg-12">
{{-- カード本体 --}}
<div class="card"> <div class="card">
<form method="post" action="{{ route('usertype_edit',['id'=>$user_categoryid])}}" enctype="multipart/form-data"> {{-- 既存の共通フォームをそのまま利用 --}}
<!-- TOKEN FORM --> @include('admin.usertypes._form', ['isEdit' => 1, 'isInfo' => 0])
<input type="hidden" name="_token" value="{{ csrf_token() }}" >
<!-- / .TOKEN FORM -->
@include('admin.usertypes._form',['isEdit'=>1,'isInfo'=>0])
</form> </form>
</div> </div>
</div> </div>
</div>
<div class="container-fluid mb20">
<button type="submit" class="btn btn-sm btn-default mr10">{{__('削除')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('インポート')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10">{{__('CSV出力')}}</button>
</div>
</div> </div>
</section> </section>
<!-- /.content -->
@endsection @endsection

7
resources/views/admin/usertypes/info.blade.php
View File

@ -28,13 +28,6 @@
<input type="hidden" value="{{$sort_type ?? ''}}" name="sort_type" id="sort_type"> <input type="hidden" value="{{$sort_type ?? ''}}" name="sort_type" id="sort_type">
</form> </form>
<div class="container-fluid mb20">
<button type="submit" class="btn btn-sm btn-default mr10" name="delete"
id="delete">{{__('削除')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10" name="import_csv" id="import_csv" action="{{route('usertypes_import')}}">{{__('インポート')}}</button>
<button type="submit" class="btn btn-sm btn-default mr10" name="export_csv" id="export_csv" action="{{route('usertypes_export')}}">{{__('CSV出力')}}</button>
{{ $list->appends(['sort' => $sort ?? '','sort_type'=>$sort_type ?? ''])->links('pagination') }}
</div>
<div class="form col-lg-12"> <div class="form col-lg-12">
@if(Session::has('success')) @if(Session::has('success'))
<div class="alert alert-success alert-dismissible" role="alert"> <div class="alert alert-success alert-dismissible" role="alert">

32
resources/views/admin/usertypes/list.blade.php
View File

@ -76,6 +76,18 @@
sort="user_categoryid"> sort="user_categoryid">
<span>{{__('利用者分類ID')}}</span> <span>{{__('利用者分類ID')}}</span>
</th> </th>
<th>
<span>{{__('ソート順')}}</span>
</th>
<th>
<span>{{__('分類名1')}}</span>
</th>
<th>
<span>{{__('分類名2')}}</span>
</th>
<th>
<span>{{__('分類名3')}}</span>
</th>
<th class="sorting @if($sort == 'print_name'){{$sort_type == 'asc' ? 'sorting_asc' : 'sorting_desc'}}@endif" <th class="sorting @if($sort == 'print_name'){{$sort_type == 'asc' ? 'sorting_asc' : 'sorting_desc'}}@endif"
sort="print_name"> sort="print_name">
<span>{{__('分類名')}}</span> <span>{{__('分類名')}}</span>
@ -100,16 +112,28 @@
</div> </div>
</td> </td>
<td class='sm-item text-left'> <td class='sm-item text-left'>
<span>{{mb_substr($item->user_categoryid, 0, 10)}}</span> <span>{{ mb_substr($item->user_categoryid, 0, 10) }}</span>
</td> </td>
<td class='sm-item text-left'> <td class='sm-item text-left'>
<span>{{mb_substr($item->print_name, 0, 10)}}</span> <span>{{ mb_substr($item->sort_order, 0, 10) }}</span>
</td>
<td class='sm-item text-left'>
<span>{{ mb_substr($item->category_name1, 0, 10) }}</span>
</td>
<td class='sm-item text-left'>
<span>{{ mb_substr($item->category_name2, 0, 10) }}</span>
</td>
<td class='sm-item text-left'>
<span>{{ mb_substr($item->category_name3, 0, 10) }}</span>
</td>
<td class='sm-item text-left'>
<span>{{ mb_substr($item->print_name, 0, 10) }}</span>
</td> </td>
<td class='sm-item text-right'> <td class='sm-item text-right'>
<span>{{mb_substr($item->usertype_money, 0, 10)}}</span> <span>{{ mb_substr($item->usertype_money, 0, 10) }}</span>
</td> </td>
<td class='sm-item text-left'> <td class='sm-item text-left'>
<span>{{mb_substr($item->usertype_remarks, 0, 20)}}</span> <span>{{ mb_substr($item->usertype_remarks, 0, 20) }}</span>
</td> </td>
</tr> </tr>
@endforeach @endforeach