fix:必須バッチの追加と周りの修正

EC-CUBE · Nov 15, 2023 · b5ccee7 · b5ccee7
1 parent f595142
commit b5ccee7
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 6 deletions.
diff --git a/src/Eccube/Resource/locale/messages.en.yaml b/src/Eccube/Resource/locale/messages.en.yaml
@@ -704,6 +704,7 @@ admin.product.category_name: Category ID
 admin.product.parent_category_id: Parent Category ID
 admin.product.category_all: All Categories
 admin.product.tag: Tags
+admin.product.tag_name: Tag Name
 admin.product.tag__product_card_title: Tags
 admin.product.select__class1: Select option 1
 admin.product.select__class2: Select option 2

diff --git a/src/Eccube/Resource/locale/messages.ja.yaml b/src/Eccube/Resource/locale/messages.ja.yaml
@@ -704,6 +704,7 @@ admin.product.category_name: カテゴリ名
 admin.product.parent_category_id: 親カテゴリID
 admin.product.category_all: すべてのカテゴリ
 admin.product.tag: タグ
+admin.product.tag_name: タグ名
 admin.product.tag__product_card_title: タグ
 admin.product.select__class1: 規格1を選択してください
 admin.product.select__class2: 規格2を選択してください

diff --git a/src/Eccube/Resource/template/admin/Content/news_edit.twig b/src/Eccube/Resource/template/admin/Content/news_edit.twig
@@ -37,15 +37,26 @@ file that was distributed with this source code.
                         <div class="ec-cardCollapse collapse show" id="newsForm" style="">
                             <div class="card-body">
                                 <div class="row">
-                                    <div class="col-3"><span>{{ 'admin.content.news.publish_date'|trans }}</span></div>
+                                    <div class="col-3">
+                                        <span>{{ 'admin.content.news.publish_date'|trans }}</span>
+                                        <span class="badge bg-primary ms-1">
+                                                {{ 'admin.common.required'|trans }}
+                                        </span>
+                                    </div>
+
                                     <div class="col mb-2">
                                         {{ form_widget(form.publish_date) }}
                                         {{ form_errors(form.publish_date) }}
                                     </div>
                                 </div>
 
                                 <div class="row">
-                                    <div class="col-3"><span>{{ 'admin.content.news.title'|trans }}</span></div>
+                                    <div class="col-3">
+                                        <span>{{ 'admin.content.news.title'|trans }}</span>
+                                        <span class="badge bg-primary ms-1">
+                                                {{ 'admin.common.required'|trans }}
+                                        </span>
+                                    </div>
                                     <div class="col mb-2">
                                         {{ form_widget(form.title) }}
                                         {{ form_errors(form.title) }}

diff --git a/src/Eccube/Resource/template/admin/Product/category.twig b/src/Eccube/Resource/template/admin/Product/category.twig
@@ -180,6 +180,10 @@ file that was distributed with this source code.
                                         {% if TargetCategory.hierarchy <= eccube_config.eccube_category_nest_level %}
                                             {{ form_widget(form._token) }}
                                             <div class="row mb-3">
+                                                <div class="col-auto align-self-center">
+                                                    <span>{{ 'admin.product.category_name'|trans }}</span>
+                                                    <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
+                                                </div>
                                                 <div class="col-auto">
                                                     {{ form_widget(form.name) }}
                                                     {{ form_errors(form.name) }}

diff --git a/src/Eccube/Resource/template/admin/Product/class_category.twig b/src/Eccube/Resource/template/admin/Product/class_category.twig
@@ -150,7 +150,10 @@ file that was distributed with this source code.
                             <ul class="list-group list-group-flush sortable-container">
                                 <li class="list-group-item">
                                     <form role="form" class="row" name="form1" id="form1" method="post" action="{{ url('admin_product_class_category', {'class_name_id': ClassName.id}) }}">
-                                        <div class="col-auto align-self-center"><span>{{ 'admin.product.class_category_name__short'|trans }}</span></div>
+                                        <div class="col-auto align-self-center">
+                                            <span>{{ 'admin.product.class_category_name__short'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
+                                        </div>
                                         <div class="col-3 me-2">
                                             {{ form_widget(form._token) }}
                                             {{ form_widget(form.name) }}

diff --git a/src/Eccube/Resource/template/admin/Product/class_name.twig b/src/Eccube/Resource/template/admin/Product/class_name.twig
@@ -139,7 +139,10 @@ file that was distributed with this source code.
                             <ul class="list-group list-group-flush sortable-container">
                                 <li class="list-group-item">
                                     <form role="form" class="row" name="form1" id="form1" method="post" action="{{ url('admin_product_class_name') }}">
-                                        <div class="col-auto align-self-center"><span>{{ 'admin.product.class_name'|trans }}</span></div>
+                                        <div class="col-auto align-self-center">
+                                            <span>{{ 'admin.product.class_name'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
+                                        </div>
                                         <div class="col-3 me-2">
                                             {{ form_widget(form._token) }}
                                             {{ form_widget(form.name) }}

diff --git a/src/Eccube/Resource/template/admin/Product/product_class.twig b/src/Eccube/Resource/template/admin/Product/product_class.twig
@@ -253,10 +253,20 @@ file that was distributed with this source code.
                                     <th class="pt-2 pb-2">{{ ClassName1 ? ClassName1.name }}</th>
                                     <th class="pt-2 pb-2">{{ ClassName2 ? ClassName2.name }}</th>
                                     <th class="pt-2 pb-2">{{ 'admin.product.product_code__short'|trans }}</th>
-                                    <th class="pt-2 pb-2">{{ 'admin.product.stock__short'|trans }}</th>
+                                    <th class="pt-2 pb-2">
+                                        {{ 'admin.product.stock__short'|trans }}
+                                        <span class="badge bg-primary ms-1">
+                                            {{ 'admin.common.required'|trans }}
+                                        </span>
+                                    </th>
                                     <th class="pt-2 pb-2">{{ 'admin.product.sale_limit'|trans }}</th>
                                     <th class="pt-2 pb-2">{{ 'admin.product.normal_price'|trans }}</th>
-                                    <th class="pt-2 pb-2">{{ 'admin.product.sale_price'|trans }}</th>
+                                    <th class="pt-2 pb-2">
+                                        {{ 'admin.product.sale_price'|trans }}
+                                        <span class="badge bg-primary ms-1">
+                                            {{ 'admin.common.required'|trans }}
+                                        </span>
+                                    </th>
                                     {% if BaseInfo.option_product_delivery_fee %}
                                         <th class="pt-2 pb-2">{{ 'admin.product.delivery_fee'|trans }}</th>
                                     {% endif %}

diff --git a/src/Eccube/Resource/template/admin/Product/tag.twig b/src/Eccube/Resource/template/admin/Product/tag.twig
@@ -132,6 +132,10 @@ file that was distributed with this source code.
                                 <li class="list-group-item">
                                     <form role="form" class="row" method="post" action="{{ url('admin_product_tag') }}">
                                         {{ form_widget(form._token) }}
+                                        <div class="col-auto align-self-center">
+                                            <span>{{ 'admin.product.tag_name'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
+                                        </div>
                                         <div class="col-auto align-items-center">
                                             {{ form_widget(form.name) }}
                                             {{ form_errors(form.name) }}

diff --git a/src/Eccube/Resource/template/admin/change_password.twig b/src/Eccube/Resource/template/admin/change_password.twig
@@ -41,6 +41,7 @@ file that was distributed with this source code.
                                     <div class="col-3">
                                         <div class="d-inline-block">
                                             <span>{{ 'admin.change_password.current_password'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
                                         </div>
                                     </div>
                                     <div class="col">
@@ -53,6 +54,7 @@ file that was distributed with this source code.
                                     <div class="col-3">
                                         <div class="d-inline-block">
                                             <span>{{ 'admin.change_password.new_password'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
                                         </div>
                                     </div>
                                     <div class="col">
@@ -65,6 +67,7 @@ file that was distributed with this source code.
                                     <div class="col-3">
                                         <div class="d-inline-block">
                                             <span>{{ 'admin.change_password.new_password_confirm'|trans }}</span>
+                                            <span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
                                         </div>
                                     </div>
                                     <div class="col">